Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 73 deletions

diff --git a/qa/qa/page/project/settings/ci_variables.rb b/qa/qa/page/project/settings/ci_variables.rb
index 8df0aaa9f27..1315ed8ca73 100644
--- a/qa/qa/page/project/settings/ci_variables.rb
+++ b/qa/qa/page/project/settings/ci_variables.rb
@@ -11,7 +11,6 @@ module QA
             element :ci_variable_key_field
             element :ci_variable_value_field
             element :ci_variable_save_button
-            element :ci_variable_delete_button
           end
 
           def fill_variable(key, value, masked = false)
@@ -37,14 +36,6 @@ module QA
           def click_ci_variable_save_button
             click_element :ci_variable_save_button
           end
-
-          def click_reveal_ci_variable_value_button
-            click_element :reveal_ci_variable_value_button
-          end
-
-          def click_ci_variable_delete_button
-            click_element :ci_variable_delete_button
-          end
         end
       end
     end
diff --git a/qa/qa/resource/ci_variable.rb b/qa/qa/resource/ci_variable.rb
index b632446623d..4123b8fe62b 100644
--- a/qa/qa/resource/ci_variable.rb
+++ b/qa/qa/resource/ci_variable.rb
@@ -18,19 +18,6 @@ module QA
         @variable_type = 'env_var'
       end
 
-      def fabricate!
-        project.visit!
-
-        Page::Project::Menu.perform(&:go_to_ci_cd_settings)
-
-        Page::Project::Settings::CiCd.perform do |setting|
-          setting.expand_ci_variables do |page|
-            page.click_add_variable
-            page.fill_variable(key, value, masked)
-          end
-        end
-      end
-
       def fabricate_via_api!
         resource_web_url(api_get)
       rescue ResourceNotFoundError
diff --git a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
deleted file mode 100644
index 8474e5c1b37..00000000000
--- a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  RSpec.describe 'Verify' do
-    describe 'Add or Remove CI variable via UI', :smoke, product_group: :pipeline_security do
-      let(:project) do
-        Resource::Project.fabricate_via_api_unless_fips! do |project|
-          project.name = 'project-with-ci-variables'
-          project.description = 'project with CI variables'
-        end
-      end
-
-      before do
-        Flow::Login.sign_in
-        project.visit!
-        add_ci_variable
-      end
-
-      it 'user adds a CI variable', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348027' do
-        Page::Project::Settings::CiVariables.perform do |ci_variable|
-          expect(ci_variable).to have_text('VARIABLE_KEY')
-          expect(ci_variable).not_to have_text('some_CI_variable')
-
-          ci_variable.click_reveal_ci_variable_value_button
-
-          expect(ci_variable).to have_text('some_CI_variable')
-        end
-      end
-
-      it 'user removes a CI variable', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348026' do
-        Page::Project::Settings::CiVariables.perform do |ci_variable|
-          ci_variable.click_edit_ci_variable
-          ci_variable.click_ci_variable_delete_button
-
-          expect(ci_variable).to have_text('There are no variables yet', wait: 60)
-        end
-      end
-
-      private
-
-      def add_ci_variable
-        Resource::CiVariable.fabricate_via_browser_ui! do |ci_variable|
-          ci_variable.project = project
-          ci_variable.key = 'VARIABLE_KEY'
-          ci_variable.value = 'some_CI_variable'
-          ci_variable.masked = false
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/specs/features/browser_ui/8_monitor/incident_management/recovery_alert_closes_correct_incident.rb b/qa/qa/specs/features/browser_ui/8_monitor/incident_management/recovery_alert_closes_correct_incident_spec.rb
index fe3cd5a432b..fe3cd5a432b 100644
--- a/qa/qa/specs/features/browser_ui/8_monitor/incident_management/recovery_alert_closes_correct_incident.rb
+++ b/qa/qa/specs/features/browser_ui/8_monitor/incident_management/recovery_alert_closes_correct_incident_spec.rb