factory_girl_rails 1.2.0 → 1.3.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    factory_girl_rails (1.1.0)
-      factory_girl (~> 2.1.0)
+    factory_girl_rails (1.3.0)
+      factory_girl (~> 2.2.0)
       railties (>= 3.0.0)
 
 GEM
@@ -56,7 +56,8 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (2.1.0)
+    factory_girl (2.2.0)
+      activesupport
     ffi (1.0.9)
     gherkin (2.4.1)
       json (>= 1.4.6)

data/features/fixture_replacement_config.feature

@@ -0,0 +1,31 @@
+@disable-bundler
+Feature:
+  In order to not have to manually configure factory girl as the testing fixture replacement
+  by using the --fixture-replacement=factory_girl option
+  as a Rails3 and Factory Girl user
+  I would like the Factory Girl Rails gem to configure Factory Girl
+  as the fixture replacement.
+
+  Background:
+    Given 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
+
+  Scenario: Using Factory Girl and Factory Girl Rails with Test Unit generates
+  a factory file and does not generate a fixture file
+    And I successfully run `bundle install`
+    And I successfully run `bundle exec rails generate model User name:string`
+    Then the following files should exist:
+      | test/factories/users.rb |
+    And the following files should not exist:
+      | test/fixtures/users.yml |
+
+
+  Scenario: Using Factory Girl and Factory Girl Rails with RSpec should generate a factory file
+    And I add "rspec-rails" as a dependency
+    And I successfully run `bundle install`
+    And I successfully run `bundle exec rails generate model User name:string`
+    Then the following files should exist:
+      | spec/factories/users.rb |
+    And the following files should not exist:
+      | spec/fixtures/users.yml |

data/features/step_definitions/rails_steps.rb

@@ -1,3 +1,7 @@
 When /^I add "([^"]+)" from this project as a dependency$/ do |gem_name|
-  append_to_file('Gemfile', %{gem "#{gem_name}", :path => "#{PROJECT_ROOT}"})
+  append_to_file('Gemfile', %{gem "#{gem_name}", :path => "#{PROJECT_ROOT}"\n})
+end
+
+When /^I add "([^"]+)" as a dependency$/ do |gem_name|
+  append_to_file('Gemfile', %{gem "#{gem_name}"\n})
 end

data/lib/factory_girl_rails/railtie.rb

@@ -3,11 +3,22 @@ require 'rails'
 
 module FactoryGirl
   class Railtie < Rails::Railtie
+
+    initializer "factory_girl.set_fixture_replacement" do
+      generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
+
+      if generators.options[:rails][:test_framework] == :rspec
+        generators.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      else
+        generators.test_framework :test_unit, :fixture => false, :fixture_replacement => :factory_girl
+      end
+    end
+
     config.after_initialize do
       FactoryGirl.definition_file_paths = [
-        File.join(Rails.root, 'factories'),
-        File.join(Rails.root, 'test', 'factories'),
-        File.join(Rails.root, 'spec', 'factories')
+          File.join(Rails.root, 'factories'),
+          File.join(Rails.root, 'test', 'factories'),
+          File.join(Rails.root, 'spec', 'factories')
       ]
       FactoryGirl.find_definitions
     end

data/lib/generators/factory_girl/model/templates/fixtures.rb

@@ -2,8 +2,8 @@
 
 FactoryGirl.define do
   factory :<%= singular_name %> do
-  <% for attribute in attributes -%>
+<% for attribute in attributes -%>
     <%= attribute.name %> <%= attribute.default.inspect %>
-  <% end -%>
+<% end -%>
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: factory_girl_rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Joe Ferris
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 -04:00
+date: 2011-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - lib/generators/factory_girl/model/model_generator.rb
 - lib/generators/factory_girl/model/templates/fixtures.rb
 - lib/generators/factory_girl.rb
+- features/fixture_replacement_config.feature
 - features/generators.feature
 - features/load_definitions.feature
 - features/step_definitions/rails_steps.rb
@@ -146,6 +147,7 @@ signing_key:
 specification_version: 3
 summary: factory_girl_rails provides integration between factory_girl and rails 3
 test_files: 
+- features/fixture_replacement_config.feature
 - features/generators.feature
 - features/load_definitions.feature
 - features/step_definitions/rails_steps.rb