Merge branch...

Merge branch '222518-flaky-test-in-ee-spec-features-promotion_spec-rb-314-promotions-for-issue-weight-is-removed' into 'master'

Fix flaky issue weight promotion test

See merge request gitlab-org/gitlab!52175

ee/app/views/shared/promotions/_promote_issue_weights.html.haml

@@ -10,7 +10,7 @@
       = s_('Promotions|Weight')
     .hide-collapsed.js-toggle-container.promotion-issue-weight-sidebar-message
       = s_('Promotions|This feature is locked.')
-      %a.btn-link.js-toggle-button.js-weight-sidebar-callout{ href: '#' }
+      %a.btn-link.js-toggle-button.js-weight-sidebar-callout-btn{ href: '#' }
         = s_('Promotions|Learn more')
         = sprite_icon('chevron-up', css_class: 'js-sidebar-collapse hidden')
         = sprite_icon('chevron-down', css_class: 'js-sidebar-expand')

ee/spec/features/promotion_spec.rb

@@ -180,28 +180,26 @@
       visit project_issue_path(project, issue)
       wait_for_requests
-      find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
+      find('.btn-link.js-toggle-button.js-weight-sidebar-callout-btn').click
       expect(find('.promotion-issue-weight-sidebar-message')).to have_content 'Improve issues management with Issue weight and GitLab Enterprise Edition'
     end
-    it 'is removed after dismissal', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/222518' do
+    it 'is removed after dismissal' do
       visit project_issue_path(project, issue)
       wait_for_requests
-      within 'div.js-weight-sidebar-callout' do
-        find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
-        click_link "Don't show me this again"
-      end
-      expect(page).not_to have_selector('.js-weight-sidebar-callout')
+      find('.btn-link.js-toggle-button.js-weight-sidebar-callout-btn').click
+      click_link "Not now, thanks"
+      expect(page).not_to have_content('.js-weight-sidebar-callout')
     end
     it 'does not appear on page after dismissal and reload' do
       visit project_issue_path(project, issue)
       wait_for_requests
-      find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
+      find('.btn-link.js-toggle-button.js-weight-sidebar-callout-btn').click
       find('.js-weight-sidebar-callout .js-close-callout').click
       visit project_issue_path(project, issue)
@@ -212,8 +210,8 @@
       visit project_issue_path(project, issue)
       wait_for_requests
-      find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
-      find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
+      find('.btn-link.js-toggle-button.js-weight-sidebar-callout-btn').click
+      find('.btn-link.js-toggle-button.js-weight-sidebar-callout-btn').click
       expect(page).to have_selector('.js-weight-sidebar-callout')
       expect(page).to have_selector('.promotion-issue-sidebar-message', visible: false)
@@ -230,7 +228,7 @@
         visit project_issue_path(project, issue)
         wait_for_requests
-        find('.btn-link.js-toggle-button.js-weight-sidebar-callout').click
+        find('.btn-link.js-toggle-button.js-weight-sidebar-callout-btn').click
         expect(page).to have_link 'Try it for free', href: new_trial_registration_path(glm_source: 'gitlab.com', glm_content: 'discover-issue-weights'), class: 'issue-weights-trial-cta'
         expect(find('.js-close-callout.js-close-session.tr-issue-weights-not-now-cta')).to have_content 'Not now, thanks!'