factory_girl_rails 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 501700716b0d0a25dc9aeb99c35b1f85964bde77
-  data.tar.gz: 5b07b7d3b1f472f8ea85d1ea63ad9dd0d91a232c
+  metadata.gz: 006b146afdfb102242f6429da252a598d4308d43
+  data.tar.gz: 55f470fca71a220ec5a19bbd9bfbcf3929edd8e9
 SHA512:
-  metadata.gz: 4261217f6d01aabccf3de6f61fd613434cf9c3694d2f6d4ed5a9f321890857644fb268bb32542a903091003b18373020e58e8f2d48a760bf110c659904b35bc1
-  data.tar.gz: 36c64ec1a1a9f3fc079fa925a8155b0872d17ddf9fedf4e937baae457d2b7ccf98fd3eeb0b6bf06b0acf9b77d5ba9471fa6548e1900d321040b04164450788da
+  metadata.gz: 5f65bf4191e3ec624d81f34490fd08cf1e54c9b1126e0602168ae5d3e957302464f69448bc9a7c3e3ff92b356b9aa5e025215fe8b1677ebc50b207e1aaebcf9c
+  data.tar.gz: cf56ee37840366d2303ca2d9ce0bed1948577828bfa86dd8cf249f64bcaeedda1f66819ba29e157a4add6189ef087314ae9a4b05b1eeb5ccf560322efc497e74

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
+before_install:
+  - gem update --system
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.1.5
+  - 2.2.1
   - jruby-19mode
 jdk:
   - openjdk6
@@ -12,9 +13,7 @@ branches:
     - master
 install:
   - "travis_retry bundle install"
-  - "bundle exec appraisal generate"
-  - "travis_retry bundle exec appraisal install"
 gemfile:
   - gemfiles/rails3.2.gemfile
-  - gemfiles/rails4.0.gemfile
   - gemfiles/rails4.1.gemfile
+  - gemfiles/rails4.2.gemfile

data/Appraisals

@@ -1,16 +1,15 @@
 # These are the versions of Rails we want to test against.
 appraise 'rails3.2' do
-  gem 'rails', '~> 3.2.18'
+  gem 'rails', '~> 3.2.21'
   gem 'sass-rails'
 end
 
-appraise 'rails4.0' do
-  gem 'rails', '~> 4.0.5'
+appraise 'rails4.1' do
+  gem 'rails', '~> 4.1.9'
   gem 'sass-rails'
+  gem 'spring'
 end
 
-appraise 'rails4.1' do
-  gem 'rails', '~> 4.1.1'
-  gem 'sass-rails', '~> 4.0.3'
-  gem 'spring'
+appraise 'rails4.2' do
+  gem 'rails', '~> 4.2.0'
 end

data/CONTRIBUTING.md

@@ -1,6 +1,9 @@
 # Contributing
 
-We love pull requests. Here's a quick guide.
+We love pull requests from everyone. By participating in this project, you
+agree to abide by the thoughtbot [code of conduct].
+
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
 
 Fork, then clone the repo:
 

data/Gemfile

@@ -5,16 +5,16 @@ gemspec
 gem 'appraisal'
 gem 'aruba'
 gem 'coffee-rails'
-gem 'cucumber'
+gem 'cucumber', '1.3.19'
 gem 'jquery-rails'
 gem 'rake'
 gem 'rspec-rails'
 gem 'uglifier'
+gem 'test-unit'
 
-if RUBY_PLATFORM == 'java'
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'jdbc-sqlite3'
-  gem 'therubyrhino'
-else
-  gem 'sqlite3'
-end
+gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+gem 'jdbc-sqlite3', platforms: :jruby
+gem 'therubyrhino', platforms: :jruby
+gem 'jruby-openssl', platforms: :jruby
+
+gem 'sqlite3', platforms: :ruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl_rails (4.5.0)
+    factory_girl_rails (4.6.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
 
@@ -20,16 +20,26 @@ GEM
     activemodel (4.1.1)
       activesupport (= 4.1.1)
       builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activerecord-jdbc-adapter (1.3.15)
+      activerecord (>= 2.2)
+    activerecord-jdbcsqlite3-adapter (1.3.15)
+      activerecord-jdbc-adapter (~> 1.3.15)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    appraisal (1.0.0)
+    appraisal (1.0.3)
       bundler
       rake
       thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
     aruba (0.5.4)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
@@ -44,28 +54,35 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    cucumber (1.3.15)
+    cucumber (1.3.19)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
+      multi_test (>= 0.1.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.0.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     ffi (1.9.3)
+    ffi (1.9.3-java)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    gherkin (2.12.2-java)
+      multi_json (~> 1.3)
     i18n (0.6.9)
+    jdbc-sqlite3 (3.8.7)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jruby-openssl (0.9.6-java)
     json (1.8.1)
+    json (1.8.1-java)
     minitest (5.3.4)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
+    multi_json (1.11.0)
+    multi_test (0.1.2)
+    power_assert (0.2.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -74,7 +91,7 @@ GEM
       activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -88,8 +105,14 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     sqlite3 (1.3.9)
+    test-unit (3.0.9)
+      power_assert
+    therubyrhino (2.0.4)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
     thor (0.19.1)
     thread_safe (0.3.3)
+    thread_safe (0.3.3-java)
     tzinfo (1.2.0)
       thread_safe (~> 0.1)
     uglifier (2.5.0)
@@ -97,16 +120,25 @@ GEM
       json (>= 1.8.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
   appraisal
   aruba
   coffee-rails
-  cucumber
+  cucumber (= 1.3.19)
   factory_girl_rails!
+  jdbc-sqlite3
   jquery-rails
+  jruby-openssl
   rake
   rspec-rails
   sqlite3
+  test-unit
+  therubyrhino
   uglifier
+
+BUNDLED WITH
+   1.10.6

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '4.5.0'
+  s.version     = '4.6.0'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
@@ -11,8 +11,6 @@ Gem::Specification.new do |s|
     loading)}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.license       = "MIT"
 

data/features/fixture_replacement_config.feature

@@ -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"
@@ -98,3 +115,18 @@ Feature:
       | 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

@@ -10,12 +10,38 @@ Feature:
 
   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` 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
+
+      """
+    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

data/features/load_definitions.feature

@@ -4,6 +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 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:
       """
@@ -15,7 +16,7 @@ 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
@@ -42,7 +43,7 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I run `bundle exec rake test --trace` with a clean environment
+    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
@@ -64,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
@@ -80,5 +81,5 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I run `bundle exec rake test --trace` with a clean environment
+    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/rails_steps.rb

@@ -6,19 +6,6 @@ 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 print out "([^"]*)"$/ do |path|
   in_current_dir do
     File.open(path, 'r') do |f|

data/gemfiles/rails3.2.gemfile

@@ -5,13 +5,18 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "aruba"
 gem "coffee-rails"
-gem "cucumber"
+gem "cucumber", "1.3.19"
 gem "jquery-rails"
 gem "rake"
 gem "rspec-rails"
 gem "uglifier"
-gem "sqlite3"
-gem "rails", "~> 3.2.18"
+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 => "../"

data/gemfiles/rails4.1.gemfile

@@ -5,14 +5,19 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "aruba"
 gem "coffee-rails"
-gem "cucumber"
+gem "cucumber", "1.3.19"
 gem "jquery-rails"
 gem "rake"
 gem "rspec-rails"
 gem "uglifier"
-gem "sqlite3"
-gem "rails", "~> 4.1.1"
-gem "sass-rails", "~> 4.0.3"
+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", "~> 4.1.9"
+gem "sass-rails"
 gem "spring"
 
 gemspec :path => "../"

data/gemfiles/rails4.2.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+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", "~> 4.2.0"
+
+gemspec :path => "../"

data/lib/generators/factory_girl.rb

@@ -8,7 +8,7 @@ module FactoryGirl
       end
 
       def explicit_class_option
-        ", :class => '#{class_name}'" unless class_name == singular_table_name.camelize
+        ", class: '#{class_name}'" unless class_name == singular_table_name.camelize
       end
     end
   end

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

@@ -18,6 +18,13 @@ module FactoryGirl
         desc: "The directory or file root where factories belong"
       )
 
+      class_option(
+        :suffix,
+        type: :string,
+        default: nil,
+        desc: "Suffix to add factory file"
+      )
+
       def create_fixture_file
         if File.exist?(factories_file)
           insert_factory_into_existing_file
@@ -36,12 +43,11 @@ module FactoryGirl
         insert_into_file(
           factories_file,
           factory_definition,
-          after: "FactoryGirl.define do"
+          after: "FactoryGirl.define do\n"
         )
       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
@@ -49,7 +55,7 @@ module FactoryGirl
       def factory_definition
 <<-RUBY
   factory :#{singular_table_name}#{explicit_class_option} do
-    #{factory_attributes}
+#{factory_attributes.gsub(/^/, "    ")}
   end
 RUBY
       end
@@ -57,7 +63,7 @@ RUBY
       def single_file_factory_definition
 <<-RUBY
 FactoryGirl.define do
-#{factory_definition}
+#{factory_definition.chomp}
 end
 RUBY
       end
@@ -68,8 +74,16 @@ RUBY
         end.join("\n")
       end
 
+      def filename
+        if factory_girl_options[:filename_proc].present?
+          factory_girl_options[:filename_proc].call(table_name)
+        else
+          [table_name, filename_suffix].compact.join('_')
+        end
+      end
+
       def filename_suffix
-        factory_girl_options[:suffix]
+        factory_girl_options[:suffix] || options[:suffix]
       end
 
       def factory_girl_options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_rails
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -43,8 +43,7 @@ description: |-
       factory_girl and rails 3 (currently just automatic factory definition
       loading)
 email: jferris@thoughtbot.com
-executables:
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,8 +66,8 @@ files:
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
 - gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
 - gemfiles/rails4.1.gemfile
+- gemfiles/rails4.2.gemfile
 - lib/factory_girl_rails.rb
 - lib/factory_girl_rails/generator.rb
 - lib/factory_girl_rails/generators/non_rspec_generator.rb
@@ -97,15 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 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/appraisal.rb
-- features/step_definitions/rails_steps.rb
-- features/support/env.rb
-has_rdoc: 
+test_files: []

data/gemfiles/rails4.0.gemfile

@@ -1,17 +0,0 @@
-# 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 => "../"