Remove spec/factory and spec/factories

features/support/env.rb

@@ -8,7 +8,6 @@ require 'webmock/cucumber'
 
 WebMock.allow_net_connect!
 
-require Rails.root.join 'spec/factories'
 require Rails.root.join 'spec/support/monkeypatch'
 require Rails.root.join 'spec/support/gitolite_stub'
 require Rails.root.join 'spec/support/login_helpers'

spec/factories.rb

@@ -1,97 +0,0 @@
-require File.join(Rails.root, 'spec', 'factory')
-
-Factory.add(:project, Project) do |obj|
-  obj.name = Faker::Internet.user_name
-  obj.path = 'gitlabhq'
-  obj.owner = Factory(:user)
-  obj.code = 'LGT'
-end
-
-Factory.add(:project_without_owner, Project) do |obj|
-  obj.name = Faker::Internet.user_name
-  obj.path = 'gitlabhq'
-  obj.code = 'LGT'
-end
-
-Factory.add(:public_project, Project) do |obj|
-  obj.name = Faker::Internet.user_name
-  obj.path = 'gitlabhq'
-  obj.private_flag = false
-  obj.owner = Factory(:user)
-  obj.code = 'LGT'
-end
-
-Factory.add(:user, User) do |obj|
-  obj.email = Faker::Internet.email
-  obj.password = "123456"
-  obj.name = Faker::Name.name
-  obj.password_confirmation = "123456"
-end
-
-Factory.add(:admin, User) do |obj|
-  obj.email = Faker::Internet.email
-  obj.password = "123456"
-  obj.name = Faker::Name.name
-  obj.password_confirmation = "123456"
-  obj.admin = true
-end
-
-Factory.add(:issue, Issue) do |obj|
-  obj.title = Faker::Lorem.sentence
-  obj.author = Factory :user
-  obj.assignee = Factory :user
-end
-
-Factory.add(:merge_request, MergeRequest) do |obj|
-  obj.title = Faker::Lorem.sentence
-  obj.author = Factory :user
-  obj.assignee = Factory :user
-  obj.source_branch = "master"
-  obj.target_branch = "stable"
-  obj.closed = false
-end
-
-Factory.add(:snippet, Snippet) do |obj|
-  obj.title = Faker::Lorem.sentence
-  obj.file_name = Faker::Lorem.sentence
-  obj.content = Faker::Lorem.sentences
-end
-
-Factory.add(:note, Note) do |obj|
-  obj.note = Faker::Lorem.sentence
-end
-
-Factory.add(:key, Key) do |obj|
-  obj.title = "Example key"
-  obj.key = File.read(File.join(Rails.root, "db", "pkey.example"))
-end
-
-Factory.add(:project_hook, ProjectHook) do |obj|
-  obj.url = Faker::Internet.uri("http")
-end
-
-Factory.add(:system_hook, SystemHook) do |obj|
-  obj.url = Faker::Internet.uri("http")
-end
-
-Factory.add(:wiki, Wiki) do |obj|
-  obj.title = Faker::Lorem.sentence
-  obj.content = Faker::Lorem.sentence
-  obj.user = Factory(:user)
-  obj.project = Factory(:project)
-end
-
-Factory.add(:event, Event) do |obj|
-  obj.title = Faker::Lorem.sentence
-  obj.project = Factory(:project)
-end
-
-Factory.add(:milestone, Milestone) do |obj|
-  obj.title = Faker::Lorem.sentence
-  obj.due_date = Date.today + 1.month
-end
-
-Factory.add(:users_project, UsersProject) do |obj|
-  obj.user = Factory :user
-  obj.project = Factory :project
-end

spec/factory.rb

@@ -1,29 +0,0 @@
-class Factory
-  @factories = {}
-
-  class << self
-    def add(name, klass, &block)
-      @factories[name] = [klass, block]
-    end
-
-    def create(name, opts = {})
-      new(name, opts).tap(&:save!)
-    end
-
-    def new(name, opts = {})
-      factory= @factories[name]
-      factory[0].new.tap do |obj|
-        factory[1].call(obj)
-      end.tap do |obj|
-        opts.each do |k, opt|
-          obj.send("#{k}=", opt)
-        end
-      end
-    end
-  end
-end
-
-def Factory(name, opts={})
-  Factory.create name, opts
-end
-

spec/spec_helper.rb

@@ -10,7 +10,6 @@ require 'rspec/rails'
 require 'capybara/rails'
 require 'capybara/rspec'
 require 'webmock/rspec'
-require 'factories'
 require 'email_spec'
 require 'headless'