factory_girl_rails 4.4.0 → 4.9.0

data/bin/stubs/ldiff

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "ldiff")

data/bin/stubs/nokogiri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'nokogiri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("nokogiri", "nokogiri")

data/bin/stubs/rackup

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rack", "rackup")

data/bin/stubs/rails

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rails' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("railties", "rails")

data/bin/stubs/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/stubs/rake2thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake2thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('thor', 'rake2thor')

data/bin/stubs/rdiscount

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rdiscount' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdiscount', 'rdiscount')

data/bin/stubs/rdoc

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'rdoc')

data/bin/stubs/ri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'ri')

data/bin/stubs/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/stubs/setup

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'setup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('factory_girl_rails', 'setup')

data/bin/stubs/sprockets

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'sprockets' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('sprockets', 'sprockets')

data/bin/stubs/thor

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("thor", "thor")

data/bin/stubs/tilt

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tilt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('tilt', 'tilt')

data/factory_girl_rails.gemspec

@@ -1,27 +1,20 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '4.4.0'
+  s.version     = '4.9.0'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
   s.summary     = %q{factory_girl_rails provides integration between
-    factory_girl and rails 3}
+    factory_girl and rails 3 or newer}
   s.description = %q{factory_girl_rails provides integration between
-    factory_girl and rails 3 (currently just automatic factory definition
+    factory_girl and rails 3 or newer (currently just automatic factory definition
     loading)}
 
-  s.files         = `git ls-files`.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.files         = Dir['**/*'].keep_if { |file| File.file?(file) }
   s.require_paths = ["lib"]
+  s.executables   = []
   s.license       = "MIT"
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
-  s.add_runtime_dependency('factory_girl', '~> 4.4.0')
-
-  s.add_development_dependency('appraisal', '~> 0.5.0')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.11.0')
-  s.add_development_dependency('cucumber', '~> 1.2.1')
-  s.add_development_dependency('aruba', '~> 0.5.1')
+  s.add_runtime_dependency('factory_girl', '~> 4.9.0')
 end

data/features/fixture_replacement_config.feature

@@ -1,5 +1,5 @@
 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
+  In order to not have to manually configure Factory Girl as the Rails testing fixture replacement by using the --fixture-replacement=factory_girl option
   I would like the Factory Girl Rails gem to configure Factory Girl as the fixture replacement.
 
   Background:
@@ -32,6 +32,23 @@ Feature:
     And the following files should not exist:
       | spec/fixtures/users.yml |
 
+  Scenario: Using Factory Girl and Factory Girl Rails with RSpec and suffix configuration should generate a factory file with suffix
+    When I add "rspec-rails" as a dependency
+    And I configure the factories as:
+      """
+      config.generators do |g|
+        g.test_framework :rspec, fixture: true
+        g.fixture_replacement :factory_girl, suffix: 'factory'
+      end
+      """
+    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_factory.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"
@@ -54,29 +71,22 @@ Feature:
     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"
+  Scenario: Using Factory Girl Rails with MiniTest should generate a factory file
+    When 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 |
     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
+  Scenario: Using 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"
 
   Scenario: Disable Factory Girl generator
     When I configure the factories as:
@@ -90,3 +100,33 @@ Feature:
     Then the following files should not exist:
       | test/factories/users.rb |
       | spec/factories/users.rb |
+
+  Scenario: Use a suffix with the Factory Girl generator
+    When I add "rspec-rails" as a dependency
+    When I configure the factories as:
+      """
+      config.generators do |g|
+        g.factory_girl suffix: 'suffix'
+      end
+      """
+    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:
+      | spec/factories/users_suffix.rb |
+    Then the following files should not exist:
+      | spec/factories/users.rb |
+
+  Scenario: Use a filename_proc with the Factory Girl generator
+    When I add "rspec-rails" as a dependency
+    When I configure the factories as:
+      """
+      config.generators do |g|
+        g.factory_girl filename_proc: Proc.new { |tb| "prefix_#{tb.singularize}_suffix" }
+      end
+      """
+    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:
+      | spec/factories/prefix_user_suffix.rb |
+    Then the following files should not exist:
+      | spec/factories/users.rb |

data/features/generators.feature

@@ -1,6 +1,6 @@
 Feature:
   In order to easily generate factory files instead of fixture files when generating models
-  As a user of Rails3 and factory_girl
+  As a user of Rails and Factory Girl
   I would like to use factory_girl_rails generators.
 
   Background:
@@ -8,21 +8,47 @@ Feature:
     And I cd to "testapp"
     And I add "factory_girl_rails" from this project as a dependency
 
-  Scenario: The factory_girl_rails generators create a factory file for each model that I generate
+  Scenario: The factory_girl_rails generators create a factory file for each model if there is not a factories.rb file
     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
+    And I run `bundle exec rails generate model User name:string age:integer` with a clean environment
+    And I run `bundle exec rails generate model Namespaced::User name:string` 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"
+    And the file "test/factories/users.rb" should contain exactly:
+      """
+      FactoryGirl.define do
+        factory :user do
+          name "MyString"
+          age 1
+        end
+      end
 
-  Scenario: The factory_girl_rails generators create a factory file with a custom name for each model that I generate
+      """
+    And the file "test/factories/namespaced_users.rb" should contain "factory :namespaced_user, class: 'Namespaced::User' do"
+
+  Scenario: The factory_girl_rails generators add a factory in the correct spot
+    When I run `bundle install` with a clean environment
+    And I write to "test/factories.rb" with:
+      """
+      FactoryGirl.define do
+      end
+      """
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the file "test/factories.rb" should contain exactly:
+      """
+      FactoryGirl.define do
+        factory :user do
+          name "MyString"
+        end
+      end
+      """
+
+  Scenario: The factory_girl_rails generators does not create a factory file for each model if there is a factories.rb file in the test directory
     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"
+    And I write to "test/factories.rb" with:
+      """
+      FactoryGirl.define do
+      end
+      """
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the file "test/factories.rb" should contain "factory :user do"

data/features/load_definitions.feature

@@ -4,7 +4,7 @@ Feature: automatically load step definitions
     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
-    And I comment out gem "turn" from my Gemfile
+    And I add "test-unit" as a dependency
     And I run `bundle install` with a clean environment
     And I write to "db/migrate/1_create_users.rb" with:
       """
@@ -16,14 +16,14 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I run `bundle exec rake db:migrate --trace` with a clean environment
+    When I run `bundle exec rake db:migrate` with a clean environment
     And I write to "app/models/user.rb" with:
       """
       class User < ActiveRecord::Base
       end
       """
 
-  Scenario: generate a rails 3 application and use factory definitions
+  Scenario: generate a Rails application and use factory definitions
     When I write to "test/factories.rb" with:
       """
       FactoryGirl.define do
@@ -43,8 +43,8 @@ Feature: automatically load step definitions
         end
       end
       """
-    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"
+    When I run `bundle exec rake test` with a clean environment
+    Then the output should contain "1 assertions, 0 failures, 0 errors"
 
   Scenario: use factories advertised by railties/engines/3rd-party gems
     When I append to "config/application.rb" with:
@@ -65,7 +65,7 @@ Feature: automatically load step definitions
     When I write to "lib/some_railtie/factories.rb" with:
       """
       FactoryGirl.define do
-        factory :factory_from_some_railtie, :class => 'User' do
+        factory :factory_from_some_railtie, class: 'User' do
           name 'Artem'
         end
       end
@@ -81,5 +81,5 @@ Feature: automatically load step definitions
         end
       end
       """
-    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"
+    When I run `bundle exec rake test` with a clean environment
+    Then the output should contain "1 assertions, 0 failures, 0 errors"

data/features/step_definitions/appraisal.rb

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

data/features/step_definitions/rails_steps.rb

@@ -6,17 +6,12 @@ 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
+When /^I print out "([^"]*)"$/ do |path|
+  in_current_dir do
+    File.open(path, 'r') do |f|
+      puts f.inspect
     end
-  RUBY
-
+  end
 end
 
 When /^I configure the factories as:$/ do |string|
@@ -37,19 +32,6 @@ 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')

data/features/support/env.rb

@@ -2,8 +2,8 @@ require 'aruba/cucumber'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
 
-Before do
-  @aruba_timeout_seconds = 3600
+Aruba.configure do |config|
+  config.exit_timeout = Integer ENV.fetch("ARUBA_TIMEOUT") { 120 }
 end
 
 Aruba.configure do |config|

data/gemfiles/rails3.2.gemfile

@@ -2,15 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.2.11"
-gem "sass-rails"
+gem "appraisal"
+gem "aruba"
 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 "cucumber", "1.3.19"
 gem "jquery-rails"
+gem "rake"
 gem "rspec-rails"
+gem "uglifier"
+gem "test-unit"
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "therubyrhino", :platforms => :jruby
+gem "jruby-openssl", :platforms => :jruby
+gem "sqlite3", :platforms => :ruby
+gem "rails", "~> 3.2.21"
+gem "sass-rails"
 
-gemspec :path=>"../"
+gemspec :path => "../"