Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
e512ea96
Commit
e512ea96
authored
May 24, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace data-test=page with .js-pagination-page
parent
33b787ee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/kaminari/gitlab/_page.html.haml
app/views/kaminari/gitlab/_page.html.haml
+1
-1
spec/features/admin/admin_abuse_reports_spec.rb
spec/features/admin/admin_abuse_reports_spec.rb
+1
-1
spec/features/dashboard/todos/todos_spec.rb
spec/features/dashboard/todos/todos_spec.rb
+1
-1
No files found.
app/views/kaminari/gitlab/_page.html.haml
View file @
e512ea96
...
@@ -6,5 +6,5 @@
...
@@ -6,5 +6,5 @@
-# total_pages: total number of pages
-# total_pages: total number of pages
-# per_page: number of items to fetch per page
-# per_page: number of items to fetch per page
-# remote: data-remote
-# remote: data-remote
%li
.page-item
{
class:
[
active_when
(
page
.
current?
),
(
'sibling'
if
page
.
next?
||
page
.
prev?
)],
data:
{
test:
'page'
}
}
%li
.page-item
.js-pagination-page
{
class:
[
active_when
(
page
.
current?
),
(
'sibling'
if
page
.
next?
||
page
.
prev?
)]
}
=
link_to
page
,
url
,
{
remote:
remote
,
rel:
page
.
next?
?
'next'
:
page
.
prev?
?
'prev'
:
nil
,
class:
'page-link'
}
=
link_to
page
,
url
,
{
remote:
remote
,
rel:
page
.
next?
?
'next'
:
page
.
prev?
?
'prev'
:
nil
,
class:
'page-link'
}
spec/features/admin/admin_abuse_reports_spec.rb
View file @
e512ea96
...
@@ -45,7 +45,7 @@ describe "Admin::AbuseReports", :js do
...
@@ -45,7 +45,7 @@ describe "Admin::AbuseReports", :js do
visit
admin_abuse_reports_path
visit
admin_abuse_reports_path
expect
(
page
).
to
have_selector
(
'.pagination'
)
expect
(
page
).
to
have_selector
(
'.pagination'
)
expect
(
page
).
to
have_selector
(
'.pagination
[data-test=page]
'
,
count:
(
report_count
.
to_f
/
AbuseReport
.
default_per_page
).
ceil
)
expect
(
page
).
to
have_selector
(
'.pagination
.js-pagination-page
'
,
count:
(
report_count
.
to_f
/
AbuseReport
.
default_per_page
).
ceil
)
end
end
end
end
end
end
...
...
spec/features/dashboard/todos/todos_spec.rb
View file @
e512ea96
...
@@ -246,7 +246,7 @@ feature 'Dashboard Todos' do
...
@@ -246,7 +246,7 @@ feature 'Dashboard Todos' do
it
'is has the right number of pages'
do
it
'is has the right number of pages'
do
visit
dashboard_todos_path
visit
dashboard_todos_path
expect
(
page
).
to
have_selector
(
'.gl-pagination
[data-test=page]
'
,
count:
2
)
expect
(
page
).
to
have_selector
(
'.gl-pagination
.js-pagination-page
'
,
count:
2
)
end
end
describe
'mark all as done'
,
:js
do
describe
'mark all as done'
,
:js
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment