diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /spec/features/labels_hierarchy_spec.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'spec/features/labels_hierarchy_spec.rb')
-rw-r--r-- | spec/features/labels_hierarchy_spec.rb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb index 25c315f2d16..6c8d41fd96f 100644 --- a/spec/features/labels_hierarchy_spec.rb +++ b/spec/features/labels_hierarchy_spec.rb @@ -17,7 +17,6 @@ RSpec.describe 'Labels Hierarchy', :js do let!(:project_label_1) { create(:label, project: project_1, title: 'Label_4') } before do - stub_feature_flags(labels_widget: false) grandparent.add_owner(user) sign_in(user) @@ -28,13 +27,12 @@ RSpec.describe 'Labels Hierarchy', :js do [grandparent_group_label, parent_group_label, project_label_1].each do |label| page.within('.block.labels') do click_on 'Edit' - end - wait_for_requests + wait_for_requests - find('a.label-item', text: label.title).click - wait_for_requests - click_on 'Close' + click_on label.title + click_on 'Close' + end wait_for_requests @@ -66,7 +64,7 @@ RSpec.describe 'Labels Hierarchy', :js do end else expect_issues_list_count(1) - expect(page).to have_selector('span.issue-title-text', text: labeled_issue.title) + expect(page).to have_selector('.issue-title', text: labeled_issue.title) end end end @@ -76,7 +74,7 @@ RSpec.describe 'Labels Hierarchy', :js do wait_for_requests - expect(page).not_to have_selector('.btn-link', text: child_group_label.title) + expect(page).not_to have_link child_group_label.title end end @@ -109,9 +107,9 @@ RSpec.describe 'Labels Hierarchy', :js do end else expect_issues_list_count(3) - expect(page).to have_selector('span.issue-title-text', text: labeled_issue.title) - expect(page).to have_selector('span.issue-title-text', text: labeled_issue_2.title) - expect(page).to have_selector('span.issue-title-text', text: labeled_issue_3.title) + expect(page).to have_selector('.issue-title', text: labeled_issue.title) + expect(page).to have_selector('.issue-title', text: labeled_issue_2.title) + expect(page).to have_selector('.issue-title', text: labeled_issue_3.title) end end end @@ -131,7 +129,7 @@ RSpec.describe 'Labels Hierarchy', :js do end else expect_issues_list_count(1) - expect(page).to have_selector('span.issue-title-text', text: labeled_issue_3.title) + expect(page).to have_selector('.issue-title', text: labeled_issue_3.title) end end @@ -233,7 +231,7 @@ RSpec.describe 'Labels Hierarchy', :js do wait_for_requests - expect(page).not_to have_selector('.btn-link', text: child_group_label.title) + expect(page).not_to have_link child_group_label.title end end |