diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb index e84694c736199f1be6f44abf404160f6dc78a522..f747e5fe8d9f7b7347f7a112e503ad8f76e49092 100644 --- a/app/helpers/stream_helper.rb +++ b/app/helpers/stream_helper.rb @@ -19,7 +19,7 @@ module StreamHelper else time = @stream.posts.last.send(@stream.order.to_sym).to_i end - aspects_path(:max_time => time, :a_ids => @stream.aspect_ids) + aspects_path(:max_time => time, :sort_order => session[:sort_order], :a_ids => @stream.aspect_ids) else raise 'in order to use pagination for this new controller, update next_page_path in stream helper' end diff --git a/features/infinite_scroll.feature b/features/infinite_scroll.feature index d928b459dcfc2552c744b3c25533dc6e91ec6115..ea48f6b8d065f43cfba6cab113df2c5323b36bf4 100644 --- a/features/infinite_scroll.feature +++ b/features/infinite_scroll.feature @@ -8,6 +8,7 @@ Feature: infinite scroll Given many posts from alice for bob And I resize my window to 800x600 And I sign in as "bob@bob.bob" + And I wait for the ajax to finish Scenario: on the main stream by activity Then I should see 15 posts @@ -25,7 +26,6 @@ Feature: infinite scroll Then I should see "No more" When I follow "generic" - And I wait for the ajax to finish Then I should see 15 posts And I should see "alice - 26 - #seeded" @@ -41,8 +41,8 @@ Feature: infinite scroll Then I should see "No more" Scenario: on the main stream post created time - When I wait for the ajax to finish And I follow "posted" + And I go to the home page Then I should see 15 posts And I should see "alice - 15 - #seeded"