Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 533434ce0d9..59d9e6d105e 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -65,6 +65,24 @@ RSpec.describe "Projects > Settings > Pipelines settings", feature_category: :gr
       expect(checkbox).not_to be_checked
     end
 
+    it 'disables forward deployment rollback allowed when forward deployment enabled is unchecked', :js do
+      visit project_settings_ci_cd_path(project)
+
+      forward_deployment_checkbox = find_field('project_ci_cd_settings_attributes_forward_deployment_enabled')
+      forward_deployment_rollback_checkbox =
+        find_field('project_ci_cd_settings_attributes_forward_deployment_rollback_allowed')
+      expect(forward_deployment_checkbox).to be_checked
+      expect(forward_deployment_rollback_checkbox).not_to be_disabled
+
+      forward_deployment_checkbox.click
+
+      expect(forward_deployment_rollback_checkbox).to be_disabled
+
+      forward_deployment_checkbox.click
+
+      expect(forward_deployment_rollback_checkbox).not_to be_disabled
+    end
+
     it 'updates forward_deployment_rollback_allowed' do
       visit project_settings_ci_cd_path(project)