nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Maxwell Salzberg 2011-09-29 17:23:53 -07:00
parent 6bda512c02
commit cd2eb4292e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/stream_helper.rb
View file

@ -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

4
features/infinite_scroll.feature
View file

@ -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"