factory_girl_rails 1.4.0 → 1.5.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    factory_girl_rails (1.4.0)
-      factory_girl (~> 2.3.0)
+    factory_girl_rails (1.5.0)
+      factory_girl (~> 2.4.0)
       railties (>= 3.0.0)
 
 GEM
@@ -56,7 +56,7 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (2.3.0)
+    factory_girl (2.4.0)
       activesupport
     ffi (1.0.9)
     gherkin (2.4.1)

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
 

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '1.4.0'
+  s.version     = '1.5.0'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
-  s.add_runtime_dependency('factory_girl', '~> 2.3.0')
+  s.add_runtime_dependency('factory_girl', '~> 2.4.0')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 2.6.0')

data/features/load_definitions.feature

@@ -1,7 +1,5 @@
 Feature: automatically load step definitions
-
-  @disable-bundler
-  Scenario: generate a rails 3 application and use factory definitions
+  Background:
     When I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I add "factory_girl_rails" from this project as a dependency
@@ -22,6 +20,9 @@ Feature: automatically load step definitions
       class User < ActiveRecord::Base
       end
       """
+
+  @disable-bundler
+  Scenario: generate a rails 3 application and use factory definitions
     When I write to "test/factories.rb" with:
       """
       FactoryGirl.define do
@@ -43,3 +44,42 @@ Feature: automatically load step definitions
       """
     When I successfully run `bundle exec rake test --trace`
     Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
+
+  @disable-bundler
+  Scenario: use factories advertised by railties/engines/3rd-party gems
+    When I append to "config/application.rb" with:
+      """
+        require File.expand_path('../../lib/some_railtie/railties.rb', __FILE__)
+      """
+    When I write to "lib/some_railtie/railties.rb" with:
+      """
+      module SomeRailtie
+        class Railtie < ::Rails::Engine
+
+          initializer "some_railtie.factories", :after => "factory_girl.set_factory_paths" do
+            FactoryGirl.definition_file_paths << File.expand_path('../factories', __FILE__)
+          end
+        end
+      end
+      """
+    When I write to "lib/some_railtie/factories.rb" with:
+      """
+      FactoryGirl.define do
+        factory :factory_from_some_railtie, :class => 'User' do
+          name 'Artem'
+        end
+      end
+      """
+    When I write to "test/unit/user_test.rb" with:
+      """
+      require 'test_helper'
+
+      class UserTest < ActiveSupport::TestCase
+        test "use factory of some_railtie" do
+          user = FactoryGirl.create(:factory_from_some_railtie)
+          assert_equal 'Artem', user.name
+        end
+      end
+      """
+    When I successfully run `bundle exec rake test --trace`
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"

data/lib/factory_girl_rails/railtie.rb

@@ -14,12 +14,15 @@ module FactoryGirl
       end
     end
 
-    config.after_initialize do
+    initializer "factory_girl.set_factory_paths" do
       FactoryGirl.definition_file_paths = [
           File.join(Rails.root, 'factories'),
           File.join(Rails.root, 'test', 'factories'),
           File.join(Rails.root, 'spec', 'factories')
       ]
+    end
+
+    config.after_initialize do
       FactoryGirl.find_definitions
     end
   end

metadata

@@ -1,107 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: factory_girl_rails
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-18 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70348084760780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70348084760780
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &70348084759880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.3.0
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70348084759880
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70348084758760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70348084758760
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70348084756600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70348084756600
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70348084755920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70348084755920
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70348084755260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70348084755260
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70348084747900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :development
-  version_requirements: *id007
-description: |-
-  factory_girl_rails provides integration between
-      factory_girl and rails 3 (currently just automatic factory definition
-      loading)
+  prerelease: false
+  version_requirements: *70348084747900
+description: ! "factory_girl_rails provides integration between\n    factory_girl
+  and rails 3 (currently just automatic factory definition\n    loading)"
 email: jferris@thoughtbot.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .bundle/config
 - .gitignore
 - CONTRIBUTING.md
@@ -118,41 +111,37 @@ files:
 - features/support/env.rb
 - lib/factory_girl_rails.rb
 - lib/factory_girl_rails/railtie.rb
-- lib/factory_girl_rails/version.rb
 - lib/generators/factory_girl.rb
 - lib/generators/factory_girl/model/model_generator.rb
 - lib/generators/factory_girl/model/templates/fixtures.rb
-has_rdoc: true
 homepage: http://github.com/thoughtbot/factory_girl_rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: factory_girl_rails provides integration between factory_girl and rails 3
-test_files: 
+test_files:
 - features/fixture_replacement_config.feature
 - features/generators.feature
 - features/load_definitions.feature
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
+has_rdoc: 

data/lib/factory_girl_rails/version.rb

@@ -1 +0,0 @@
-module FactoryGirl