cucumber_factory 1.11.7 → 1.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28de517891242c79d8f64c23f92e6a6bc322f12
-  data.tar.gz: 532c04a63d0c234063abf1611bc119eaef88c0eb
+  metadata.gz: 2474f1242ac52bc7d8ed0e36fcf51f5fea0301c9
+  data.tar.gz: 3cbeb16d2fe2cd2038bc22e937046af0f0743e53
 SHA512:
-  metadata.gz: b1b9b07fe1e6db10e9ac006e1806ef4d132b35ccf8400094b29d20ced5db682aa5088ec43d55ed8554cc7f9191313ab662de5010cdde66d8ba95f96b09f53eed
-  data.tar.gz: 7774e3ae88b88d31f051a34d9ba9f342fce6284a6828dcc38aeacae52c769c83a7830809e8a1f966521a765a0d24f36e6cc62b4ec0d742dcad721fc513e3b7de
+  metadata.gz: 0cea20126d458263a37d369acefc48855cf156d92a81d6b6776373d0c7fdcc4982646166c747afdbd17cdb0428da6cf39114f19c3d535cc25014ed5b349ef0f1
+  data.tar.gz: 47f468e206ea8fc20ef02ae343cc048bf47e794f4e9549cf5e474f9919f9bcbbf45007200fa957e8dfd966003b3e79a34c85e454c50e5c7ba707c40fe533cbd1

data/.gitignore

@@ -5,3 +5,4 @@ pkg
 .idea
 .rvmrc
 log/*.log
+spec/support/database.yml

data/.travis.yml

@@ -24,9 +24,7 @@ matrix:
 install:
   # Replace default Travis CI bundler script with a version that doesn't
   # explode when lockfile doesn't match recently bumped version
-  - gem uninstall bundler -x -I
-  - gem install bundler --version='=1.12.5'
-  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 
 before_script:
   - mysql -e 'create database IF NOT EXISTS cucumber_factory_test;'

data/README.md

@@ -16,7 +16,7 @@ To create a new record with default attributes:
 Given there is a movie
 ```
 
-To create the record, cucumber_factory will call [`Movie.make`](http://github.com/notahat/machinist), [`Factory.create(:movie)`](http://github.com/thoughtbot/factory_girl), [`Movie.create!`](http://apidock.com/rails/ActiveRecord/Persistence/ClassMethods/create%21) or `Movie.new`, depending on what's available.
+To create the record, cucumber_factory will call [`Movie.make`](http://github.com/notahat/machinist), [`Factory.create(:movie)`](http://github.com/thoughtbot/factory_bot), [`Movie.create!`](http://apidock.com/rails/ActiveRecord/Persistence/ClassMethods/create%21) or `Movie.new`, depending on what's available.
 
 To create a new record with attributes set, you can say:
 
@@ -74,15 +74,15 @@ Note that in the example above, "Before Sunrise" is only a name you can use to r
 Support for popular factory gems
 --------------------------------
 
-[Machinist blueprints](http://github.com/notahat/machinist) and [factory_girl factories](http://github.com/thoughtbot/factory_girl) will be used when available.
+[Machinist blueprints](http://github.com/notahat/machinist) and [factory_bot factories](http://github.com/thoughtbot/factory_bot) will be used when available.
 
-You can use a [FactoryGirl child factory](https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md#inheritance) or [Machinist named blueprint](https://github.com/notahat/machinist/tree/1.0-maintenance#named-blueprints) by putting the variant name in parentheses:
+You can use a [FactoryBot child factory](https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#inheritance) or [Machinist named blueprint](https://github.com/notahat/machinist/tree/1.0-maintenance#named-blueprints) by putting the variant name in parentheses:
 
 ```cucumber
 Given there is a movie (comedy) with the title "Groundhog Day"
 ```
 
-You can use [FactoryGirl traits](https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md#traits) by putting the traits in parentheses, as a comma-separated list:
+You can use [FactoryBot traits](https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#traits) by putting the traits in parentheses, as a comma-separated list:
 
 ```cucumber
 Given there is a movie (moody, dark) with the title "Interstellar"

data/lib/cucumber/factory/build_strategy.rb

@@ -1,7 +1,7 @@
 module Cucumber
   class Factory
 
-    # wraps machinist / factory_girl / ruby object logic
+    # wraps machinist / factory_bot / ruby object logic
 
     class BuildStrategy
 
@@ -17,8 +17,8 @@ module Cucumber
             variants = []
           end
 
-          if factory_girl_strategy = factory_girl_strategy(underscored_model_name, variants)
-            factory_girl_strategy
+          if factory_bot_strategy = factory_bot_strategy(underscored_model_name, variants)
+            factory_bot_strategy
           else
             model_class = underscored_model_name.camelize.constantize
             machinist_strategy(model_class, variants) ||
@@ -29,14 +29,17 @@ module Cucumber
 
         private
 
-        def factory_girl_strategy(factory_name, variants)
-          return unless defined?(::FactoryGirl)
+        def factory_bot_strategy(factory_name, variants)
+          factory_class   = ::FactoryBot  if defined?(FactoryBot)
+          factory_class ||= ::FactoryGirl if defined?(FactoryGirl)
+          return unless factory_class
+
           variants = variants.map(&:to_sym)
           factory_name = factory_name.to_s.underscore.gsub('/', '_').to_sym
 
-          factory = ::FactoryGirl.factories[factory_name]
+          factory = factory_class.factories[factory_name]
 
-          if factory.nil? && variants.present? && factory = ::FactoryGirl.factories[variants[0]]
+          if factory.nil? && variants.present? && factory = factory_class.factories[variants[0]]
             factory_name, *variants = variants
           end
 
@@ -47,7 +50,7 @@ module Cucumber
               args = []
               args += variants
               args << attributes
-              ::FactoryGirl.create(factory_name, *args)
+              factory_class.create(factory_name, *args)
             end
           end
 

data/lib/cucumber_factory/version.rb

@@ -1,3 +1,3 @@
 module CucumberFactory
-  VERSION = '1.11.7'
+  VERSION = '1.11.8'
 end

data/spec/cucumber_factory/factory/build_strategy_spec.rb

@@ -8,10 +8,10 @@ describe Cucumber::Factory::BuildStrategy do
 
   describe '.from_prose' do
 
-    context 'when describing a factory girl factory' do
+    context 'when describing a factory_bot factory' do
 
       it 'returns a strategy corresponding to the factories model' do
-        FactoryGirl.stub_factories :job_offer => JobOffer
+        FactoryBot.stub_factories :job_offer => JobOffer
         strategy = subject.from_prose('job offer', nil)
 
         strategy.should be_a(described_class)
@@ -19,7 +19,7 @@ describe Cucumber::Factory::BuildStrategy do
       end
 
       it 'uses the variant for the factory name if present' do
-        FactoryGirl.stub_factories :job_offer => JobOffer
+        FactoryBot.stub_factories :job_offer => JobOffer
         strategy = subject.from_prose('foo', '(job offer)')
 
         strategy.should be_a(described_class)
@@ -28,7 +28,7 @@ describe Cucumber::Factory::BuildStrategy do
 
     end
 
-    context 'when describing a non factory girl model' do
+    context 'when describing a non factory_bot model' do
 
       it "should return a strategy for the class matching a natural language expression" do
         subject.from_prose("movie", nil).model_class.should == Movie

data/spec/cucumber_factory/steps_spec.rb

@@ -29,27 +29,27 @@ describe 'steps provided by cucumber_factory' do
     invoke_cucumber_step('there is a machinist model (Variant Mark Two) with the attribute "foo"')
   end
 
-  it "should create models that have a factory_girl factory by calling #FactoryGirl.create(:model_name)" do
-    FactoryGirl.stub_factories :job_offer => JobOffer
-    FactoryGirl.should_receive(:create).with(:job_offer, { :title => "Awesome job" })
+  it "should create models that have a factory_bot factory by calling #FactoryBot.create(:model_name)" do
+    FactoryBot.stub_factories :job_offer => JobOffer
+    FactoryBot.should_receive(:create).with(:job_offer, { :title => "Awesome job" })
     invoke_cucumber_step('there is a job offer with the title "Awesome job"')
   end
 
-  it "should create model variants that have a factory_girl factory by calling #FactoryGirl.create(:variant)" do
-    FactoryGirl.stub_factories :tempting_job_offer => JobOffer
-    FactoryGirl.should_receive(:create).with(:tempting_job_offer, { :title => "Awesomafiablyfantasmic job" })
+  it "should create model variants that have a factory_bot factory by calling #FactoryBot.create(:variant)" do
+    FactoryBot.stub_factories :tempting_job_offer => JobOffer
+    FactoryBot.should_receive(:create).with(:tempting_job_offer, { :title => "Awesomafiablyfantasmic job" })
     invoke_cucumber_step('there is a job offer (tempting job offer) with the title "Awesomafiablyfantasmic job"')
   end
 
-  it "should create model variants that have a factory_girl trait by calling #FactoryGirl.create(:factory, :trait1, :trait2)" do
-    FactoryGirl.stub_factories :tempting_job_offer => JobOffer
-    FactoryGirl.should_receive(:create).with(:tempting_job_offer, :risky, :lucrative, { :title => "Awesomafiablyfantasmic job" })
+  it "should create model variants that have a factory_bot trait by calling #FactoryBot.create(:factory, :trait1, :trait2)" do
+    FactoryBot.stub_factories :tempting_job_offer => JobOffer
+    FactoryBot.should_receive(:create).with(:tempting_job_offer, :risky, :lucrative, { :title => "Awesomafiablyfantasmic job" })
     invoke_cucumber_step('there is a tempting job offer (risky, lucrative) with the title "Awesomafiablyfantasmic job"')
   end
 
-  it "should create model variants that have a factory_girl factory by using the model name as a factory name" do
-    FactoryGirl.stub_factories :tempting_job_offer => JobOffer
-    FactoryGirl.should_receive(:create).with(:tempting_job_offer, { :title => "Awesomafiablyfantasmic job" })
+  it "should create model variants that have a factory_bot factory by using the model name as a factory name" do
+    FactoryBot.stub_factories :tempting_job_offer => JobOffer
+    FactoryBot.should_receive(:create).with(:tempting_job_offer, { :title => "Awesomafiablyfantasmic job" })
     invoke_cucumber_step('there is a tempting job offer with the title "Awesomafiablyfantasmic job"')
   end
 

data/spec/support/{factory_girl_mock.rb → factory_bot_mock.rb}

@@ -1,4 +1,4 @@
-class FactoryGirl # for factory_girl compatibility spec
+class FactoryBot # for factory_bot compatibility spec
 
   def self.factories
     {}
@@ -11,7 +11,7 @@ class FactoryGirl # for factory_girl compatibility spec
     hash.each do |name, build_class|
       factories[name] = Factory.new(name, build_class)
     end
-    FactoryGirl.stub :factories => factories
+    FactoryBot.stub :factories => factories
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_factory
 version: !ruby/object:Gem::Version
-  version: 1.11.7
+  version: 1.11.8
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -101,8 +101,7 @@ files:
 - spec/support/database.rb
 - spec/support/database.sample.yml
 - spec/support/database.travis.yml
-- spec/support/database.yml
-- spec/support/factory_girl_mock.rb
+- spec/support/factory_bot_mock.rb
 - spec/support/models/job_offer.rb
 - spec/support/models/machinist_model.rb
 - spec/support/models/movie.rb

data/spec/support/database.yml

@@ -1,5 +0,0 @@
-mysql:
-  database: cucumber_factory_test
-  host: localhost
-  username: root
-  password: junior