Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finder

# Conflicts:
#   spec/models/project_spec.rb

4 files changed, 70 insertions, 3 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 85ba7d4097d..90754319f05 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -27,6 +27,12 @@ FactoryBot.define do
 
     pipeline factory: :ci_pipeline
 
+    trait :degenerated do
+      commands nil
+      options nil
+      yaml_variables nil
+    end
+
     trait :started do
       started_at 'Di 29. Okt 09:51:28 CET 2013'
     end
@@ -94,6 +100,30 @@ FactoryBot.define do
                              url: 'http://staging.example.com/$CI_JOB_NAME' }
     end
 
+    trait :deploy_to_production do
+      environment 'production'
+
+      options environment: { name: 'production',
+                             url: 'http://prd.example.com/$CI_JOB_NAME' }
+    end
+
+    trait :start_review_app do
+      environment 'review/$CI_COMMIT_REF_NAME'
+
+      options environment: { name: 'review/$CI_COMMIT_REF_NAME',
+                             url: 'http://staging.example.com/$CI_JOB_NAME',
+                             on_stop: 'stop_review_app' }
+    end
+
+    trait :stop_review_app do
+      name 'stop_review_app'
+      environment 'review/$CI_COMMIT_REF_NAME'
+
+      options environment: { name: 'review/$CI_COMMIT_REF_NAME',
+                             url: 'http://staging.example.com/$CI_JOB_NAME',
+                             action: 'stop' }
+    end
+
     trait :allowed_to_fail do
       allow_failure true
     end
diff --git a/spec/factories/clusters/kubernetes_namespaces.rb b/spec/factories/clusters/kubernetes_namespaces.rb
index 6fdada75a3d..3f10f0ecc74 100644
--- a/spec/factories/clusters/kubernetes_namespaces.rb
+++ b/spec/factories/clusters/kubernetes_namespaces.rb
@@ -2,8 +2,18 @@
 
 FactoryBot.define do
   factory :cluster_kubernetes_namespace, class: Clusters::KubernetesNamespace do
-    cluster
-    project
-    cluster_project
+    association :cluster, :project, :provided_by_gcp
+    namespace { |n| "environment#{n}" }
+
+    after(:build) do |kubernetes_namespace|
+      cluster_project = kubernetes_namespace.cluster.cluster_project
+
+      kubernetes_namespace.project = cluster_project.project
+      kubernetes_namespace.cluster_project = cluster_project
+    end
+
+    trait :with_token do
+      service_account_token { Faker::Lorem.characters(10) }
+    end
   end
 end
diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb
index 90d6a338479..011c98599a3 100644
--- a/spec/factories/deployments.rb
+++ b/spec/factories/deployments.rb
@@ -21,5 +21,31 @@ FactoryBot.define do
       sha { TestEnv::BRANCH_SHA['pages-deploy'] }
       ref 'pages-deploy'
     end
+
+    trait :running do
+      status :running
+    end
+
+    trait :success do
+      status :success
+      finished_at { Time.now }
+    end
+
+    trait :failed do
+      status :failed
+      finished_at { Time.now }
+    end
+
+    trait :canceled do
+      status :canceled
+      finished_at { Time.now }
+    end
+
+    # This trait hooks the state maechine's events
+    trait :succeed do
+      after(:create) do |deployment, evaluator|
+        deployment.succeed!
+      end
+    end
   end
 end
diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb
index b5db57d5148..9d9e3d693b8 100644
--- a/spec/factories/environments.rb
+++ b/spec/factories/environments.rb
@@ -22,6 +22,7 @@ FactoryBot.define do
                                        pipeline: pipeline)
 
         deployment = create(:deployment,
+                            :success,
                             environment: environment,
                             project: environment.project,
                             deployable: deployable,