factory_girl 2.0.4 → 2.0.5

data/lib/factory_girl/proxy/attributes_for.rb

@@ -3,14 +3,19 @@ module FactoryGirl
     class AttributesFor < Proxy #:nodoc:
       def initialize(klass)
         @hash = {}
+        @ignored_attributes = {}
       end
 
       def get(attribute)
-        @hash[attribute]
+        @ignored_attributes[attribute] || @hash[attribute]
       end
 
-      def set(attribute, value)
-        @hash[attribute] = value
+      def set(attribute, value, ignored = false)
+        if ignored
+          @ignored_attributes[attribute] = value
+        else
+          @hash[attribute] = value
+        end
       end
 
       def result(to_create)

data/lib/factory_girl/proxy/build.rb

@@ -3,14 +3,23 @@ module FactoryGirl
     class Build < Proxy #:nodoc:
       def initialize(klass)
         @instance = klass.new
+        @ignored_attributes = {}
       end
 
       def get(attribute)
-        @instance.send(attribute)
+        if @ignored_attributes.has_key?(attribute)
+          @ignored_attributes[attribute]
+        else
+          @instance.send(attribute)
+        end
       end
 
-      def set(attribute, value)
-        @instance.send(:"#{attribute}=", value)
+      def set(attribute, value, ignored = false)
+        if ignored
+          @ignored_attributes[attribute] = value
+        else
+          @instance.send(:"#{attribute}=", value)
+        end
       end
 
       def associate(name, factory_name, overrides)

data/lib/factory_girl/proxy/stub.rb

@@ -5,6 +5,7 @@ module FactoryGirl
 
       def initialize(klass)
         @instance = klass.new
+        @ignored_attributes = {}
         @instance.id = next_id
         @instance.instance_eval do
           def persisted?
@@ -42,11 +43,19 @@ module FactoryGirl
       end
 
       def get(attribute)
-        @instance.send(attribute)
+        if @ignored_attributes.has_key?(attribute)
+          @ignored_attributes[attribute]
+        else
+          @instance.send(attribute)
+        end
       end
 
-      def set(attribute, value)
-        @instance.send(:"#{attribute}=", value)
+      def set(attribute, value, ignored = false)
+        if ignored
+          @ignored_attributes[attribute] = value
+        else
+          @instance.send(:"#{attribute}=", value)
+        end
       end
 
       def associate(name, factory_name, overrides)

data/lib/factory_girl/sequence.rb

@@ -9,9 +9,9 @@ module FactoryGirl
     attr_reader :name
 
     def initialize(name, value = 1, &proc) #:nodoc:
-      @name = name
+      @name  = name
       @proc  = proc
-      @value = value || 1
+      @value = value
     end
 
     def next

data/lib/factory_girl/step_definitions.rb

@@ -21,7 +21,8 @@ module FactoryGirlStepHelpers
     private
 
     def process_key_value(key, value)
-      [key.downcase.gsub(' ', '_').to_sym, value.to_s.strip]
+      value = value.strip if value.is_a?(String)
+      [key.downcase.gsub(' ', '_').to_sym, value]
     end
 
     class AssociationManager
@@ -39,7 +40,7 @@ module FactoryGirlStepHelpers
         return unless association
 
         if attributes_hash = nested_attribute_hash
-          factory.build_class.find(:first, :conditions => attributes_hash.attributes(FindAttributes)) or
+          factory.build_class.first(:conditions => attributes_hash.attributes(FindAttributes)) or
           FactoryGirl.create(association.factory, attributes_hash.attributes)
         end
       end

data/lib/factory_girl/version.rb

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

data/spec/acceptance/attribute_aliases_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "attribute aliases" do
   before do

data/spec/acceptance/attributes_for_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "a generated attributes hash" do
   include FactoryGirl::Syntax::Methods

data/spec/acceptance/attributes_ordered_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "a generated attributes hash where order matters" do
   include FactoryGirl::Syntax::Methods
@@ -20,14 +19,33 @@ describe "a generated attributes hash where order matters" do
           static 1
         end
       end
+
+      factory :without_parent, :class => ParentModel do
+        evaluates_first   { static }
+        evaluates_second  { evaluates_first }
+        evaluates_third   { evaluates_second }
+        static 1
+      end
     end
   end
 
-  subject { FactoryGirl.build(:child_model) }
+  context "factory with a parent" do
+    subject { FactoryGirl.build(:child_model) }
 
-  it "assigns attributes in the order they're defined with preference to static attributes" do
-    subject[:evaluates_first].should  == 1
-    subject[:evaluates_second].should == 1
-    subject[:evaluates_third].should  == 1
+    it "assigns attributes in the order they're defined with preference to static attributes" do
+      subject[:evaluates_first].should  == 1
+      subject[:evaluates_second].should == 1
+      subject[:evaluates_third].should  == 1
+    end
+  end
+
+  context "factory without a parent" do
+    subject { FactoryGirl.build(:without_parent) }
+
+    it "assigns attributes in the order they're defined with preference to static attributes without a parent class" do
+      subject[:evaluates_first].should  == 1
+      subject[:evaluates_second].should == 1
+      subject[:evaluates_third].should  == 1
+    end
   end
 end

data/spec/acceptance/build_list_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "build multiple instances" do
   before do

data/spec/acceptance/build_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "a built instance" do
   include FactoryGirl::Syntax::Methods

data/spec/acceptance/build_stubbed_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "a generated stub instance" do
   include FactoryGirl::Syntax::Methods

data/spec/acceptance/callbacks_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "callbacks" do
   before do

data/spec/acceptance/create_list_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "create multiple instances" do
   before do

data/spec/acceptance/create_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "a created instance" do
   include FactoryGirl::Syntax::Methods

data/spec/acceptance/default_strategy_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "default strategy" do
   it "uses create when not specified" do

data/spec/acceptance/definition_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "an instance generated by a factory with a custom class name" do
   before do

data/spec/acceptance/definition_without_block_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "an instance generated by a factory" do
   before do

data/spec/acceptance/overrides_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 require 'active_support/ordered_hash'
 
 describe "attribute overrides" do

data/spec/acceptance/parent_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "an instance generated by a factory that inherits from another factory" do
   before do
@@ -20,6 +19,14 @@ describe "an instance generated by a factory that inherits from another factory"
         factory :guest do
           email { "#{name}-guest@example.com" }
         end
+
+        factory :no_email do
+          email ""
+        end
+
+        factory :bill do
+          name  { "Bill" }  #block to make  attribute dynamic
+        end
       end
     end
   end
@@ -46,5 +53,15 @@ describe "an instance generated by a factory that inherits from another factory"
     its(:email) { should eql "John-guest@example.com" }
     its(:login) { should == "John-guest@example.com" }
   end
+
+  describe "the child class redefining parent's dynamic attribute with static attribute" do
+    subject     { FactoryGirl.create(:no_email) }
+    its(:email) { should == "" }
+  end
+
+  describe "the child class redefining parent's static attribute with dynamic attribute" do
+    subject     { FactoryGirl.create(:bill) }
+    its(:name)  { should == "Bill" }
+  end
 end
 

data/spec/acceptance/sequence_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "sequences" do
   include FactoryGirl::Syntax::Methods

data/spec/acceptance/syntax/blueprint_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 require 'factory_girl/syntax/blueprint'
 

data/spec/acceptance/syntax/generate_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 require 'factory_girl/syntax/generate'
 

data/spec/acceptance/syntax/make_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 require 'factory_girl/syntax/make'
 

data/spec/acceptance/syntax/sham_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 require 'factory_girl/syntax/sham'
 

data/spec/acceptance/syntax/vintage_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'acceptance/acceptance_helper'
 
 describe "vintage syntax" do
   before do
@@ -64,17 +63,17 @@ end
 describe "defining a factory" do
   before do
     @name    = :user
-    @factory = "factory"
+    @factory = stub("factory", :names => [@name])
     @proxy   = "proxy"
-    stub(@factory).names { [@name] }
     @options = { :class => 'magic' }
-    stub(FactoryGirl::Factory).new { @factory }
-    stub(FactoryGirl::DefinitionProxy).new { @proxy }
+    FactoryGirl::Factory.stubs(:new => @factory)
+    FactoryGirl::DefinitionProxy.stubs(:new => @proxy)
   end
 
   it "should create a new factory using the specified name and options" do
-    mock(FactoryGirl::Factory).new(@name, @options) { @factory }
+    FactoryGirl::Factory.stubs(:new => @factory)
     Factory.define(@name, @options) {|f| }
+    FactoryGirl::Factory.should have_received(:new).with(@name, @options)
   end
 
   it "should pass the factory do the block" do
@@ -100,44 +99,48 @@ describe "after defining a factory" do
   end
 
   it "should use Proxy::AttributesFor for Factory.attributes_for" do
-    mock(@factory).run(FactoryGirl::Proxy::AttributesFor, :attr => 'value') { 'result' }
+    @factory.stubs(:run => "result")
     Factory.attributes_for(@name, :attr => 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Proxy::AttributesFor, :attr => 'value')
   end
 
   it "should use Proxy::Build for Factory.build" do
-    mock(@factory).run(FactoryGirl::Proxy::Build, :attr => 'value') { 'result' }
+    @factory.stubs(:run => "result")
     Factory.build(@name, :attr => 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Proxy::Build, :attr => 'value')
   end
 
   it "should use Proxy::Create for Factory.create" do
-    mock(@factory).run(FactoryGirl::Proxy::Create, :attr => 'value') { 'result' }
+    @factory.stubs(:run => "result")
     Factory.create(@name, :attr => 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Proxy::Create, :attr => 'value')
   end
 
   it "should use Proxy::Stub for Factory.stub" do
-    mock(@factory).run(FactoryGirl::Proxy::Stub, :attr => 'value') { 'result' }
+    @factory.stubs(:run => "result")
     Factory.stub(@name, :attr => 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Proxy::Stub, :attr => 'value')
   end
 
   it "should use default strategy option as Factory.default_strategy" do
-    stub(@factory).default_strategy { :create }
-    mock(@factory).run(FactoryGirl::Proxy::Create, :attr => 'value') { 'result' }
+    @factory.stubs(:default_strategy => :create, :run => "result")
     Factory.default_strategy(@name, :attr => 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Proxy::Create, :attr => 'value')
   end
 
   it "should use the default strategy for the global Factory method" do
-    stub(@factory).default_strategy { :create }
-    mock(@factory).run(FactoryGirl::Proxy::Create, :attr => 'value') { 'result' }
+    @factory.stubs(:default_strategy => :create, :run => "result")
     Factory(@name, :attr => 'value').should == 'result'
+    @factory.should have_received(:run).with(FactoryGirl::Proxy::Create, :attr => 'value')
   end
 
   [:build, :create, :attributes_for, :stub].each do |method|
-    it "should raise an ArgumentError on #{method} with a nonexistant factory" do
+    it "should raise an ArgumentError on #{method} with a nonexistent factory" do
       lambda { Factory.send(method, :bogus) }.should raise_error(ArgumentError)
     end
 
     it "should recognize either 'name' or :name for Factory.#{method}" do
-      stub(@factory).run
+      @factory.stubs(:run)
       lambda { Factory.send(method, @name.to_s) }.should_not raise_error
       lambda { Factory.send(method, @name.to_sym) }.should_not raise_error
     end
@@ -146,26 +149,22 @@ end
 
 describe "defining a sequence" do
   before do
-    @name     = :count
-    @sequence = FactoryGirl::Sequence.new(@name) {}
-    stub(FactoryGirl::Sequence).new { @sequence }
+    @name = :count
   end
 
   it "should create a new sequence" do
-    mock(FactoryGirl::Sequence).new(@name, 1) { @sequence }
     Factory.sequence(@name)
+    Factory.next(@name).should == 1
   end
 
   it "should use the supplied block as the sequence generator" do
-    stub(FactoryGirl::Sequence).new { @sequence }.yields(1)
-    yielded = false
-    Factory.sequence(@name) {|n| yielded = true }
-    (yielded).should be
+    Factory.sequence(@name) {|n| "user-#{n}" }
+    Factory.next(@name).should == "user-1"
   end
 
   it "should use the supplied start_value as the sequence start_value" do
-    mock(FactoryGirl::Sequence).new(@name, "A") { @sequence }
     Factory.sequence(@name, "A")
+    Factory.next(@name).should == "A"
   end
 end
 
@@ -175,16 +174,15 @@ describe "after defining a sequence" do
     @sequence = FactoryGirl::Sequence.new(@name) {}
     @value    = '1 2 5'
 
-    stub(@sequence).next { @value }
-    stub(FactoryGirl::Sequence).new { @sequence }
+    @sequence.stubs(:next => @value)
+    FactoryGirl::Sequence.stubs(:new => @sequence)
 
     Factory.sequence(@name) {}
   end
 
   it "should call next on the sequence when sent next" do
-    mock(@sequence).next
-
     Factory.next(@name)
+    @sequence.should have_received(:next)
   end
 
   it "should return the value from the sequence" do