factory_girl_rails 4.1.0 → 4.2.0

data/.gitignore

@@ -5,3 +5,5 @@ tmp
 rdoc
 coverage
 pkg
+.bundle
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,17 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode
+before_install:
+  - gem update --system
+  - gem install turn --version 0.8.2
+  - gem install turn --version 0.8.3
+jdk:
+  - openjdk6
+gemfile:
+  - gemfiles/rails3.0.gemfile
+  - gemfiles/rails3.1.gemfile
+  - gemfiles/rails3.2.gemfile
+branches:
+  only:
+    - master

data/Appraisals

@@ -0,0 +1,35 @@
+appraise "rails3.0" do
+  gem "rails", "3.0.18"
+  gem "sqlite3", ">= 1.3.4", platforms: :mri
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
+  gem "minitest-rails"
+  gem "therubyrhino"
+  gem "jquery-rails"
+  gem "rspec-rails"
+end
+
+appraise "rails3.1" do
+  gem "rails", "3.1.9"
+  gem "sass-rails"
+  gem "coffee-rails"
+  gem "uglifier"
+  gem "sqlite3", ">= 1.3.4", platforms: :mri
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
+  gem "minitest-rails"
+  gem "therubyrhino"
+  gem "jquery-rails"
+  gem "rspec-rails"
+end
+
+appraise "rails3.2" do
+  gem "rails", "3.2.10"
+  gem "sass-rails"
+  gem "coffee-rails"
+  gem "uglifier"
+  gem "sqlite3", ">= 1.3.4", platforms: :mri
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
+  gem "minitest-rails"
+  gem "therubyrhino"
+  gem "jquery-rails"
+  gem "rspec-rails"
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Joe Ferris and thoughtbot, inc.
+Copyright (c) 2008-2013 Joe Ferris and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-factory_girl
+factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl_rails.png)](http://travis-ci.org/thoughtbot/factory_girl_rails?branch=master)
 ============
 
 factory_girl is a fixtures replacement with a straightforward definition
@@ -31,6 +31,16 @@ Add factory_girl_rails to your Gemfile:
 
     gem 'factory_girl_rails'
 
+Optionally, to have rails generators automatically generate factories instead
+of fixtures, add the following to your application.rb file:
+
+    config.generators do |g|
+      g.fixture_replacement :factory_girl
+    end
+
+`fixture_replacement :factory_girl` takes an option `:suffix => 'some_suffix'`
+to generate factories as "modelname_some_suffix.rb"
+
 Cucumber Integration
 --------------------
 
@@ -62,4 +72,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-factory_girl is Copyright © 2008-2011 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+factory_girl is Copyright © 2008-2013 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -7,5 +7,17 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
-desc "Default: run the cucumber scenarios"
-task :default => :cucumber
+require 'appraisal'
+
+desc 'Run the test suite'
+task :default do |t|
+  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+    exec 'rake cucumber'
+  else
+    Rake::Task['appraise'].execute
+  end
+end
+
+task :appraise => ['appraisal:install'] do |t|
+  exec 'rake appraisal'
+end

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '4.1.0'
+  s.version     = '4.2.0'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
@@ -11,16 +11,16 @@ Gem::Specification.new do |s|
     loading)}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
-  s.add_runtime_dependency('factory_girl', '~> 4.1.0')
+  s.add_runtime_dependency('factory_girl', '~> 4.2.0')
 
+  s.add_development_dependency('appraisal', '~> 0.5.0')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.6.0')
-  s.add_development_dependency('cucumber', '~> 1.0.0')
-  s.add_development_dependency('aruba')
-  s.add_development_dependency('rails', '3.0.7')
+  s.add_development_dependency('rspec', '~> 2.11.0')
+  s.add_development_dependency('cucumber', '~> 1.2.1')
+  s.add_development_dependency('aruba', '~> 0.5.1')
 end

data/features/fixture_replacement_config.feature

@@ -1,31 +1,72 @@
-@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.
+  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`
+  Scenario: Using Factory Girl and Factory Girl Rails with Test Unit generates a factory file and does not generate a fixture file
+    And I run `bundle install` with a clean environment
+    And I run `bundle exec rails generate model User name:string` with a clean environment
     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`
+    When I add "rspec-rails" as a dependency
+    And I run `bundle install` with a clean environment
+    Then the output should contain "rspec-rails"
+    And I run `bundle exec rails generate model User name:string` with a clean environment
     Then the following files should exist:
       | spec/factories/users.rb |
     And the following files should not exist:
       | spec/fixtures/users.yml |
+
+  Scenario: Using Factory Girl and Factory Girl Rails does not override a manually-configured factories directory using RSpec
+    When I add "rspec-rails" as a dependency
+    And I configure the factories directory as "custom/dir"
+    And I run `bundle install` with a clean environment
+    Then the output should contain "rspec-rails"
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the following files should not exist:
+      | test/factories/users.rb |
+      | spec/factories/users.rb |
+    But the following files should exist:
+      | custom/dir/users.rb |
+
+  Scenario: Using Factory Girl and Factory Girl Rails does not override a manually-configured factories directory using Test::Unit
+    When I configure the factories directory as "custom/dir"
+    And I run `bundle install` with a clean environment
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the following files should not exist:
+      | test/factories/users.rb |
+      | spec/factories/users.rb |
+    But the following files should exist:
+      | custom/dir/users.rb |
+
+  Scenario: Using Factory Girl and Factory Girl Rails with MiniTest should generate a factory file
+    When I add "minitest" as a dependency
+    And I configure the testing framework to use MiniTest
+    And I run `bundle install` with a clean environment
+    Then the output should contain "minitest"
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the following files should exist:
+      | test/factories/users.rb |
+    But the following files should not exist:
+      | spec/fixtures/users.yml |
+
+  Scenario: Using Factory Girl and Factory Girl Rails with MiniTest and a custom directory should generate a factory file
+    When I configure the factories directory as "custom/dir"
+    And I add "minitest" as a dependency
+    And I configure the testing framework to use MiniTest
+    And I run `bundle install` with a clean environment
+    Then the output should contain "minitest"
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the following files should exist:
+      | custom/dir/users.rb |
+    But the following files should not exist:
+      | spec/fixtures/users.yml |
+    And the file "test/models/user_test.rb" should contain "MiniTest::Rails::ActiveSupport::TestCase"

data/features/generators.feature

@@ -3,15 +3,26 @@ Feature:
   As a user of Rails3 and factory_girl
   I would like to use factory_girl_rails generators.
 
-  Scenario: The factory_girl_rails generators create a factory file
-  for each model that I generate
-    When I successfully run `bundle exec rails new testapp`
+  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
-    When I successfully run `bundle install`
-    And I successfully run `bundle exec rails generate model User name:string --fixture-replacement=factory_girl`
-    And I successfully run `bundle exec rails generate model Namespaced::User name:string --fixture-replacement=factory_girl`
+
+  Scenario: The factory_girl_rails generators create a factory file for each model that I generate
+    When I run `bundle install` with a clean environment
+    And I run `bundle exec rails generate model User name:string --fixture-replacement=factory_girl` with a clean environment
+    And I run `bundle exec rails generate model Namespaced::User name:string --fixture-replacement=factory_girl` with a clean environment
     Then the output should contain "test/factories/users.rb"
     And the output should contain "test/factories/namespaced_users.rb"
     And the file "test/factories/users.rb" should contain "factory :user do"
     And the file "test/factories/namespaced_users.rb" should contain "factory :namespaced_user, :class => 'Namespaced::User' do"
+
+  Scenario: The factory_girl_rails generators create a factory file with a custom name for each model that I generate
+    When I run `bundle install` with a clean environment
+    And I set the FactoryGirl :suffix option to "factory"
+    And I run `bundle exec rails generate model User name:string --fixture-replacement=factory_girl` with a clean environment
+    And I run `bundle exec rails generate model Namespaced::User name:string --fixture-replacement=factory_girl` with a clean environment
+    Then the output should contain "test/factories/users_factory.rb"
+    And the output should contain "test/factories/namespaced_users_factory.rb"
+    And the file "test/factories/users_factory.rb" should contain "factory :user do"
+    And the file "test/factories/namespaced_users_factory.rb" should contain "factory :namespaced_user, :class => 'Namespaced::User' do"

data/features/load_definitions.feature

@@ -1,9 +1,11 @@
 Feature: automatically load step 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
-    When I successfully run `bundle install`
+    And I comment out gem "turn" from my Gemfile
+    And I run `bundle install` with a clean environment
     And I write to "db/migrate/1_create_users.rb" with:
       """
       class CreateUsers < ActiveRecord::Migration
@@ -14,14 +16,13 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I successfully run `bundle exec rake db:migrate --trace`
+    When I run `bundle exec rake db:migrate --trace` with a clean environment
     And I write to "app/models/user.rb" with:
       """
       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:
       """
@@ -42,10 +43,9 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I successfully run `bundle exec rake test --trace`
+    When I run `bundle exec rake test --trace` with a clean environment
     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:
       """
@@ -81,5 +81,5 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I successfully run `bundle exec rake test --trace`
-    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
+    When I run `bundle exec rake test --trace` with a clean environment
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"

data/features/step_definitions/appraisal.rb

@@ -0,0 +1,5 @@
+When /^I run `([^"]+)` with a clean environment$/ do |command|
+  step %{I successfully run `ruby -e 'system({"BUNDLE_GEMFILE" => nil}, "#{command}")'`}
+end
+
+# system({'BUNDLE_GEMFILE' => nil}, "cd tmp/aruba/testapp && #{command} && cd -")

data/features/step_definitions/rails_steps.rb

@@ -5,3 +5,48 @@ end
 When /^I add "([^"]+)" as a dependency$/ do |gem_name|
   append_to_file('Gemfile', %{gem "#{gem_name}"\n})
 end
+
+When /^I set the FactoryGirl :suffix option to "([^"]+)"$/ do |suffix|
+  append_to_file('config/application.rb', <<-RUBY)
+    module Testapp
+      class Application < Rails::Application
+        config.generators do |g|
+          g.fixture_replacement :factory_girl, :suffix => '#{suffix}'
+        end
+      end
+    end
+  RUBY
+
+end
+
+When /^I configure the factories directory as "([^"]+)"$/ do |factory_dir|
+  append_to_file File.join('config', 'application.rb'), <<-END
+class Testapp::Application
+  config.generators do |g|
+    g.fixture_replacement :factory_girl, :dir => "#{factory_dir}"
+  end
+end
+  END
+end
+
+When /^I configure the testing framework to use MiniTest$/ do
+  append_to_file('Gemfile', %{gem "minitest-rails", :group => [:development, :test]\n})
+  step %{I run `rails generate mini_test:install` with a clean environment}
+
+  append_to_file File.join('config', 'application.rb'), <<-END
+class Testapp::Application
+  config.generators do |g|
+    g.test_framework :mini_test, :fixture => false, :fixture_replacement => :factory_girl
+  end
+end
+  END
+end
+
+When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
+  in_current_dir do
+    content = File.read('Gemfile')
+    File.open('Gemfile', 'w') do |f|
+      f.write content.sub(/gem ['"]#{gem_name}/, '#\1')
+    end
+  end
+end

data/features/support/env.rb

@@ -5,3 +5,10 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).f
 Before do
   @aruba_timeout_seconds = 3600
 end
+
+Aruba.configure do |config|
+  config.before_cmd do |cmd|
+    set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+    set_env('JAVA_OPTS', "-d32 #{ENV['JAVA_OPTS']}") # force jRuby to use client JVM for faster startup times
+  end
+end if RUBY_PLATFORM == 'java'

data/gemfiles/rails3.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.0.18"
+gem "sqlite3", ">= 1.3.4", :platforms=>:mri
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
+gem "minitest-rails"
+gem "therubyrhino"
+gem "jquery-rails"
+gem "rspec-rails"
+
+gemspec :path=>"../"

data/gemfiles/rails3.0.gemfile.lock

@@ -0,0 +1,139 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
+  specs:
+    factory_girl_rails (4.2.0)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.18)
+      actionpack (= 3.0.18)
+      mail (~> 2.2.19)
+    actionpack (3.0.18)
+      activemodel (= 3.0.18)
+      activesupport (= 3.0.18)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.18)
+      activesupport (= 3.0.18)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.18)
+      activemodel (= 3.0.18)
+      activesupport (= 3.0.18)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.18)
+      activemodel (= 3.0.18)
+      activesupport (= 3.0.18)
+    activesupport (3.0.18)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.0.10)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (2.1.2)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    ffi (1.3.1)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    i18n (0.5.0)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.6)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (4.4.0)
+    minitest-rails (0.3)
+      minitest (~> 4.0)
+      rails (~> 3.0)
+    polyglot (0.3.3)
+    rack (1.2.7)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.18)
+      actionmailer (= 3.0.18)
+      actionpack (= 3.0.18)
+      activerecord (= 3.0.18)
+      activeresource (= 3.0.18)
+      activesupport (= 3.0.18)
+      bundler (~> 1.0)
+      railties (= 3.0.18)
+    railties (3.0.18)
+      actionpack (= 3.0.18)
+      activesupport (= 3.0.18)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    sqlite3 (1.3.7)
+    therubyrhino (2.0.2)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
+    thor (0.14.6)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
+  appraisal (~> 0.5.0)
+  aruba (~> 0.5.1)
+  cucumber (~> 1.2.1)
+  factory_girl_rails!
+  jquery-rails
+  minitest-rails
+  rails (= 3.0.18)
+  rake
+  rspec (~> 2.11.0)
+  rspec-rails
+  sqlite3 (>= 1.3.4)
+  therubyrhino

data/gemfiles/rails3.1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.1.9"
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "sqlite3", ">= 1.3.4", :platforms=>:mri
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
+gem "minitest-rails"
+gem "therubyrhino"
+gem "jquery-rails"
+gem "rspec-rails"
+
+gemspec :path=>"../"

data/gemfiles/rails3.1.gemfile.lock

@@ -0,0 +1,171 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
+  specs:
+    factory_girl_rails (4.2.0)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.9)
+      actionpack (= 3.1.9)
+      mail (~> 2.3.3)
+    actionpack (3.1.9)
+      activemodel (= 3.1.9)
+      activesupport (= 3.1.9)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.9)
+      activesupport (= 3.1.9)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.9)
+      activemodel (= 3.1.9)
+      activesupport (= 3.1.9)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.9)
+      activemodel (= 3.1.9)
+      activesupport (= 3.1.9)
+    activesupport (3.1.9)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.2.3)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.0.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    ffi (1.3.1)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    hike (1.2.1)
+    i18n (0.6.1)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.6)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (4.4.0)
+    minitest-rails (0.3)
+      minitest (~> 4.0)
+      rails (~> 3.0)
+    multi_json (1.2.0)
+    polyglot (0.3.3)
+    rack (1.3.9)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.9)
+      actionmailer (= 3.1.9)
+      actionpack (= 3.1.9)
+      activerecord (= 3.1.9)
+      activeresource (= 3.1.9)
+      activesupport (= 3.1.9)
+      bundler (~> 1.0)
+      railties (= 3.1.9)
+    railties (3.1.9)
+      actionpack (= 3.1.9)
+      activesupport (= 3.1.9)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    sass (3.2.5)
+    sass-rails (3.1.7)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3.2)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    therubyrhino (2.0.2)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
+  appraisal (~> 0.5.0)
+  aruba (~> 0.5.1)
+  coffee-rails
+  cucumber (~> 1.2.1)
+  factory_girl_rails!
+  jquery-rails
+  minitest-rails
+  rails (= 3.1.9)
+  rake
+  rspec (~> 2.11.0)
+  rspec-rails
+  sass-rails
+  sqlite3 (>= 1.3.4)
+  therubyrhino
+  uglifier

data/gemfiles/rails3.2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.2.10"
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "sqlite3", ">= 1.3.4", :platforms=>:mri
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
+gem "minitest-rails"
+gem "therubyrhino"
+gem "jquery-rails"
+gem "rspec-rails"
+
+gemspec :path=>"../"

data/gemfiles/rails3.2.gemfile.lock

@@ -0,0 +1,169 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
+  specs:
+    factory_girl_rails (4.2.0)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
+      mail (~> 2.4.4)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
+      builder (~> 3.0.0)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.0.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    ffi (1.3.1)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (4.4.0)
+    minitest-rails (0.3)
+      minitest (~> 4.0)
+      rails (~> 3.0)
+    multi_json (1.5.0)
+    polyglot (0.3.3)
+    rack (1.4.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
+      bundler (~> 1.0)
+      railties (= 3.2.10)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    sass (3.2.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    therubyrhino (2.0.2)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
+  appraisal (~> 0.5.0)
+  aruba (~> 0.5.1)
+  coffee-rails
+  cucumber (~> 1.2.1)
+  factory_girl_rails!
+  jquery-rails
+  minitest-rails
+  rails (= 3.2.10)
+  rake
+  rspec (~> 2.11.0)
+  rspec-rails
+  sass-rails
+  sqlite3 (>= 1.3.4)
+  therubyrhino
+  uglifier

data/lib/factory_girl_rails/railtie.rb

@@ -6,19 +6,22 @@ module FactoryGirl
 
     initializer "factory_girl.set_fixture_replacement" do
       generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
+      rails_options = generators.options[:rails]
 
-      if generators.options[:rails][:test_framework] == :rspec
-        generators.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      if rails_options[:test_framework] == :rspec
+        if !rails_options.has_key?(:fixture_replacement)
+          generators.fixture_replacement :factory_girl, :dir => 'spec/factories'
+        end
       else
-        generators.test_framework :test_unit, :fixture => false, :fixture_replacement => :factory_girl
+        generators.test_framework rails_options[:test_framework], :fixture => false, :fixture_replacement => :factory_girl
       end
     end
 
     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')
+        File.join(Rails.root, 'factories'),
+        File.join(Rails.root, 'test', 'factories'),
+        File.join(Rails.root, 'spec', 'factories')
       ]
     end
 
@@ -27,4 +30,3 @@ module FactoryGirl
     end
   end
 end
-

data/lib/generators/factory_girl/model/model_generator.rb

@@ -5,9 +5,25 @@ module FactoryGirl
     class ModelGenerator < Base
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
       class_option :dir, :type => :string, :default => "test/factories", :desc => "The directory where the factories should go"
-      
+
       def create_fixture_file
-        template 'fixtures.erb', File.join(options[:dir], "#{table_name}.rb")
+        filename = [table_name, filename_suffix].compact.join('_')
+        template 'fixtures.erb', File.join(options[:dir], "#{filename}.rb")
+      end
+
+      private
+
+      def filename_suffix
+        factory_girl_options[:suffix]
+      end
+
+      def generators
+        config = FactoryGirl::Railtie.config
+        config.respond_to?(:app_generators) ? config.app_generators : config.generators
+      end
+
+      def factory_girl_options
+        generators.options[:factory_girl] || {}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_rails
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,47 +42,47 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,39 +90,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 0.5.1
 description: ! "factory_girl_rails provides integration between\n    factory_girl
   and rails 3 (currently just automatic factory definition\n    loading)"
 email: jferris@thoughtbot.com
@@ -130,11 +130,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .bundle/config
 - .gitignore
+- .travis.yml
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -142,8 +142,15 @@ files:
 - features/fixture_replacement_config.feature
 - features/generators.feature
 - features/load_definitions.feature
+- features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
+- gemfiles/rails3.0.gemfile
+- gemfiles/rails3.0.gemfile.lock
+- gemfiles/rails3.1.gemfile
+- gemfiles/rails3.1.gemfile.lock
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock
 - lib/factory_girl_rails.rb
 - lib/factory_girl_rails/railtie.rb
 - lib/generators/factory_girl.rb
@@ -174,9 +181,16 @@ signing_key:
 specification_version: 3
 summary: factory_girl_rails provides integration between factory_girl and rails 3
 test_files:
+- Appraisals
 - features/fixture_replacement_config.feature
 - features/generators.feature
 - features/load_definitions.feature
+- features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
-has_rdoc: 
+- gemfiles/rails3.0.gemfile
+- gemfiles/rails3.0.gemfile.lock
+- gemfiles/rails3.1.gemfile
+- gemfiles/rails3.1.gemfile.lock
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock

data/.bundle/config

@@ -1,2 +0,0 @@
---- {}
-

data/Gemfile.lock

@@ -1,116 +0,0 @@
-PATH
-  remote: .
-  specs:
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
-      railties (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.10)
-    aruba (0.4.3)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.7)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.1)
-      rack (~> 1.0)
-    builder (2.1.2)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    cucumber (1.0.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (4.1.0)
-      activesupport (>= 3.0.0)
-    ffi (1.0.9)
-    gherkin (2.4.1)
-      json (>= 1.4.6)
-    i18n (0.5.0)
-    json (1.5.3)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.9.2.2)
-    rdiscount (1.6.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    term-ansicolor (1.0.5)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  cucumber (~> 1.0.0)
-  factory_girl_rails!
-  rails (= 3.0.7)
-  rake
-  rspec (~> 2.6.0)