factory_girl 1.3.3 → 2.0.0.beta1

data/spec/factory_girl/find_definitions_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+share_examples_for "finds definitions" do
+  before do
+    stub(FactoryGirl).require
+    FactoryGirl.find_definitions
+  end
+  subject { FactoryGirl }
+end
+
+describe "definition loading" do
+  def self.in_directory_with_files(*files)
+    before do
+      @pwd = Dir.pwd
+      @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
+      FileUtils.mkdir_p @tmp_dir
+      Dir.chdir(@tmp_dir)
+
+      files.each do |file|
+        FileUtils.mkdir_p File.dirname(file)
+        FileUtils.touch file
+      end
+    end
+
+    after do
+      Dir.chdir(@pwd)
+      FileUtils.rm_rf(@tmp_dir)
+    end
+  end
+
+  def require_definitions_from(file)
+    simple_matcher do |given, matcher|
+      has_received = have_received.method_missing(:require, file)
+      result = has_received.matches?(given)
+      matcher.description = "require definitions from #{file}"
+      matcher.failure_message = has_received.failure_message
+      result
+    end
+  end
+
+  describe "with factories.rb" do
+    in_directory_with_files 'factories.rb'
+    it_should_behave_like "finds definitions"
+    it { should require_definitions_from('factories.rb') }
+  end
+
+  %w(spec test).each do |dir|
+    describe "with a factories file under #{dir}" do
+      in_directory_with_files File.join(dir, 'factories.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories.rb") }
+    end
+
+    describe "with a factories file under #{dir}/factories" do
+      in_directory_with_files File.join(dir, 'factories', 'post_factory.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+    end
+
+    describe "with several factories files under #{dir}/factories" do
+      in_directory_with_files File.join(dir, 'factories', 'post_factory.rb'),
+                              File.join(dir, 'factories', 'person_factory.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+      it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
+    end
+
+    describe "with several factories files under #{dir}/factories in non-alphabetical order" do
+      in_directory_with_files File.join(dir, 'factories', 'b.rb'),
+                              File.join(dir, 'factories', 'a.rb')
+      it "should load the files in the right order" do
+        @loaded = []
+        stub(FactoryGirl).require { |a| @loaded << File.split(a)[-1] }
+        FactoryGirl.find_definitions
+        @loaded.should == ["a.rb", "b.rb"]
+      end
+    end
+
+    describe "with nested and unnested factories files under #{dir}" do
+      in_directory_with_files File.join(dir, 'factories.rb'),
+                              File.join(dir, 'factories', 'post_factory.rb'),
+                              File.join(dir, 'factories', 'person_factory.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories.rb") }
+      it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+      it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
+    end
+  end
+end

data/spec/factory_girl/proxy/attributes_for_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Factory::Proxy::AttributesFor do
+describe FactoryGirl::Proxy::AttributesFor do
   before do
-    @proxy = Factory::Proxy::AttributesFor.new(@class)
+    @proxy = FactoryGirl::Proxy::AttributesFor.new(@class)
   end
 
   describe "when asked to associate with another factory" do

data/spec/factory_girl/proxy/build_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
 
-describe Factory::Proxy::Build do
+describe FactoryGirl::Proxy::Build do
   before do
     @class       = Class.new
     @instance    = "built-instance"
-    @association = "associated-instance"
 
     stub(@class).new { @instance }
     stub(@instance).attribute { 'value' }
-    stub(Factory).create { @association }
     stub(@instance, :attribute=)
     stub(@instance, :owner=)
 
-    @proxy = Factory::Proxy::Build.new(@class)
+    @proxy = FactoryGirl::Proxy::Build.new(@class)
   end
 
   it "should instantiate the class" do
@@ -21,11 +19,16 @@ describe Factory::Proxy::Build do
 
   describe "when asked to associate with another factory" do
     before do
-      @proxy.associate(:owner, :user, {})
+      @association = "associated-instance"
+      @associated_factory = "associated-factory"
+      stub(FactoryGirl).factory_by_name { @associated_factory }
+      stub(@associated_factory).run { @association }
+      @overrides = { 'attr' => 'value' }
+      @proxy.associate(:owner, :user, @overrides)
     end
 
     it "should create the associated instance" do
-      Factory.should have_received.create(:user, {})
+      @associated_factory.should have_received.run(FactoryGirl::Proxy::Create, @overrides)
     end
 
     it "should set the associated instance" do
@@ -33,12 +36,14 @@ describe Factory::Proxy::Build do
     end
   end
 
-  it "should call Factory.create when building an association" do
-    association = 'association'
-    attribs     = { :first_name => 'Billy' }
-    stub(Factory).create { association }
-    @proxy.association(:user, attribs).should == association
-    Factory.should have_received.create(:user, attribs)
+  it "should run create when building an association" do
+    association = "associated-instance"
+    associated_factory = "associated-factory"
+    stub(FactoryGirl).factory_by_name { associated_factory }
+    stub(associated_factory).run { association }
+    overrides = { 'attr' => 'value' }
+    @proxy.association(:user, overrides).should == association
+    associated_factory.should have_received.run(FactoryGirl::Proxy::Create, overrides)
   end
 
   it "should return the built instance when asked for the result" do

data/spec/factory_girl/proxy/create_spec.rb

@@ -1,19 +1,17 @@
 require 'spec_helper'
 
-describe Factory::Proxy::Create do
+describe FactoryGirl::Proxy::Create do
   before do
     @class       = Class.new
     @instance    = "built-instance"
-    @association = "associated-instance"
 
     stub(@class).new { @instance }
-    stub(Factory).create { @association }
     stub(@instance).attribute { 'value' }
     stub(@instance, :attribute=)
     stub(@instance, :owner=)
     stub(@instance).save!
 
-    @proxy = Factory::Proxy::Create.new(@class)
+    @proxy = FactoryGirl::Proxy::Create.new(@class)
   end
 
   it "should instantiate the class" do
@@ -22,11 +20,16 @@ describe Factory::Proxy::Create do
 
   describe "when asked to associate with another factory" do
     before do
-      @proxy.associate(:owner, :user, {})
+      @association = "associated-instance"
+      @associated_factory = "associated-factory"
+      stub(FactoryGirl).factory_by_name { @associated_factory }
+      stub(@associated_factory).run { @association }
+      @overrides = { 'attr' => 'value' }
+      @proxy.associate(:owner, :user, @overrides)
     end
 
     it "should create the associated instance" do
-      Factory.should have_received.create(:user, {})
+      @associated_factory.should have_received.run(FactoryGirl::Proxy::Create, @overrides)
     end
 
     it "should set the associated instance" do
@@ -34,12 +37,14 @@ describe Factory::Proxy::Create do
     end
   end
 
-  it "should call Factory.create when building an association" do
-    association = 'association'
-    attribs     = { :first_name => 'Billy' }
-    stub(Factory).create { association }
-    @proxy.association(:user, attribs).should == association
-    Factory.should have_received.create(:user, attribs)
+  it "should run create when building an association" do
+    association = "associated-instance"
+    associated_factory = "associated-factory"
+    stub(FactoryGirl).factory_by_name { associated_factory }
+    stub(associated_factory).run { association }
+    overrides = { 'attr' => 'value' }
+    @proxy.association(:user, overrides).should == association
+    associated_factory.should have_received.run(FactoryGirl::Proxy::Create, overrides)
   end
 
   describe "when asked for the result" do

data/spec/factory_girl/proxy/stub_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Factory::Proxy::Stub do
+describe FactoryGirl::Proxy::Stub do
   before do
     @class = "class"
     @instance = "instance"
@@ -9,7 +9,7 @@ describe Factory::Proxy::Stub do
     stub(@instance).id { 42 }
     stub(@instance).reload { @instance.connection.reload }
 
-    @stub = Factory::Proxy::Stub.new(@class)
+    @stub = FactoryGirl::Proxy::Stub.new(@class)
   end
 
   it "should not be a new record" do
@@ -23,13 +23,14 @@ describe Factory::Proxy::Stub do
   describe "when a user factory exists" do
     before do
       @user = "user"
-      stub(Factory).stub(:user, {}) { @user }
+      stub(FactoryGirl).factory_by_name { @associated_factory }
+      @associated_factory = 'associate-factory'
     end
 
     describe "when asked to associate with another factory" do
       before do
         stub(@instance).owner { @user }
-        mock(Factory).stub(:user, {}) { @user }
+        mock(@associated_factory).run(FactoryGirl::Proxy::Stub, {}) { @user }
         mock(@stub).set(:owner, @user)
 
         @stub.associate(:owner, :user, {})
@@ -41,7 +42,7 @@ describe Factory::Proxy::Stub do
     end
 
     it "should return the association when building one" do
-      mock(Factory).create.never
+      mock(@associated_factory).run(FactoryGirl::Proxy::Stub, {}) { @user }
       @stub.association(:user).should == @user
     end
 

data/spec/factory_girl/proxy_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Factory::Proxy do
+describe FactoryGirl::Proxy do
   before do
-    @proxy = Factory::Proxy.new(Class.new)
+    @proxy = FactoryGirl::Proxy.new(Class.new)
   end
 
   it "should do nothing when asked to set an attribute to a value" do

data/spec/factory_girl/sequence_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Factory::Sequence do
-  describe "a sequence" do
+describe FactoryGirl::Sequence do
+  describe "a basic sequence" do
     before do
-      @sequence = Factory::Sequence.new {|n| "=#{n}" }
+      @sequence = FactoryGirl::Sequence.new {|n| "=#{n}" }
     end
 
     it "should start with a value of 1" do
@@ -20,47 +20,24 @@ describe Factory::Sequence do
       end
     end
   end
-
-  describe "defining a sequence" do
+  
+  describe "a custom sequence" do
     before do
-      @sequence = "sequence"
-      @name     = :count
-      stub(Factory::Sequence).new { @sequence }
-    end
-
-    it "should create a new sequence" do
-      mock(Factory::Sequence).new() { @sequence }
-      Factory.sequence(@name)
-    end
-
-    it "should use the supplied block as the sequence generator" do
-      stub(Factory::Sequence).new.yields(1)
-      yielded = false
-      Factory.sequence(@name) {|n| yielded = true }
-      (yielded).should be
+      @sequence = FactoryGirl::Sequence.new("A") {|n| "=#{n}" }
     end
-  end
-
-  describe "after defining a sequence" do
-    before do
-      @sequence = "sequence"
-      @name     = :test
-      @value    = '1 2 5'
-
-      stub(@sequence).next { @value }
-      stub(Factory::Sequence).new { @sequence }
 
-      Factory.sequence(@name) {}
+    it "should start with a value of A" do
+      @sequence.next.should == "=A"
     end
 
-    it "should call next on the sequence when sent next" do
-      mock(@sequence).next
-
-      Factory.next(@name)
-    end
+    describe "after being called" do
+      before do
+        @sequence.next
+      end
 
-    it "should return the value from the sequence" do
-      Factory.next(@name).should == @value
+      it "should use the next value" do
+        @sequence.next.should == "=B"
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,10 @@ require 'factory_girl'
 
 Spec::Runner.configure do |config|
   config.mock_with RR::Adapters::Rspec
+  config.after do
+    FactoryGirl.factories.clear
+    FactoryGirl.sequences.clear
+  end
 end
 
 share_as :DefinesConstants do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 299253613
+  prerelease: true
   segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 2
+  - 0
+  - 0
+  - beta1
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
 - Joe Ferris
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
+date: 2010-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,7 +145,10 @@ files:
 - lib/factory_girl/attribute/dynamic.rb
 - lib/factory_girl/attribute/static.rb
 - lib/factory_girl/attribute.rb
+- lib/factory_girl/definition_proxy.rb
+- lib/factory_girl/deprecated.rb
 - lib/factory_girl/factory.rb
+- lib/factory_girl/find_definitions.rb
 - lib/factory_girl/proxy/attributes_for.rb
 - lib/factory_girl/proxy/build.rb
 - lib/factory_girl/proxy/create.rb
@@ -154,10 +158,13 @@ files:
 - lib/factory_girl/sequence.rb
 - lib/factory_girl/step_definitions.rb
 - lib/factory_girl/syntax/blueprint.rb
+- lib/factory_girl/syntax/default.rb
 - lib/factory_girl/syntax/generate.rb
 - lib/factory_girl/syntax/make.rb
 - lib/factory_girl/syntax/sham.rb
+- lib/factory_girl/syntax/vintage.rb
 - lib/factory_girl/syntax.rb
+- lib/factory_girl/version.rb
 - lib/factory_girl.rb
 - spec/acceptance/acceptance_helper.rb
 - spec/acceptance/acceptance_spec.rb
@@ -166,13 +173,17 @@ files:
 - spec/acceptance/syntax/generate_spec.rb
 - spec/acceptance/syntax/make_spec.rb
 - spec/acceptance/syntax/sham_spec.rb
+- spec/acceptance/syntax/vintage_spec.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
 - spec/factory_girl/attribute/dynamic_spec.rb
 - spec/factory_girl/attribute/static_spec.rb
 - spec/factory_girl/attribute_spec.rb
+- spec/factory_girl/definition_proxy_spec.rb
+- spec/factory_girl/deprecated_spec.rb
 - spec/factory_girl/factory_spec.rb
+- spec/factory_girl/find_definitions_spec.rb
 - spec/factory_girl/proxy/attributes_for_spec.rb
 - spec/factory_girl/proxy/build_spec.rb
 - spec/factory_girl/proxy/create_spec.rb
@@ -208,12 +219,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -227,13 +240,17 @@ test_files:
 - spec/acceptance/syntax/generate_spec.rb
 - spec/acceptance/syntax/make_spec.rb
 - spec/acceptance/syntax/sham_spec.rb
+- spec/acceptance/syntax/vintage_spec.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
 - spec/factory_girl/attribute/dynamic_spec.rb
 - spec/factory_girl/attribute/static_spec.rb
 - spec/factory_girl/attribute_spec.rb
+- spec/factory_girl/definition_proxy_spec.rb
+- spec/factory_girl/deprecated_spec.rb
 - spec/factory_girl/factory_spec.rb
+- spec/factory_girl/find_definitions_spec.rb
 - spec/factory_girl/proxy/attributes_for_spec.rb
 - spec/factory_girl/proxy/build_spec.rb
 - spec/factory_girl/proxy/create_spec.rb