Merge branch 'rs-backport-ee-372' into 'master'

Backport changes from gitlab-org/gitlab-ee!372

Mostly replaces several Spinach tests with RSpec Feature tests.

See merge request !4043

1 files changed, 7 insertions, 3 deletions

diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index ecd0e44dd62..4d61345696a 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -60,6 +60,12 @@ FactoryGirl.define do
     trait :private do
       visibility_level Gitlab::VisibilityLevel::PRIVATE
     end
+
+    trait :empty_repo do
+      after(:create) do |project|
+        project.create_repository
+      end
+    end
   end
 
   # Project with empty repository
@@ -67,9 +73,7 @@ FactoryGirl.define do
   # This is a case when you just created a project
   # but not pushed any code there yet
   factory :project_empty_repo, parent: :empty_project do
-    after :create do |project|
-      project.create_repository
-    end
+    empty_repo
   end
 
   # Project with test repository