Commit f74ff925 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'tp-qtt182-1' into 'master'

Change qa-reverse-sort class references to rspec-reverse-sort

Closes gitlab-org/quality/team-tasks#182

See merge request gitlab-org/gitlab-ce!31202
parents add9b791 67e1dd4c
...@@ -210,7 +210,7 @@ module SortingHelper ...@@ -210,7 +210,7 @@ module SortingHelper
end end
def sort_direction_button(reverse_url, reverse_sort, sort_value) 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) icon = sort_direction_icon(sort_value)
url = reverse_url url = reverse_url
......
...@@ -50,7 +50,7 @@ module WikiHelper ...@@ -50,7 +50,7 @@ module WikiHelper
def wiki_sort_controls(project, sort, direction) def wiki_sort_controls(project, sort, direction)
sort ||= ProjectWiki::TITLE_ORDER 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' reversed_direction = direction == 'desc' ? 'asc' : 'desc'
icon_class = direction == 'desc' ? 'highest' : 'lowest' icon_class = direction == 'desc' ? 'highest' : 'lowest'
......
...@@ -102,7 +102,7 @@ describe 'Sort Issuable List' do ...@@ -102,7 +102,7 @@ describe 'Sort Issuable List' do
expect(first_merge_request).to include(last_updated_issuable.title) expect(first_merge_request).to include(last_updated_issuable.title)
expect(last_merge_request).to include(first_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(first_merge_request).to include(first_updated_issuable.title)
expect(last_merge_request).to include(last_updated_issuable.title) expect(last_merge_request).to include(last_updated_issuable.title)
...@@ -204,7 +204,7 @@ describe 'Sort Issuable List' do ...@@ -204,7 +204,7 @@ describe 'Sort Issuable List' do
expect(first_issue).to include(last_updated_issuable.title) expect(first_issue).to include(last_updated_issuable.title)
expect(last_issue).to include(first_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(first_issue).to include(first_updated_issuable.title)
expect(last_issue).to include(last_updated_issuable.title) expect(last_issue).to include(last_updated_issuable.title)
......
...@@ -42,7 +42,7 @@ describe 'User views wiki pages' do ...@@ -42,7 +42,7 @@ describe 'User views wiki pages' do
context 'desc' do context 'desc' do
before do before do
page.within('.wiki-sort-dropdown') do page.within('.wiki-sort-dropdown') do
page.find('.qa-reverse-sort').click page.find('.rspec-reverse-sort').click
end end
end end
...@@ -75,7 +75,7 @@ describe 'User views wiki pages' do ...@@ -75,7 +75,7 @@ describe 'User views wiki pages' do
context 'desc' do context 'desc' do
before do before do
page.within('.wiki-sort-dropdown') do page.within('.wiki-sort-dropdown') do
page.find('.qa-reverse-sort').click page.find('.rspec-reverse-sort').click
end end
end end
......
...@@ -22,7 +22,7 @@ describe WikiHelper do ...@@ -22,7 +22,7 @@ describe WikiHelper do
describe '#wiki_sort_controls' do describe '#wiki_sort_controls' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:wiki_link) { helper.wiki_sort_controls(project, sort, direction) } 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) def expected_link(sort, direction, icon_class)
path = "/#{project.full_path}/wikis/pages?direction=#{direction}&sort=#{sort}" path = "/#{project.full_path}/wikis/pages?direction=#{direction}&sort=#{sort}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment