Merge branch 'rs-reorganize-factories' into 'master'

Move EE-specific factories to their own files



See merge request !242

spec/factories.rb

@@ -161,10 +161,6 @@ FactoryGirl.define do
     url
   end
 
-  factory :group_hook do
-    url
-  end
-
   factory :project_snippet do
     project
     author
@@ -220,13 +216,6 @@ FactoryGirl.define do
     project
   end
 
-  factory :ldap_group_link do
-    cn 'group1'
-    group_access Gitlab::Access::GUEST
-    provider 'ldapmain'
-    group
-  end
-
   factory :identity do
     provider 'ldapmain'
     extern_uid 'my-ldap-id'
@@ -238,28 +227,4 @@ FactoryGirl.define do
     noteable factory: :issue
     reply_key "0123456789abcdef" * 2
   end
-
-  factory :gitlab_license, class: "Gitlab::License" do
-    starts_at { Date.today - 1.month }
-    expires_at { Date.today + 11.months }
-    licensee do
-      { "Name" => FFaker::Name.name }
-    end
-    notify_users_at   { |l| l.expires_at }
-    notify_admins_at  { |l| l.expires_at }
-  end
-
-  factory :license do
-    data { build(:gitlab_license).export }
-  end
-
-  factory :geo_node do
-    host { Gitlab.config.gitlab.host }
-    sequence(:port) {|n| n}
-
-    trait :primary do
-      primary true
-      port { Gitlab.config.gitlab.port }
-    end
-  end
 end

spec/factories/geo_nodes.rb

+FactoryGirl.define do
+  factory :geo_node do
+    host { Gitlab.config.gitlab.host }
+    sequence(:port) {|n| n}
+
+    trait :primary do
+      primary true
+      port { Gitlab.config.gitlab.port }
+    end
+  end
+end

spec/factories/group_hooks.rb

+FactoryGirl.define do
+  factory :group_hook do
+    url
+  end
+end

spec/factories/ldap_group_links.rb

+FactoryGirl.define do
+  factory :ldap_group_link do
+    cn 'group1'
+    group_access Gitlab::Access::GUEST
+    provider 'ldapmain'
+    group
+  end
+end

spec/factories/licenses.rb

+FactoryGirl.define do
+  factory :gitlab_license, class: "Gitlab::License" do
+    starts_at { Date.today - 1.month }
+    expires_at { Date.today + 11.months }
+    licensee do
+      { "Name" => FFaker::Name.name }
+    end
+    notify_users_at   { |l| l.expires_at }
+    notify_admins_at  { |l| l.expires_at }
+  end
+
+  factory :license do
+    data { build(:gitlab_license).export }
+  end
+end