Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 30 insertions, 12 deletions

diff --git a/spec/features/populate_new_pipeline_vars_with_params_spec.rb b/spec/features/populate_new_pipeline_vars_with_params_spec.rb
index 744543d1252..75fa8561235 100644
--- a/spec/features/populate_new_pipeline_vars_with_params_spec.rb
+++ b/spec/features/populate_new_pipeline_vars_with_params_spec.rb
@@ -7,24 +7,42 @@ RSpec.describe "Populate new pipeline CI variables with url params", :js do
   let(:project) { create(:project) }
   let(:page_path) { new_project_pipeline_path(project) }
 
-  before do
-    sign_in(user)
-    project.add_maintainer(user)
+  shared_examples 'form pre-filled with URL params' do
+    before do
+      sign_in(user)
+      project.add_maintainer(user)
 
-    visit "#{page_path}?var[key1]=value1&file_var[key2]=value2"
+      visit "#{page_path}?var[key1]=value1&file_var[key2]=value2"
+    end
+
+    it "var[key1]=value1 populates env_var variable correctly" do
+      page.within(all("[data-testid='ci-variable-row']")[0]) do
+        expect(find("[data-testid='pipeline-form-ci-variable-key']").value).to eq('key1')
+        expect(find("[data-testid='pipeline-form-ci-variable-value']").value).to eq('value1')
+      end
+    end
+
+    it "file_var[key2]=value2 populates file variable correctly" do
+      page.within(all("[data-testid='ci-variable-row']")[1]) do
+        expect(find("[data-testid='pipeline-form-ci-variable-key']").value).to eq('key2')
+        expect(find("[data-testid='pipeline-form-ci-variable-value']").value).to eq('value2')
+      end
+    end
   end
 
-  it "var[key1]=value1 populates env_var variable correctly" do
-    page.within(all("[data-testid='ci-variable-row']")[0]) do
-      expect(find("[data-testid='pipeline-form-ci-variable-key']").value).to eq('key1')
-      expect(find("[data-testid='pipeline-form-ci-variable-value']").value).to eq('value1')
+  context 'when feature flag is disabled' do
+    before do
+      stub_feature_flags(run_pipeline_graphql: false)
     end
+
+    it_behaves_like 'form pre-filled with URL params'
   end
 
-  it "file_var[key2]=value2 populates file variable correctly" do
-    page.within(all("[data-testid='ci-variable-row']")[1]) do
-      expect(find("[data-testid='pipeline-form-ci-variable-key']").value).to eq('key2')
-      expect(find("[data-testid='pipeline-form-ci-variable-value']").value).to eq('value2')
+  context 'when feature flag is enabled' do
+    before do
+      stub_feature_flags(run_pipeline_graphql: true)
     end
+
+    it_behaves_like 'form pre-filled with URL params'
   end
 end