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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
67e1dd4c
Commit
67e1dd4c
authored
Jul 29, 2019
by
Tanya Pazitny
Committed by
Mayra Cabrera
Jul 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change qa-reverse-sort class references to rspec-reverse-sort
parent
add9b791
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/helpers/sorting_helper.rb
app/helpers/sorting_helper.rb
+1
-1
app/helpers/wiki_helper.rb
app/helpers/wiki_helper.rb
+1
-1
spec/features/issuables/sorting_list_spec.rb
spec/features/issuables/sorting_list_spec.rb
+2
-2
spec/features/projects/wiki/user_views_wiki_pages_spec.rb
spec/features/projects/wiki/user_views_wiki_pages_spec.rb
+2
-2
spec/helpers/wiki_helper_spec.rb
spec/helpers/wiki_helper_spec.rb
+1
-1
No files found.
app/helpers/sorting_helper.rb
View file @
67e1dd4c
...
...
@@ -210,7 +210,7 @@ module SortingHelper
end
def
sort_direction_button
(
reverse_url
,
reverse_sort
,
sort_value
)
link_class
=
'btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort'
link_class
=
'btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort
rspec-reverse-sort
'
icon
=
sort_direction_icon
(
sort_value
)
url
=
reverse_url
...
...
app/helpers/wiki_helper.rb
View file @
67e1dd4c
...
...
@@ -50,7 +50,7 @@ module WikiHelper
def
wiki_sort_controls
(
project
,
sort
,
direction
)
sort
||=
ProjectWiki
::
TITLE_ORDER
link_class
=
'btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort'
link_class
=
'btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort
rspec-reverse-sort
'
reversed_direction
=
direction
==
'desc'
?
'asc'
:
'desc'
icon_class
=
direction
==
'desc'
?
'highest'
:
'lowest'
...
...
spec/features/issuables/sorting_list_spec.rb
View file @
67e1dd4c
...
...
@@ -102,7 +102,7 @@ describe 'Sort Issuable List' do
expect
(
first_merge_request
).
to
include
(
last_updated_issuable
.
title
)
expect
(
last_merge_request
).
to
include
(
first_updated_issuable
.
title
)
find
(
'.issues-other-filters .filter-dropdown-container .
qa
-reverse-sort'
).
click
find
(
'.issues-other-filters .filter-dropdown-container .
rspec
-reverse-sort'
).
click
expect
(
first_merge_request
).
to
include
(
first_updated_issuable
.
title
)
expect
(
last_merge_request
).
to
include
(
last_updated_issuable
.
title
)
...
...
@@ -204,7 +204,7 @@ describe 'Sort Issuable List' do
expect
(
first_issue
).
to
include
(
last_updated_issuable
.
title
)
expect
(
last_issue
).
to
include
(
first_updated_issuable
.
title
)
find
(
'.issues-other-filters .filter-dropdown-container .
qa
-reverse-sort'
).
click
find
(
'.issues-other-filters .filter-dropdown-container .
rspec
-reverse-sort'
).
click
expect
(
first_issue
).
to
include
(
first_updated_issuable
.
title
)
expect
(
last_issue
).
to
include
(
last_updated_issuable
.
title
)
...
...
spec/features/projects/wiki/user_views_wiki_pages_spec.rb
View file @
67e1dd4c
...
...
@@ -42,7 +42,7 @@ describe 'User views wiki pages' do
context
'desc'
do
before
do
page
.
within
(
'.wiki-sort-dropdown'
)
do
page
.
find
(
'.
qa
-reverse-sort'
).
click
page
.
find
(
'.
rspec
-reverse-sort'
).
click
end
end
...
...
@@ -75,7 +75,7 @@ describe 'User views wiki pages' do
context
'desc'
do
before
do
page
.
within
(
'.wiki-sort-dropdown'
)
do
page
.
find
(
'.
qa
-reverse-sort'
).
click
page
.
find
(
'.
rspec
-reverse-sort'
).
click
end
end
...
...
spec/helpers/wiki_helper_spec.rb
View file @
67e1dd4c
...
...
@@ -22,7 +22,7 @@ describe WikiHelper do
describe
'#wiki_sort_controls'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:wiki_link
)
{
helper
.
wiki_sort_controls
(
project
,
sort
,
direction
)
}
let
(
:classes
)
{
"btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort"
}
let
(
:classes
)
{
"btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort
rspec-reverse-sort
"
}
def
expected_link
(
sort
,
direction
,
icon_class
)
path
=
"/
#{
project
.
full_path
}
/wikis/pages?direction=
#{
direction
}
&sort=
#{
sort
}
"
...
...
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