Add latest changes from gitlab-org/gitlab@master

3 files changed, 30 insertions, 1 deletions

diff --git a/spec/features/merge_request/user_sees_discussions_navigation_spec.rb b/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
index e5352ad88ce..5f815bffb22 100644
--- a/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
@@ -2,7 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Merge request > User sees discussions navigation', :js, feature_category: :code_review_workflow do
+RSpec.describe 'Merge request > User sees discussions navigation',
+  :js, feature_category: :code_review_workflow,
+  quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/410678' do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:user) { project.creator }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/projects/environments/environment_metrics_spec.rb b/spec/features/projects/environments/environment_metrics_spec.rb
index 0983bfa7abd..e212d464029 100644
--- a/spec/features/projects/environments/environment_metrics_spec.rb
+++ b/spec/features/projects/environments/environment_metrics_spec.rb
@@ -14,6 +14,8 @@ RSpec.describe 'Environment > Metrics', feature_category: :projects do
   let!(:staging) { create(:environment, name: 'staging', project: project) }
 
   before do
+    stub_feature_flags(remove_monitor_metrics: false)
+
     project.add_developer(user)
     stub_any_prometheus_request
 
@@ -66,6 +68,18 @@ RSpec.describe 'Environment > Metrics', feature_category: :projects do
     it_behaves_like 'has environment selector'
   end
 
+  context 'when metrics dashboard feature is unavailable' do
+    before do
+      stub_feature_flags(remove_monitor_metrics: true)
+    end
+
+    it 'does not provide a link to the monitoring dashboard' do
+      visit_environment(environment)
+
+      expect(page).not_to have_link('Monitoring')
+    end
+  end
+
   def visit_environment(environment)
     visit project_environment_path(environment.project, environment)
   end
diff --git a/spec/features/projects/work_items/work_item_spec.rb b/spec/features/projects/work_items/work_item_spec.rb
index d202f6ad500..b706a624fc5 100644
--- a/spec/features/projects/work_items/work_item_spec.rb
+++ b/spec/features/projects/work_items/work_item_spec.rb
@@ -41,6 +41,8 @@ RSpec.describe 'Work item', :js, feature_category: :team_planning do
     it_behaves_like 'work items description'
     it_behaves_like 'work items milestone'
     it_behaves_like 'work items notifications'
+    it_behaves_like 'work items todos'
+    it_behaves_like 'work items award emoji'
   end
 
   context 'for signed in owner' do
@@ -75,5 +77,16 @@ RSpec.describe 'Work item', :js, feature_category: :team_planning do
     it 'actions dropdown is not displayed' do
       expect(page).not_to have_selector('[data-testid="work-item-actions-dropdown"]')
     end
+
+    it 'todos action is not displayed' do
+      expect(page).not_to have_selector('[data-testid="work-item-todos-action"]')
+    end
+
+    it 'award button is disabled and add reaction is not displayed' do
+      within('[data-testid="work-item-award-list"]') do
+        expect(page).not_to have_selector('[data-testid="emoji-picker"]')
+        expect(page).to have_selector('[data-testid="award-button"].disabled')
+      end
+    end
   end
 end