factory_girl 2.0.0.rc4 → 2.0.1

data/README.md

@@ -20,6 +20,7 @@ Install
 gem install factory_girl
 ```
 or add the following line to Gemfile:
+
 ```ruby
 gem 'factory_girl'
 ```

data/features/find_definitions.feature

@@ -0,0 +1,45 @@
+Feature: Factory girl can find factory definitions correctly
+  Scenario: Find definitions with a path
+    Given a file named "awesome_factories.rb" with:
+    """
+    FactoryGirl.define do
+      factory :awesome_category, :parent => :category do
+        name "awesome!!!"
+      end
+    end
+    """
+    When "awesome_factories.rb" is added to Factory Girl's file definitions path
+    And I create a "awesome_category" instance from Factory Girl
+    Then I should find the following for the last category:
+      | name       |
+      | awesome!!! |
+
+  Scenario: Find definitions with an absolute path
+    Given a file named "awesome_factories.rb" with:
+    """
+    FactoryGirl.define do
+      factory :awesome_category, :parent => :category do
+        name "awesome!!!"
+      end
+    end
+    """
+    When "awesome_factories.rb" is added to Factory Girl's file definitions path as an absolute path
+    And I create a "awesome_category" instance from Factory Girl
+    Then I should find the following for the last category:
+      | name       |
+      | awesome!!! |
+
+  Scenario: Find definitions with a folder
+    Given a file named "nested/great_factories.rb" with:
+    """
+    FactoryGirl.define do
+      factory :great_category, :parent => :category do
+        name "great!!!"
+      end
+    end
+    """
+    When "nested" is added to Factory Girl's file definitions path
+    And I create a "great_category" instance from Factory Girl
+    Then I should find the following for the last category:
+      | name     |
+      | great!!! |

data/features/step_definitions/factory_girl_steps.rb

@@ -0,0 +1,18 @@
+When /^"([^"]*)" is added to Factory Girl's file definitions path$/ do |file_name|
+  new_factory_file = File.join(current_dir, file_name.gsub(".rb", ""))
+  FactoryGirl.definition_file_paths ||= []
+  FactoryGirl.definition_file_paths << new_factory_file
+  FactoryGirl.find_definitions
+end
+
+When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute path$/ do |file_name|
+  new_factory_file = File.expand_path(File.join(current_dir, file_name.gsub(".rb", "")))
+
+  FactoryGirl.definition_file_paths ||= []
+  FactoryGirl.definition_file_paths << new_factory_file
+  FactoryGirl.find_definitions
+end
+
+When /^I create a "([^"]*)" instance from Factory Girl$/ do |factory_name|
+  FactoryGirl.create(factory_name)
+end

data/features/support/env.rb

@@ -4,3 +4,5 @@ $: << File.join(PROJECT_ROOT, 'lib')
 
 require 'active_record'
 require 'factory_girl'
+
+require 'aruba/cucumber'

data/lib/factory_girl/find_definitions.rb

@@ -11,6 +11,8 @@ module FactoryGirl
 
   def self.find_definitions #:nodoc:
     definition_file_paths.each do |path|
+      path = File.expand_path(path)
+
       require("#{path}.rb") if File.exists?("#{path}.rb")
 
       if File.directory? path

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.0.rc4"
+  VERSION = "2.0.1"
 end
 

data/spec/acceptance/parent_spec.rb

@@ -14,6 +14,10 @@ describe "an instance generated by a factory that inherits from another factory"
           admin true
           email "admin@example.com"
         end
+
+        factory :guest do
+          email { "#{name}-guest@example.com" }
+        end
       end
     end
   end
@@ -31,5 +35,10 @@ describe "an instance generated by a factory that inherits from another factory"
     its(:name)  { should == "John" }
     its(:email) { should == "admin@example.com" }
   end
+
+  describe "the child class with parent attribute" do
+    subject     { FactoryGirl.create(:guest) }
+    its(:email) { should eql "John-guest@example.com" }
+  end
 end
 

data/spec/factory_girl/find_definitions_spec.rb

@@ -10,7 +10,7 @@ end
 
 RSpec::Matchers.define :require_definitions_from do |file|
   match do |given|
-    @has_received = have_received.method_missing(:require, file)
+    @has_received = have_received.method_missing(:require, File.expand_path(file))
     @has_received.matches?(given)
   end
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 2.0.0.rc4
+  hash: 13
+  prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Joe Ferris
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 -04:00
+date: 2011-07-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,6 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -54,6 +68,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
   type: :development
   version_requirements: *id004
@@ -65,6 +84,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
+        - 3
         version: 3.0.0.beta3
   type: :development
   version_requirements: *id005
@@ -76,6 +102,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,9 +116,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: |-
   factory_girl provides a framework and DSL for defining and
                          using factories - less error-prone, more explicit, and
@@ -183,7 +229,9 @@ files:
 - spec/factory_girl_spec.rb
 - spec/spec_helper.rb
 - features/factory_girl_steps.feature
+- features/find_definitions.feature
 - features/step_definitions/database_steps.rb
+- features/step_definitions/factory_girl_steps.rb
 - features/support/env.rb
 - features/support/factories.rb
 - features/support/test.db
@@ -201,13 +249,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -255,7 +309,9 @@ test_files:
 - spec/factory_girl/sequence_spec.rb
 - spec/factory_girl_spec.rb
 - features/factory_girl_steps.feature
+- features/find_definitions.feature
 - features/step_definitions/database_steps.rb
+- features/step_definitions/factory_girl_steps.rb
 - features/support/env.rb
 - features/support/factories.rb
 - features/support/test.db