Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 4 deletions

diff --git a/spec/views/events/event/_common.html.haml_spec.rb b/spec/views/events/event/_common.html.haml_spec.rb
index ad8e5c2ef77..2160245fb63 100644
--- a/spec/views/events/event/_common.html.haml_spec.rb
+++ b/spec/views/events/event/_common.html.haml_spec.rb
@@ -18,9 +18,22 @@ RSpec.describe 'events/event/_common.html.haml' do
       create(:event, :created, project: project, target: work_item, target_type: 'WorkItem', author: user)
     end
 
-    it 'renders the correct url' do
+    context 'when use_iid_in_work_items_path feature flag is disabled' do
+      before do
+        stub_feature_flags(use_iid_in_work_items_path: false)
+        render partial: 'events/event/common', locals: { event: event.present }
+      end
+
+      it 'renders the correct url' do
+        expect(rendered).to have_link(
+          work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.id}"
+        )
+      end
+    end
+
+    it 'renders the correct url with iid' do
       expect(rendered).to have_link(
-        work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.id}"
+        work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.iid}?iid_path=true"
       )
     end
 
diff --git a/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb b/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb
index d6706038066..8be874ba401 100644
--- a/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb
+++ b/spec/views/layouts/header/_gitlab_version.html.haml_spec.rb
@@ -21,12 +21,16 @@ RSpec.describe 'layouts/header/_gitlab_version' do
 
     it 'renders the container with correct data-tracking attributes' do
       expect(rendered).to have_selector(
-        'a[data-testid="gitlab-version-container"][data-track-action="click_version_help_dropdown"]'
+        'a[data-testid="gitlab-version-container"][data-track-action="click_link"]'
+      )
+
+      expect(rendered).to have_selector(
+        'a[data-testid="gitlab-version-container"][data-track-label="version_help_dropdown"]'
       )
 
       expect(rendered).to have_selector(
         'a[data-testid="gitlab-version-container"]' \
-        "[data-track-label=\"#{Gitlab.version_info.major}.#{Gitlab.version_info.minor}\"]"
+        "[data-track-property=\"#{Gitlab.version_info.major}.#{Gitlab.version_info.minor}\"]"
       )
     end
   end