Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
diaspora
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Milan
diaspora
Commits
cd2eb429
Commit
cd2eb429
authored
13 years ago
by
Maxwell Salzberg
Browse files
Options
Downloads
Patches
Plain Diff
fix cuke for inf scroll(dont rely on session for sort order)
parent
6bda512c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/helpers/stream_helper.rb
+1
-1
1 addition, 1 deletion
app/helpers/stream_helper.rb
features/infinite_scroll.feature
+2
-2
2 additions, 2 deletions
features/infinite_scroll.feature
with
3 additions
and
3 deletions
app/helpers/stream_helper.rb
+
1
−
1
View file @
cd2eb429
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
features/infinite_scroll.feature
+
2
−
2
View file @
cd2eb429
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment