Merge branch 'rs-factory-nitpicks' into 'master'

More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108

3 files changed, 22 insertions, 12 deletions

diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index ed072213153..9794772ac7d 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -1,14 +1,6 @@
 FactoryGirl.define do
   factory :email do
     user
-    email do
-      FFaker::Internet.email('alias')
-    end
-
-    factory :another_email do
-      email do
-        FFaker::Internet.email('another.alias')
-      end
-    end
+    email { FFaker::Internet.email('alias') }
   end
 end
diff --git a/spec/factories/project_members.rb b/spec/factories/project_members.rb
index 70fb7595c74..cf3659ba275 100644
--- a/spec/factories/project_members.rb
+++ b/spec/factories/project_members.rb
@@ -2,6 +2,26 @@ FactoryGirl.define do
   factory :project_member do
     user
     project
-    access_level { ProjectMember::MASTER }
+    master
+
+    trait :guest do
+      access_level ProjectMember::GUEST
+    end
+
+    trait :reporter do
+      access_level ProjectMember::REPORTER
+    end
+
+    trait :developer do
+      access_level ProjectMember::DEVELOPER
+    end
+
+    trait :master do
+      access_level ProjectMember::MASTER
+    end
+
+    trait :owner do
+      access_level ProjectMember::OWNER
+    end
   end
 end
diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index f7c285cff3a..9de78d68280 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -1,7 +1,5 @@
 FactoryGirl.define do
   factory :service do
-    type ""
-    title "GitLab CI"
     project
   end
 end