Commit 8dc5fa3e authored by Jose Vargas's avatar Jose Vargas

Fix selectors in specs

parent 25b0fd8d
...@@ -430,7 +430,7 @@ describe 'Filter issues', :js do ...@@ -430,7 +430,7 @@ describe 'Filter issues', :js do
expect_issues_list_count(2) expect_issues_list_count(2)
sort_toggle = find('.filter-dropdown-container .dropdown-menu-toggle') sort_toggle = find('.filter-dropdown-container .dropdown')
sort_toggle.click sort_toggle.click
find('.filter-dropdown-container .dropdown-menu li a', text: 'Created date').click find('.filter-dropdown-container .dropdown-menu li a', text: 'Created date').click
......
...@@ -20,9 +20,9 @@ describe "User sorts issues" do ...@@ -20,9 +20,9 @@ describe "User sorts issues" do
end end
it 'keeps the sort option' do it 'keeps the sort option' do
find('.filter-dropdown-container button.dropdown-menu-toggle').click find('.filter-dropdown-container .dropdown').click
page.within('.content ul.dropdown-menu.dropdown-menu-right li') do page.within('ul.dropdown-menu.dropdown-menu-right li') do
click_link('Milestone') click_link('Milestone')
end end
...@@ -40,9 +40,9 @@ describe "User sorts issues" do ...@@ -40,9 +40,9 @@ describe "User sorts issues" do
end end
it "sorts by popularity" do it "sorts by popularity" do
find(".filter-dropdown-container button.dropdown-menu-toggle").click find('.filter-dropdown-container .dropdown').click
page.within(".content ul.dropdown-menu.dropdown-menu-right li") do page.within('ul.dropdown-menu.dropdown-menu-right li') do
click_link("Popularity") click_link("Popularity")
end end
......
...@@ -19,9 +19,9 @@ describe 'User sorts merge requests' do ...@@ -19,9 +19,9 @@ describe 'User sorts merge requests' do
end end
it 'keeps the sort option' do it 'keeps the sort option' do
find('.filter-dropdown-container button.dropdown-menu-toggle').click find('.filter-dropdown-container .dropdown').click
page.within('.content ul.dropdown-menu.dropdown-menu-right li') do page.within('ul.dropdown-menu.dropdown-menu-right li') do
click_link('Milestone') click_link('Milestone')
end end
...@@ -49,9 +49,9 @@ describe 'User sorts merge requests' do ...@@ -49,9 +49,9 @@ describe 'User sorts merge requests' do
it 'separates remember sorting with issues' do it 'separates remember sorting with issues' do
create(:issue, project: project) create(:issue, project: project)
find('.filter-dropdown-container button.dropdown-menu-toggle').click find('.filter-dropdown-container .dropdown').click
page.within('.content ul.dropdown-menu.dropdown-menu-right li') do page.within('ul.dropdown-menu.dropdown-menu-right li') do
click_link('Milestone') click_link('Milestone')
end end
...@@ -70,9 +70,9 @@ describe 'User sorts merge requests' do ...@@ -70,9 +70,9 @@ describe 'User sorts merge requests' do
end end
it 'sorts by popularity' do it 'sorts by popularity' do
find('.filter-dropdown-container button.dropdown-menu-toggle').click find('.filter-dropdown-container .dropdown').click
page.within('.content ul.dropdown-menu.dropdown-menu-right li') do page.within('ul.dropdown-menu.dropdown-menu-right li') do
click_link('Popularity') click_link('Popularity')
end end
......
...@@ -32,7 +32,7 @@ describe 'Issue prioritization' do ...@@ -32,7 +32,7 @@ describe 'Issue prioritization' do
visit project_issues_path(project, sort: 'label_priority') visit project_issues_path(project, sort: 'label_priority')
# Ensure we are indicating that issues are sorted by priority # Ensure we are indicating that issues are sorted by priority
expect(page).to have_selector('.dropdown-menu-toggle', text: 'Label priority') expect(page).to have_selector('.dropdown', text: 'Label priority')
page.within('.issues-holder') do page.within('.issues-holder') do
issue_titles = all('.issues-list .issue-title-text').map(&:text) issue_titles = all('.issues-list .issue-title-text').map(&:text)
...@@ -70,7 +70,7 @@ describe 'Issue prioritization' do ...@@ -70,7 +70,7 @@ describe 'Issue prioritization' do
sign_in user sign_in user
visit project_issues_path(project, sort: 'label_priority') visit project_issues_path(project, sort: 'label_priority')
expect(page).to have_selector('.dropdown-menu-toggle', text: 'Label priority') expect(page).to have_selector('.dropdown', text: 'Label priority')
page.within('.issues-holder') do page.within('.issues-holder') do
issue_titles = all('.issues-list .issue-title-text').map(&:text) issue_titles = all('.issues-list .issue-title-text').map(&:text)
......
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