factory_girl_rails 4.4.1 → 4.5.0

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:
@@ -54,29 +54,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 +83,18 @@ 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 |

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,21 @@ 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` 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"
 
-  Scenario: The factory_girl_rails generators create a factory file with a custom name for each model that I generate
+  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,6 @@ 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 run `bundle install` with a clean environment
     And I write to "db/migrate/1_create_users.rb" with:
       """
@@ -23,7 +22,7 @@ Feature: automatically load step definitions
       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
@@ -44,7 +43,7 @@ Feature: automatically load step definitions
       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"
+    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:
@@ -82,4 +81,4 @@ Feature: automatically load step definitions
       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"
+    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

@@ -19,6 +19,14 @@ When /^I set the FactoryGirl :suffix option to "([^"]+)"$/ do |suffix|
 
 end
 
+When /^I print out "([^"]*)"$/ do |path|
+  in_current_dir do
+    File.open(path, 'r') do |f|
+      puts f.inspect
+    end
+  end
+end
+
 When /^I configure the factories as:$/ do |string|
   append_to_file File.join('config', 'application.rb'), <<-END
 class Testapp::Application
@@ -37,19 +45,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/gemfiles/rails3.2.gemfile

@@ -2,15 +2,16 @@
 
 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"
 gem "jquery-rails"
+gem "rake"
 gem "rspec-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "rails", "~> 3.2.18"
+gem "sass-rails"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails4.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+gem "cucumber"
+gem "jquery-rails"
+gem "rake"
+gem "rspec-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "rails", "~> 4.0.5"
+gem "sass-rails"
+
+gemspec :path => "../"

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+gem "cucumber"
+gem "jquery-rails"
+gem "rake"
+gem "rspec-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "rails", "~> 4.1.1"
+gem "sass-rails", "~> 4.0.3"
+gem "spring"
+
+gemspec :path => "../"

data/lib/factory_girl_rails/generators/rspec_generator.rb

@@ -16,7 +16,7 @@ module FactoryGirlRails
       end
 
       def factory_girl_directory
-        @generators.options.fetch(:factory_girl, { dir: 'spec/factories' })[:dir]
+        @generators.options.fetch(:factory_girl, {}).fetch(:dir, 'spec/factories')
       end
     end
   end

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

@@ -4,28 +4,82 @@ require 'factory_girl_rails'
 module FactoryGirl
   module Generators
     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"
+      argument(
+        :attributes,
+        type: :array,
+        default: [],
+        banner: "field:type field:type"
+      )
+
+      class_option(
+        :dir,
+        type: :string,
+        default: "test/factories",
+        desc: "The directory or file root where factories belong"
+      )
 
       def create_fixture_file
-        filename = [table_name, filename_suffix].compact.join('_')
-        template 'fixtures.erb', File.join(options[:dir], "#{filename}.rb")
+        if File.exist?(factories_file)
+          insert_factory_into_existing_file
+        else
+          create_factory_file
+        end
       end
 
       private
 
+      def factories_file
+        options[:dir] + ".rb"
+      end
+
+      def insert_factory_into_existing_file
+        insert_into_file(
+          factories_file,
+          factory_definition,
+          after: "FactoryGirl.define do"
+        )
+      end
+
+      def create_factory_file
+        filename = [table_name, filename_suffix].compact.join('_')
+        file = File.join(options[:dir], "#{filename}.rb")
+        create_file(file, single_file_factory_definition)
+      end
+
+      def factory_definition
+<<-RUBY
+  factory :#{singular_table_name}#{explicit_class_option} do
+    #{factory_attributes}
+  end
+RUBY
+      end
+
+      def single_file_factory_definition
+<<-RUBY
+FactoryGirl.define do
+#{factory_definition}
+end
+RUBY
+      end
+
+      def factory_attributes
+        attributes.map do |attribute|
+          "#{attribute.name} #{attribute.default.inspect}"
+        end.join("\n")
+      end
+
       def filename_suffix
         factory_girl_options[:suffix]
       end
 
+      def factory_girl_options
+        generators.options[:factory_girl] || {}
+      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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_rails
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.0
 platform: ruby
 authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,90 +30,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 4.5.0
 description: |-
   factory_girl_rails provides integration between
       factory_girl and rails 3 (currently just automatic factory definition
       loading)
 email: jferris@thoughtbot.com
-executables: []
+executables:
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -122,10 +53,12 @@ files:
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - NEWS
 - README.md
 - Rakefile
+- bin/setup
 - factory_girl_rails.gemspec
 - features/fixture_replacement_config.feature
 - features/generators.feature
@@ -133,10 +66,9 @@ files:
 - features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.1.gemfile.lock
 - gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.1.gemfile
 - lib/factory_girl_rails.rb
 - lib/factory_girl_rails/generator.rb
 - lib/factory_girl_rails/generators/non_rspec_generator.rb
@@ -145,7 +77,6 @@ files:
 - lib/factory_girl_rails/railtie.rb
 - lib/generators/factory_girl.rb
 - lib/generators/factory_girl/model/model_generator.rb
-- lib/generators/factory_girl/model/templates/fixtures.erb
 homepage: http://github.com/thoughtbot/factory_girl_rails
 licenses:
 - MIT
@@ -166,19 +97,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 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
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.1.gemfile.lock
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
+has_rdoc: