1 files changed, 54 insertions, 19 deletions
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index bf521971ae0..404e51048bc 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -536,8 +536,8 @@ RSpec.describe 'Pipelines', :js do
         context 'for a failed pipeline' do
           let!(:build) do
             create(:ci_build, :failed, pipeline: pipeline,
-                                      stage: 'build',
-                                      name: 'build')
+                                       stage: 'build',
+                                       name: 'build')
           end
 
           it 'displays the failure reason' do
@@ -635,10 +635,10 @@ RSpec.describe 'Pipelines', :js do
         expect(page).to have_link(pipeline.user.name, href: user_path(pipeline.user))
 
         # stages
-        expect(page).to have_text('Build')
-        expect(page).to have_text('Test')
-        expect(page).to have_text('Deploy')
-        expect(page).to have_text('External')
+        expect(page).to have_text('build')
+        expect(page).to have_text('test')
+        expect(page).to have_text('deploy')
+        expect(page).to have_text('external')
 
         # builds
         expect(page).to have_text('rspec')
@@ -656,19 +656,7 @@ RSpec.describe 'Pipelines', :js do
     describe 'POST /:project/-/pipelines' do
       let(:project) { create(:project, :repository) }
 
-      before do
-        visit new_project_pipeline_path(project)
-      end
-
-      context 'for valid commit', :js do
-        before do
-          click_button project.default_branch
-          wait_for_requests
-
-          find('p', text: 'master').click
-          wait_for_requests
-        end
-
+      shared_examples 'run pipeline form with gitlab-ci.yml' do
         context 'with gitlab-ci.yml', :js do
           before do
             stub_ci_pipeline_to_return_yaml_file
@@ -702,7 +690,9 @@ RSpec.describe 'Pipelines', :js do
             end
           end
         end
+      end
 
+      shared_examples 'run pipeline form without gitlab-ci.yml' do
         context 'without gitlab-ci.yml' do
           before do
             click_on 'Run pipeline'
@@ -722,6 +712,51 @@ RSpec.describe 'Pipelines', :js do
           end
         end
       end
+
+      # Run Pipeline form with REST endpoints
+      # TODO: Clean up tests when run_pipeline_graphql is enabled
+      context 'with feature flag disabled' do
+        before do
+          stub_feature_flags(run_pipeline_graphql: false)
+          visit new_project_pipeline_path(project)
+        end
+
+        context 'for valid commit', :js do
+          before do
+            click_button project.default_branch
+            wait_for_requests
+
+            find('p', text: 'master').click
+            wait_for_requests
+          end
+
+          it_behaves_like 'run pipeline form with gitlab-ci.yml'
+
+          it_behaves_like 'run pipeline form without gitlab-ci.yml'
+        end
+      end
+
+      # Run Pipeline form with GraphQL
+      context 'with feature flag enabled' do
+        before do
+          stub_feature_flags(run_pipeline_graphql: true)
+          visit new_project_pipeline_path(project)
+        end
+
+        context 'for valid commit', :js do
+          before do
+            click_button project.default_branch
+            wait_for_requests
+
+            find('p', text: 'master').click
+            wait_for_requests
+          end
+
+          it_behaves_like 'run pipeline form with gitlab-ci.yml'
+
+          it_behaves_like 'run pipeline form without gitlab-ci.yml'
+        end
+      end
     end
 
     describe 'Reset runner caches' do