diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb index d0721b388..f3eb25415 100644 --- a/app/helpers/stream_helper.rb +++ b/app/helpers/stream_helper.rb @@ -10,9 +10,11 @@ module StreamHelper local_or_remote_person_path(@person, :max_time => time_for_scroll(@stream)) elsif controller.instance_of?(PostsController) public_stream_path(:max_time => time_for_scroll(@stream)) - elsif controller.instance_of?(StreamsController) + elsif controller.instance_of?(StreamsController) if current_page?(:stream) stream_path(:max_time => time_for_scroll(@stream)) + elsif current_page?(:aspects_stream) + aspects_stream_path(:max_time => time_for_scroll(@stream), :a_ids => session[:a_ids]) else activity_stream_path(:max_time => time_for_scroll(@stream)) end diff --git a/spec/helpers/stream_helper_spec.rb b/spec/helpers/stream_helper_spec.rb index df4520222..b44b54d1c 100644 --- a/spec/helpers/stream_helper_spec.rb +++ b/spec/helpers/stream_helper_spec.rb @@ -19,13 +19,21 @@ describe StreamHelper do end it 'works for stream page when current page is stream' do - helper.stub(:current_page?).and_return(true) + helper.stub(:current_page?).and_return(false) + helper.should_receive(:current_page?).with(:stream).and_return(true) helper.stub(:controller).and_return(build_controller(StreamsController)) helper.next_page_path.should include stream_path end - it 'works for activity page when current page is not stream' do - helper.stub("current_page?").and_return(false) + it 'works for aspects page when current page is aspects' do + helper.stub(:current_page?).and_return(false) + helper.should_receive(:current_page?).with(:aspects_stream).and_return(true) + helper.stub(:controller).and_return(build_controller(StreamsController)) + helper.next_page_path.should include aspects_stream_path + end + + it 'works for activity page when current page is not stream or aspects' do + helper.stub(:current_page?).and_return(false) helper.stub(:controller).and_return(build_controller(StreamsController)) # binding.pry helper.next_page_path.should include activity_stream_path