Merge branch 'rs-repository-project-trait-ee' into 'master'

[EE] Add a `:repository` trait to the `:empty_project` factory

See merge request !1068

features/steps/dashboard/dashboard.rb

@@ -35,7 +35,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
 
   step 'I have group with projects' do
     @group   = create(:group)
-    @project = create(:project, namespace: @group)
+    @project = create(:empty_project, namespace: @group)
     @event   = create(:closed_issue_event, project: @project)
 
     @project.team << [current_user, :master]
@@ -54,8 +54,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
   end
 
   step 'group has a projects that does not belongs to me' do
-    @forbidden_project1 = create(:project, group: @group)
-    @forbidden_project2 = create(:project, group: @group)
+    @forbidden_project1 = create(:empty_project, group: @group)
+    @forbidden_project2 = create(:empty_project, group: @group)
   end
 
   step 'I should see 1 project at group list' do

features/steps/dashboard/issues.rb

@@ -79,13 +79,13 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
 
   def project
     @project ||= begin
-                   project = create :project
+                   project = create(:empty_project)
                    project.team << [current_user, :master]
                    project
                  end
   end
 
   def public_project
-    @public_project ||= create :project, :public
+    @public_project ||= create(:empty_project, :public)
   end
 end

features/steps/dashboard/merge_requests.rb

@@ -105,14 +105,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   def project
     @project ||= begin
-                   project = create :project
+                   project = create(:project, :repository)
                    project.team << [current_user, :master]
                    project
                  end
   end
 
   def public_project
-    @public_project ||= create :project, :public
+    @public_project ||= create(:project, :public, :repository)
   end
 
   def forked_project

features/steps/group/milestones.rb

@@ -104,7 +104,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
     group = owned_group
 
     %w(gitlabhq gitlab-ci cookbook-gitlab).each do |path|
-      project = create :project, path: path, group: group
+      project = create(:empty_project, path: path, group: group)
       milestone = create :milestone, title: "Version 7.2", project: project
 
       create(:label, project: project, title: 'bug')

features/steps/groups.rb

@@ -132,7 +132,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
 
   step 'Group "Owned" has archived project' do
     group = Group.find_by(name: 'Owned')
-    @archived_project = create(:project, namespace: group, archived: true, path: "archived-project")
+    @archived_project = create(:empty_project, :archived, namespace: group, path: "archived-project")
   end
 
   step 'I should see "archived" label' do

features/steps/profile/profile.rb

@@ -162,7 +162,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
   step 'I have group with projects' do
     @group = create(:group)
     @group.add_owner(current_user)
-    @project = create(:project, namespace: @group)
+    @project = create(:project, :repository, namespace: @group)
     @event   = create(:closed_issue_event, project: @project)
 
     @project.team << [current_user, :master]

features/steps/project/deploy_keys.rb

@@ -46,11 +46,11 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
   end
 
   step 'other projects have deploy keys' do
-    @second_project = create(:project, namespace: create(:group))
+    @second_project = create(:empty_project, namespace: create(:group))
     @second_project.team << [current_user, :master]
     create(:deploy_keys_project, project: @second_project)
 
-    @third_project = create(:project, namespace: create(:group))
+    @third_project = create(:empty_project, namespace: create(:group))
     @third_project.team << [current_user, :master]
     create(:deploy_keys_project, project: @third_project, deploy_key: @second_project.deploy_keys.first)
   end

features/steps/project/fork.rb

@@ -9,7 +9,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
   end
 
   step 'I am a member of project "Shop"' do
-    @project = create(:project, name: "Shop")
+    @project = create(:project, :repository, name: "Shop")
     @project.team << [@user, :reporter]
   end
 
@@ -18,7 +18,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
   end
 
   step 'I already have a project named "Shop" in my namespace' do
-    @my_project = create(:project, name: "Shop", namespace: current_user.namespace)
+    @my_project = create(:project, :repository, name: "Shop", namespace: current_user.namespace)
   end
 
   step 'I should see a "Name has already been taken" warning' do

features/steps/project/forked_merge_requests.rb

@@ -7,7 +7,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
 
   step 'I am a member of project "Shop"' do
     @project = Project.find_by(name: "Shop")
-    @project ||= create(:project, name: "Shop")
+    @project ||= create(:project, :repository, name: "Shop")
     @project.team << [@user, :reporter]
   end
 

features/steps/project/merge_requests/acceptance.rb

@@ -28,7 +28,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
 
   step 'There is an open Merge Request' do
     @user = create(:user)
-    @project = create(:project, :public)
+    @project = create(:project, :public, :repository)
     @project_member = create(:project_member, :developer, user: @user, project: @project)
     @merge_request = create(:merge_request, :with_diffs, :simple, source_project: @project)
   end

features/steps/project/merge_requests/revert.rb

@@ -35,7 +35,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
 
   step 'There is an open Merge Request' do
     @user = create(:user)
-    @project = create(:project, :public)
+    @project = create(:project, :public, :repository)
     @project_member = create(:project_member, :developer, user: @user, project: @project)
     @merge_request = create(:merge_request, :with_diffs, :simple, source_project: @project)
   end

features/steps/project/redirects.rb

@@ -4,11 +4,11 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
   include SharedProject
 
   step 'public project "Community"' do
-    create :project, :public, name: 'Community'
+    create(:empty_project, :public, name: 'Community')
   end
 
   step 'private project "Enterprise"' do
-    create :project, name: 'Enterprise'
+    create(:empty_project, :private, name: 'Enterprise')
   end
 
   step 'I visit project "Community" page' do

features/steps/project/source/browse_files.rb

@@ -6,7 +6,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   include RepoHelpers
 
   step "I don't have write access" do
-    @project = create(:project, name: "Other Project", path: "other-project")
+    @project = create(:project, :repository, name: "Other Project", path: "other-project")
     @project.team << [@user, :reporter]
     visit namespace_project_tree_path(@project.namespace, @project, root_ref)
   end

features/steps/project/source/markdown_render.rb

@@ -8,7 +8,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I own project "Delta"' do
     @project = Project.find_by(name: "Delta")
-    @project ||= create(:project, name: "Delta", namespace: @user.namespace)
+    @project ||= create(:project, :repository, name: "Delta", namespace: @user.namespace)
     @project.team << [@user, :master]
   end
 

features/steps/project/team_management.rb

@@ -137,7 +137,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
   step 'I share project with group "OpenSource"' do
     project = Project.find_by(name: 'Shop')
     os_group = create(:group, name: 'OpenSource')
-    create(:project, group: os_group)
+    create(:empty_project, group: os_group)
     @os_user1 = create(:user)
     @os_user2 = create(:user)
     os_group.add_owner(@os_user1)

features/steps/shared/admin.rb

@@ -2,7 +2,7 @@ module SharedAdmin
   include Spinach::DSL
 
   step 'there are projects in system' do
-    2.times { create(:project) }
+    2.times { create(:project, :repository) }
   end
 
   step 'system has users' do

features/steps/shared/group.rb

@@ -44,7 +44,7 @@ module SharedGroup
     user = User.find_by(name: username) || create(:user, name: username)
     group = Group.find_by(name: groupname) || create(:group, name: groupname)
     group.add_user(user, role)
-    project ||= create(:project, namespace: group, path: "project#{@project_count}")
+    project ||= create(:project, :repository, namespace: group, path: "project#{@project_count}")
     create(:closed_issue_event, project: project)
     project.team << [user, :master]
     @project_count += 1

features/steps/shared/project.rb

@@ -3,7 +3,7 @@ module SharedProject
 
   # Create a project without caring about what it's called
   step "I own a project" do
-    @project = create(:project, namespace: @user.namespace)
+    @project = create(:project, :repository, namespace: @user.namespace)
     @project.team << [@user, :master]
   end
 
@@ -15,13 +15,13 @@ module SharedProject
 
   step "project exists in some group namespace" do
     @group = create(:group, name: 'some group')
-    @project = create(:project, namespace: @group, public_builds: false)
+    @project = create(:project, :repository, namespace: @group, public_builds: false)
   end
 
   # Create a specific project called "Shop"
   step 'I own project "Shop"' do
     @project = Project.find_by(name: "Shop")
-    @project ||= create(:project, name: "Shop", namespace: @user.namespace, issues_template: "This issue should contain the following.", merge_requests_template: "This merge request should contain the following.")
+    @project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace, issues_template: "This issue should contain the following.", merge_requests_template: "This merge request should contain the following.")
     @project.team << [@user, :master]
   end
 
@@ -46,7 +46,7 @@ module SharedProject
   # Create another specific project called "Forum"
   step 'I own project "Forum"' do
     @project = Project.find_by(name: "Forum")
-    @project ||= create(:project, name: "Forum", namespace: @user.namespace, path: 'forum_project')
+    @project ||= create(:project, :repository, name: "Forum", namespace: @user.namespace, path: 'forum_project')
     @project.build_project_feature
     @project.project_feature.save
     @project.team << [@user, :master]
@@ -127,7 +127,7 @@ module SharedProject
   # ----------------------------------------
 
   step 'archived project "Archive"' do
-    create :project, :public, archived: true, name: 'Archive'
+    create(:project, :archived, :public, :repository, name: 'Archive')
   end
 
   step 'I should not see project "Archive"' do
@@ -150,7 +150,7 @@ module SharedProject
   # ----------------------------------------
 
   step 'private project "Enterprise"' do
-    create :project, name: 'Enterprise'
+    create(:project, :private, :repository, name: 'Enterprise')
   end
 
   step 'I should see project "Enterprise"' do
@@ -162,7 +162,7 @@ module SharedProject
   end
 
   step 'internal project "Internal"' do
-    create :project, :internal, name: 'Internal'
+    create(:project, :internal, :repository, name: 'Internal')
   end
 
   step 'I should see project "Internal"' do
@@ -174,7 +174,7 @@ module SharedProject
   end
 
   step 'public project "Community"' do
-    create :project, :public, name: 'Community'
+    create(:project, :public, :repository, name: 'Community')
   end
 
   step 'I should see project "Community"' do

features/steps/user.rb

@@ -55,6 +55,6 @@ class Spinach::Features::User < Spinach::FeatureSteps
   end
 
   def contributed_project
-    @contributed_project ||= create(:project, :public)
+    @contributed_project ||= create(:empty_project, :public)
   end
 end

spec/factories/projects.rb

@@ -49,6 +49,10 @@ FactoryGirl.define do
       request_access_enabled true
     end
 
+    trait :repository do
+      # no-op... for now!
+    end
+
     trait :empty_repo do
       after(:create) do |project|
         project.create_repository