Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/views/events/event/_common.html.haml_spec.rb b/spec/views/events/event/_common.html.haml_spec.rb
index cff1ec43a14..de6f6d1abfa 100644
--- a/spec/views/events/event/_common.html.haml_spec.rb
+++ b/spec/views/events/event/_common.html.haml_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe 'events/event/_common.html.haml' do
 
     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.iid}?iid_path=true"
+        work_item.reference_link_text, href: "/#{project.full_path}/-/work_items/#{work_item.iid}"
       )
     end
 
diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index c85534b73ee..15f5229cc43 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -466,7 +466,7 @@ RSpec.describe 'layouts/nav/sidebar/_project', feature_category: :navigation do
       it 'has a link to the terraform page' do
         render
 
-        expect(rendered).to have_link('Terraform', href: project_terraform_index_path(project))
+        expect(rendered).to have_link('Terraform states', href: project_terraform_index_path(project))
       end
 
       describe 'when the user does not have access' do
@@ -475,7 +475,7 @@ RSpec.describe 'layouts/nav/sidebar/_project', feature_category: :navigation do
         it 'does not have a link to the terraform page' do
           render
 
-          expect(rendered).not_to have_link('Terraform')
+          expect(rendered).not_to have_link('Terraform states')
         end
       end
     end