Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch

5 files changed, 21 insertions, 4 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 0bb5a86d9b9..0cc498f0ce9 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -194,8 +194,8 @@ FactoryGirl.define do
     trait :extended_options do
       options do
         {
-            image: 'ruby:2.1',
-            services: ['postgres'],
+            image: { name: 'ruby:2.1', entrypoint: '/bin/sh' },
+            services: ['postgres', { name: 'docker:dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }],
             after_script: %w(ls date),
             artifacts: {
                 name: 'artifacts_file',
diff --git a/spec/factories/ci/stages.rb b/spec/factories/ci/stages.rb
index d37eabb3e8c..d3c8bf9d54f 100644
--- a/spec/factories/ci/stages.rb
+++ b/spec/factories/ci/stages.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :ci_stage, class: Ci::Stage do
+  factory :ci_stage, class: Ci::LegacyStage do
     skip_create
 
     transient do
@@ -10,7 +10,9 @@ FactoryGirl.define do
     end
 
     initialize_with do
-      Ci::Stage.new(pipeline, name: name, status: status, warnings: warnings)
+      Ci::LegacyStage.new(pipeline, name: name,
+                                    status: status,
+                                    warnings: warnings)
     end
   end
 end
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index f6a78811cbe..48142d3c49b 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -6,6 +6,12 @@ FactoryGirl.define do
     sequence(:position)
   end
 
+  factory :backlog_list, parent: :list do
+    list_type :backlog
+    label nil
+    position nil
+  end
+
   factory :closed_list, parent: :list do
     list_type :closed
     label nil
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index 18cb0f5de26..388f662e6e5 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -3,6 +3,7 @@ FactoryGirl.define do
     author
     title { generate(:title) }
     content { generate(:title) }
+    description { generate(:title) }
     file_name { generate(:filename) }
 
     trait :public do
diff --git a/spec/factories/uploads.rb b/spec/factories/uploads.rb
new file mode 100644
index 00000000000..1383420fb44
--- /dev/null
+++ b/spec/factories/uploads.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :upload do
+    model { build(:project) }
+    path { "uploads/system/project/avatar/avatar.jpg" }
+    size 100.kilobytes
+    uploader "AvatarUploader"
+  end
+end