factory_girl 2.0.5 → 2.1.0

data/lib/factory_girl/proxy/build.rb

@@ -23,19 +23,38 @@ module FactoryGirl
       end
 
       def associate(name, factory_name, overrides)
+        method = get_method(overrides[:method])
         factory = FactoryGirl.factory_by_name(factory_name)
-        set(name, factory.run(Proxy::Create, overrides))
+        set(name, factory.run(method, remove_method(overrides)))
       end
 
       def association(factory_name, overrides = {})
+        method = get_method(overrides[:method])
         factory = FactoryGirl.factory_by_name(factory_name)
-        factory.run(Proxy::Create, overrides)
+        factory.run(method, remove_method(overrides))
+      end
+
+      def remove_method(overrides)
+        overrides.dup.delete_if {|key, value| key == :method}
       end
 
       def result(to_create)
         run_callbacks(:after_build)
         @instance
       end
+
+      def parse_method(method)
+        method ||= :create
+        if :build == method
+          return Proxy::Build
+        elsif :create == method
+          return Proxy::Create
+        else
+          raise "unrecognized method #{method}"
+        end
+      end
+
+      alias_method :get_method, :parse_method
     end
   end
 end

data/lib/factory_girl/proxy/create.rb

@@ -11,6 +11,12 @@ module FactoryGirl
         run_callbacks(:after_create)
         @instance
       end
+
+      def get_method(method_string)
+        # Leaving this as Proxy::Build in the :method => :build case
+        # is a bit strange, but does it have any user-visible behaviors?
+        parse_method(method_string)
+      end
     end
   end
 end

data/lib/factory_girl/proxy/stub.rb

@@ -12,6 +12,10 @@ module FactoryGirl
             !new_record?
           end
 
+          def created_at
+            @created_at ||= Time.now
+          end
+
           def new_record?
             id.nil?
           end
@@ -60,12 +64,16 @@ module FactoryGirl
 
       def associate(name, factory_name, overrides)
         factory = FactoryGirl.factory_by_name(factory_name)
-        set(name, factory.run(Proxy::Stub, overrides))
+        set(name, factory.run(Proxy::Stub, remove_method(overrides)))
       end
 
       def association(factory_name, overrides = {})
         factory = FactoryGirl.factory_by_name(factory_name)
-        factory.run(Proxy::Stub, overrides)
+        factory.run(Proxy::Stub, remove_method(overrides))
+      end
+
+      def remove_method(overrides)
+        overrides.dup.delete_if {|key, value| key == :method}
       end
 
       def result(to_create)

data/lib/factory_girl/rails2.rb

@@ -1,5 +1,6 @@
 Rails.configuration.after_initialize do
   FactoryGirl.definition_file_paths = [
+    File.join(Rails.root, 'factories'),
     File.join(Rails.root, 'test', 'factories'),
     File.join(Rails.root, 'spec', 'factories')
   ]

data/lib/factory_girl/reload.rb

@@ -0,0 +1,8 @@
+module FactoryGirl
+  def self.reload
+    self.factories.clear
+    self.sequences.clear
+    self.traits.clear
+    self.find_definitions
+  end
+end

data/lib/factory_girl/syntax/default.rb

@@ -7,6 +7,10 @@ module FactoryGirl
         DSL.run(block)
       end
 
+      def modify(&block)
+        ModifyDSL.run(block)
+      end
+
       class DSL
         def self.run(block)
           new.instance_eval(&block)
@@ -39,6 +43,18 @@ module FactoryGirl
           FactoryGirl.register_trait(Trait.new(name, &block))
         end
       end
+
+      class ModifyDSL
+        def self.run(block)
+          new.instance_eval(&block)
+        end
+
+        def factory(name, options = {}, &block)
+          factory = FactoryGirl.factory_by_name(name).allow_overrides
+          proxy = FactoryGirl::DefinitionProxy.new(factory)
+          proxy.instance_eval(&block)
+        end
+      end
     end
   end
 

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end
 

data/spec/acceptance/build_spec.rb

@@ -31,3 +31,34 @@ describe "a built instance" do
   end
 end
 
+describe "a built instance with :method => :build" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('User')
+
+    define_model('Post', :user_id => :integer) do
+      belongs_to :user
+    end
+
+    FactoryGirl.define do
+      factory :user
+
+      factory :post do
+        association(:user, :method => :build)
+      end
+    end
+  end
+
+  subject { build(:post) }
+
+  it "isn't saved" do
+    should be_new_record
+  end
+
+  it "assigns but does not save associations" do
+    subject.user.should be_kind_of(User)
+    subject.user.should be_new_record
+  end
+
+end

data/spec/acceptance/create_spec.rb

@@ -31,6 +31,33 @@ describe "a created instance" do
   end
 end
 
+describe "a created instance, specifying :method => build" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('User')
+
+    define_model('Post', :user_id => :integer) do
+      belongs_to :user
+    end
+
+    FactoryGirl.define do
+      factory :user
+
+      factory :post do
+        association(:user, :method => :build)
+      end
+    end
+  end
+
+  subject { create('post') }
+
+  it "still saves associations (:method => :build only affects build, not create)" do
+    subject.user.should be_kind_of(User)
+    subject.user.should_not be_new_record
+  end
+end
+
 describe "a custom create" do
   include FactoryGirl::Syntax::Methods
 
@@ -62,4 +89,3 @@ describe "a custom create" do
     FactoryGirl.create(:user).should be_persisted
   end
 end
-

data/spec/acceptance/modify_factories_spec.rb

@@ -0,0 +1,184 @@
+require "spec_helper"
+
+describe "modifying factories" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('User', :name => :string, :admin => :boolean, :email => :string, :login => :string)
+
+    FactoryGirl.define do
+      sequence(:email) {|n| "user#{n}@example.com" }
+
+      factory :user do
+        email
+
+        after_create do |user|
+          user.login = user.name.upcase if user.name
+        end
+
+        factory :admin do
+          admin true
+        end
+      end
+    end
+  end
+
+  context "simple modification" do
+    before do
+      FactoryGirl.modify do
+        factory :user do
+          name "Great User"
+        end
+      end
+    end
+
+    subject     { create(:user) }
+    its(:name)  { should == "Great User" }
+    its(:login) { should == "GREAT USER" }
+
+    it "doesn't allow the factory to be subsequently defined" do
+      expect do
+        FactoryGirl.define { factory :user }
+      end.to raise_error(FactoryGirl::DuplicateDefinitionError)
+    end
+
+    it "does allow the factory to be subsequently modified" do
+      FactoryGirl.modify do
+        factory :user do
+          name "Overridden again!"
+        end
+      end
+
+      create(:user).name.should == "Overridden again!"
+    end
+  end
+
+  context "adding callbacks" do
+    before do
+      FactoryGirl.modify do
+        factory :user do
+          name "Great User"
+          after_create do |user|
+            user.name = user.name.downcase
+            user.login = nil
+          end
+        end
+      end
+    end
+
+    subject { create(:user) }
+
+    its(:name)  { should == "great user" }
+    its(:login) { should be_nil }
+  end
+
+  context "reusing traits" do
+    before do
+      FactoryGirl.define do
+        trait :rockstar do
+          name "Johnny Rockstar!!!"
+        end
+      end
+
+      FactoryGirl.modify do
+        factory :user do
+          rockstar
+          email { "#{name}@example.com" }
+        end
+      end
+    end
+
+    subject     { create(:user) }
+
+    its(:name)  { should == "Johnny Rockstar!!!" }
+    its(:email) { should == "Johnny Rockstar!!!@example.com" }
+    its(:login) { should == "JOHNNY ROCKSTAR!!!" }
+  end
+
+  context "redefining attributes" do
+    before do
+      FactoryGirl.modify do
+        factory :user do
+          email { "#{name}-modified@example.com" }
+          name "Great User"
+        end
+      end
+    end
+
+    context "creating user" do
+      context "without overrides" do
+        subject     { create(:user) }
+
+        its(:name)  { should == "Great User" }
+        its(:email) { should == "Great User-modified@example.com" }
+      end
+
+      context "overriding dynamic attributes" do
+        subject     { create(:user, :email => "perfect@example.com") }
+
+        its(:name)  { should == "Great User" }
+        its(:email) { should == "perfect@example.com" }
+      end
+
+      context "overriding static attributes" do
+        subject     { create(:user, :name => "wonderful") }
+
+        its(:name)  { should == "wonderful" }
+        its(:email) { should == "wonderful-modified@example.com" }
+      end
+    end
+
+    context "creating admin" do
+      context "without overrides" do
+        subject     { create(:admin) }
+
+        its(:name)  { should == "Great User" }
+        its(:email) { should == "Great User-modified@example.com" }
+        its(:admin) { should be_true }
+      end
+
+      context "overriding dynamic attributes" do
+        subject     { create(:admin, :email => "perfect@example.com") }
+
+        its(:name)  { should == "Great User" }
+        its(:email) { should == "perfect@example.com" }
+        its(:admin) { should be_true }
+      end
+
+      context "overriding static attributes" do
+        subject     { create(:admin, :name => "wonderful") }
+
+        its(:name)  { should == "wonderful" }
+        its(:email) { should == "wonderful-modified@example.com" }
+        its(:admin) { should be_true }
+      end
+    end
+  end
+
+  it "doesn't overwrite already defined child's attributes" do
+    FactoryGirl.modify do
+      factory :user do
+        admin false
+      end
+    end
+    create(:admin).should be_admin
+  end
+
+  it "allows for overriding child classes" do
+    FactoryGirl.modify do
+      factory :admin do
+        admin false
+      end
+    end
+
+    create(:admin).should_not be_admin
+  end
+
+  it "raises an exception if the factory was not defined before" do
+    lambda {
+      FactoryGirl.modify do
+        factory :unknown_factory
+      end
+    }.should raise_error(ArgumentError)
+  end
+end

data/spec/acceptance/stub_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe "a stubbed instance" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('User')
+
+    define_model('Post', :user_id => :integer) do
+      belongs_to :user
+    end
+
+    FactoryGirl.define do
+      factory :user
+
+      factory :post do
+        user
+      end
+    end
+  end
+
+  subject { build_stubbed(:post) }
+
+  it "acts as if it came from the database" do
+    should_not be_new_record
+  end
+
+  it "assigns associations and acts as if it is saved" do
+    subject.user.should be_kind_of(User)
+    subject.user.should_not be_new_record
+  end
+end
+
+describe "a stubbed instance with :method => :build" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('User')
+
+    define_model('Post', :user_id => :integer) do
+      belongs_to :user
+    end
+
+    FactoryGirl.define do
+      factory :user
+
+      factory :post do
+        association(:user, :method => :build)
+      end
+    end
+  end
+
+  subject { build_stubbed(:post) }
+
+  it "acts as if it is saved in the database" do
+    should_not be_new_record
+  end
+
+  it "assigns associations and acts as if it is saved" do
+    subject.user.should be_kind_of(User)
+    subject.user.should_not be_new_record
+  end
+
+end