Skip to content
Extraits de code Groupes Projets
Valider cd2eb429 rédigé par Maxwell Salzberg's avatar Maxwell Salzberg
Parcourir les fichiers

fix cuke for inf scroll(dont rely on session for sort order)

parent 6bda512c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -19,7 +19,7 @@ module StreamHelper ...@@ -19,7 +19,7 @@ module StreamHelper
else else
time = @stream.posts.last.send(@stream.order.to_sym).to_i time = @stream.posts.last.send(@stream.order.to_sym).to_i
end 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 else
raise 'in order to use pagination for this new controller, update next_page_path in stream helper' raise 'in order to use pagination for this new controller, update next_page_path in stream helper'
end end
......
...@@ -8,6 +8,7 @@ Feature: infinite scroll ...@@ -8,6 +8,7 @@ Feature: infinite scroll
Given many posts from alice for bob Given many posts from alice for bob
And I resize my window to 800x600 And I resize my window to 800x600
And I sign in as "bob@bob.bob" And I sign in as "bob@bob.bob"
And I wait for the ajax to finish
Scenario: on the main stream by activity Scenario: on the main stream by activity
Then I should see 15 posts Then I should see 15 posts
...@@ -25,7 +26,6 @@ Feature: infinite scroll ...@@ -25,7 +26,6 @@ Feature: infinite scroll
Then I should see "No more" Then I should see "No more"
When I follow "generic" When I follow "generic"
And I wait for the ajax to finish
Then I should see 15 posts Then I should see 15 posts
And I should see "alice - 26 - #seeded" And I should see "alice - 26 - #seeded"
...@@ -41,8 +41,8 @@ Feature: infinite scroll ...@@ -41,8 +41,8 @@ Feature: infinite scroll
Then I should see "No more" Then I should see "No more"
Scenario: on the main stream post created time Scenario: on the main stream post created time
When I wait for the ajax to finish
And I follow "posted" And I follow "posted"
And I go to the home page
Then I should see 15 posts Then I should see 15 posts
And I should see "alice - 15 - #seeded" And I should see "alice - 15 - #seeded"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter