1 files changed, 15 insertions, 20 deletions

diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index 5c8ec465143..8b165a04382 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -8,7 +8,7 @@ module QA
     describe 'Auto DevOps support' do
       def login
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.act { sign_in_using_credentials }
+        Page::Main::Login.perform(&:sign_in_using_credentials)
       end
 
       [true, false].each do |rbac|
@@ -38,11 +38,9 @@ module QA
               push.commit_message = 'Create Auto DevOps compatible rack application'
             end
 
-            Page::Project::Show.act { wait_for_push }
-
             # Create and connect K8s cluster
             @cluster = Service::KubernetesCluster.new(rbac: rbac).create!
-            kubernetes_cluster = Resource::KubernetesCluster.fabricate! do |cluster|
+            Resource::KubernetesCluster.fabricate! do |cluster|
               cluster.project = @project
               cluster.cluster = @cluster
               cluster.install_helm_tiller = true
@@ -51,14 +49,11 @@ module QA
               cluster.install_runner = true
             end
 
-            kubernetes_cluster.populate(:ingress_ip)
             @project.visit!
-            Page::Project::Menu.act { click_ci_cd_settings }
+            Page::Project::Menu.perform(&:click_ci_cd_settings)
             Page::Project::Settings::CICD.perform do |p|
               p.enable_auto_devops
             end
-
-            kubernetes_cluster.populate(:domain)
           end
 
           after(:all) do
@@ -71,14 +66,14 @@ module QA
 
           it 'runs auto devops' do
             @project.visit!
-            Page::Project::Menu.act { click_ci_cd_pipelines }
-            Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
+            Page::Project::Menu.perform(&:click_ci_cd_pipelines)
+            Page::Project::Pipeline::Index.perform(&:go_to_latest_pipeline)
 
             Page::Project::Pipeline::Show.perform do |pipeline|
               pipeline.go_to_job('build')
             end
             Page::Project::Job::Show.perform do |job|
-              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+              expect(job).to be_successful(timeout: 600)
 
               job.click_element(:pipeline_path)
             end
@@ -87,7 +82,7 @@ module QA
               pipeline.go_to_job('test')
             end
             Page::Project::Job::Show.perform do |job|
-              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+              expect(job).to be_successful(timeout: 600)
 
               job.click_element(:pipeline_path)
             end
@@ -96,12 +91,12 @@ module QA
               pipeline.go_to_job('production')
             end
             Page::Project::Job::Show.perform do |job|
-              expect(job).to be_sucessful(timeout: 1200), "Job did not pass"
+              expect(job).to be_successful(timeout: 1200)
 
               job.click_element(:pipeline_path)
             end
 
-            Page::Project::Menu.act { click_operations_environments }
+            Page::Project::Menu.perform(&:click_operations_environments)
             Page::Project::Operations::Environments::Index.perform do |index|
               index.go_to_environment('production')
             end
@@ -132,14 +127,14 @@ module QA
             end
 
             @project.visit!
-            Page::Project::Menu.act { click_ci_cd_pipelines }
-            Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
+            Page::Project::Menu.perform(&:click_ci_cd_pipelines)
+            Page::Project::Pipeline::Index.perform(&:go_to_latest_pipeline)
 
             Page::Project::Pipeline::Show.perform do |pipeline|
               pipeline.go_to_job('build')
             end
             Page::Project::Job::Show.perform do |job|
-              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+              expect(job).to be_successful(timeout: 600)
 
               job.click_element(:pipeline_path)
             end
@@ -148,7 +143,7 @@ module QA
               pipeline.go_to_job('test')
             end
             Page::Project::Job::Show.perform do |job|
-              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+              expect(job).to be_successful(timeout: 600)
 
               job.click_element(:pipeline_path)
             end
@@ -157,12 +152,12 @@ module QA
               pipeline.go_to_job('production')
             end
             Page::Project::Job::Show.perform do |job|
-              expect(job).to be_sucessful(timeout: 1200), "Job did not pass"
+              expect(job).to be_successful(timeout: 1200)
 
               job.click_element(:pipeline_path)
             end
 
-            Page::Project::Menu.act { click_operations_environments }
+            Page::Project::Menu.perform(&:click_operations_environments)
 
             Page::Project::Operations::Environments::Index.perform do |index|
               index.go_to_environment('production')