Re-use the creator's namespace in the Project factoryrs-remove-creator-alias

Previously we were creating two User records for every project factory -
one for the namespace, and one for the creator.

3 files changed, 4 insertions, 4 deletions

diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 992580a6b34..d0380b4a706 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -6,8 +6,8 @@ FactoryGirl.define do
   factory :empty_project, class: 'Project' do
     sequence(:name) { |n| "project#{n}" }
     path { name.downcase.gsub(/\s/, '_') }
-    namespace
-    creator
+    namespace { creator.namespace }
+    association :creator, factory: :user
 
     # Behaves differently to nil due to cache_has_external_issue_tracker
     has_external_issue_tracker false
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index c6f7869516e..e4f01c70a2c 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   sequence(:name) { FFaker::Name.name }
 
-  factory :user, aliases: [:author, :assignee, :recipient, :owner, :creator, :resource_owner] do
+  factory :user, aliases: [:author, :assignee, :recipient, :owner, :resource_owner] do
     email { FFaker::Internet.email }
     name
     sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 8048e86fc3a..3020863ef00 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -275,7 +275,7 @@ describe Project, models: true do
   end
 
   describe '#name_with_namespace' do
-    let(:project) { build_stubbed(:empty_project) }
+    let(:project) { build(:empty_project) }
 
     it { expect(project.name_with_namespace).to eq "#{project.namespace.human_name} / #{project.name}" }
     it { expect(project.human_name).to eq project.name_with_namespace }