diff options
Diffstat (limited to 'spec/features/groups/labels')
-rw-r--r-- | spec/features/groups/labels/create_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/labels/edit_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/labels/sort_labels_spec.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/groups/labels/create_spec.rb b/spec/features/groups/labels/create_spec.rb index 9c1a3672ebd..19433e612ff 100644 --- a/spec/features/groups/labels/create_spec.rb +++ b/spec/features/groups/labels/create_spec.rb @@ -18,6 +18,6 @@ RSpec.describe 'Create a group label' do click_button 'Create label' expect(page).to have_content 'test-label' - expect(current_path).to eq(group_labels_path(group)) + expect(page).to have_current_path(group_labels_path(group), ignore_query: true) end end diff --git a/spec/features/groups/labels/edit_spec.rb b/spec/features/groups/labels/edit_spec.rb index 8e6560af352..cf1729af97d 100644 --- a/spec/features/groups/labels/edit_spec.rb +++ b/spec/features/groups/labels/edit_spec.rb @@ -19,7 +19,7 @@ RSpec.describe 'Edit group label' do fill_in 'label_title', with: 'new label name' click_button 'Save changes' - expect(current_path).to eq(root_path) + expect(page).to have_current_path(root_path, ignore_query: true) expect(label.reload.title).to eq('new label name') end diff --git a/spec/features/groups/labels/sort_labels_spec.rb b/spec/features/groups/labels/sort_labels_spec.rb index df75ff7c3cb..fba166449f8 100644 --- a/spec/features/groups/labels/sort_labels_spec.rb +++ b/spec/features/groups/labels/sort_labels_spec.rb @@ -28,7 +28,7 @@ RSpec.describe 'Sort labels', :js do it 'sorts by date' do click_button 'Name' - sort_options = find('ul.dropdown-menu-sort li').all('a').collect(&:text) + sort_options = find('ul.dropdown-menu').all('li').collect(&:text) expect(sort_options[0]).to eq('Name') expect(sort_options[1]).to eq('Name, descending') @@ -37,7 +37,7 @@ RSpec.describe 'Sort labels', :js do expect(sort_options[4]).to eq('Updated date') expect(sort_options[5]).to eq('Oldest updated') - click_link 'Name, descending' + click_button 'Name, descending' # assert default sorting within '.other-labels' do |