cucumber_factory 1.10.0 → 1.11.0

data/.gitignore

@@ -4,4 +4,4 @@ pkg
 .bundle
 .idea
 .rvmrc
-Gemfile.lock
+log/*.log

data/README.rdoc

@@ -53,10 +53,14 @@ Note that in the example above, "Before Sunrise" is only a name you can use to r
 
 {Machinist blueprints}[http://github.com/notahat/machinist] and {factory_girl factories}[http://github.com/thoughtbot/factory_girl] will be used when available.
 
-You can use named Machinist blueprint such as <tt>Movie.blueprint(:comedy)</tt> like this:
+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:
 
     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:
+
+    Given there is a movie (moody, dark) with the title "Interstellar"
+
 
 == Overriding factory steps
 
@@ -81,7 +85,7 @@ In Rails 2, add the following to your <tt>environment.rb</tt>:
 
     config.gem 'cucumber_factory'
 
-In Rails 3, add the following to your <tt>Gemfile</tt>:
+In Rails 3+, add the following to your <tt>Gemfile</tt>:
 
     gem 'cucumber_factory'
 
@@ -90,11 +94,6 @@ Finally, create a file <tt>features/step_definitions/factory_steps.rb</tt>, whic
     Cucumber::Factory.add_steps(self)
 
 
-== Rails 3 compatibility
-
-We cannot guarantee Rails 3 compatibility at this point, but we will upgrade the gem when Rails 3 is released.
-
-
 === Credits
 
 Henning Koch

data/lib/cucumber/factory/build_strategy.rb

@@ -10,13 +10,18 @@ module Cucumber
         def from_prose(model_prose, variant_prose)
           # don't use \w which depends on the system locale
           underscored_model_name = model_prose.gsub(/[^A-Za-z0-9_\/]+/, "_")
-          variant = variant_prose.present? && /\((.*?)\)/.match(variant_prose)[1].downcase.gsub(" ", "_")
+          if variant_prose.present?
+            variants = /\((.*?)\)/.match(variant_prose)[1].split(/\s*,\s*/)
+            variants = variants.collect { |variant| variant.downcase.gsub(" ", "_") }
+          else
+            variants = []
+          end
 
-          if factory_girl_strategy = factory_girl_strategy(variant || underscored_model_name)
+          if factory_girl_strategy = factory_girl_strategy(underscored_model_name, variants)
             factory_girl_strategy
           else
             model_class = underscored_model_name.camelize.constantize
-            machinist_strategy(model_class, variant) ||
+            machinist_strategy(model_class, variants) ||
               active_record_strategy(model_class) ||
               ruby_object_strategy(model_class)
           end
@@ -24,25 +29,32 @@ module Cucumber
 
         private
 
-        def factory_girl_strategy(factory_name)
+        def factory_girl_strategy(factory_name, variants)
           return unless defined?(::FactoryGirl)
-
+          variants = variants.map(&:to_sym)
           factory_name = factory_name.to_s.underscore.gsub('/', '_').to_sym
-          if factory = ::FactoryGirl.factories[factory_name]
 
+          factory = ::FactoryGirl.factories[factory_name]
+
+          if factory.nil? && variants.present? && factory = ::FactoryGirl.factories[variants[0]]
+            factory_name, *variants = variants
+          end
+
+          if factory
             new(factory.build_class) do |attributes|
-              ::FactoryGirl.create(factory.name, attributes)
+              ::FactoryGirl.create(factory_name, *variants, attributes)
             end
-
           end
+
         end
 
-        def machinist_strategy(model_class, variant)
+        def machinist_strategy(model_class, variants)
           if model_class.respond_to?(:make)
 
             new(model_class) do |attributes|
-              if variant.present?
-                model_class.make(variant.to_sym, attributes)
+              if variants.present?
+                variants.size == 1 or raise 'Machinist only supports a single variant per blueprint'
+                model_class.make(variants.first.to_sym, attributes)
               else
                 model_class.make(attributes)
               end

data/lib/cucumber_factory/version.rb

@@ -1,3 +1,3 @@
 module CucumberFactory
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/spec/rails-2.3/Gemfile

@@ -6,4 +6,5 @@ gem 'hoe', '=2.8.0', :platforms => :ruby_19
 gem 'rails', '~>2.3.10'
 gem 'rspec', '<2'
 gem 'rspec-rails', '<2'
+gem 'cucumber', '<2'
 gem 'cucumber_factory', :path => '../..'

data/spec/rails-2.3/Gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: ../..
+  specs:
+    cucumber_factory (1.11.0)
+      activesupport
+      cucumber
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
+      rack (~> 1.1.0)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    builder (3.2.2)
+    cucumber (1.3.15)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    hoe (2.8.0)
+      rake (>= 0.8.7)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rack (1.1.6)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
+      rake (>= 0.8.3)
+    rake (10.2.1)
+    rspec (1.3.2)
+    rspec-rails (1.3.4)
+      rack (>= 1.0.0)
+      rspec (~> 1.3.1)
+    sqlite3 (1.3.9)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (< 2)
+  cucumber_factory!
+  hoe (= 2.8.0)
+  rails (~> 2.3.10)
+  rspec (< 2)
+  rspec-rails (< 2)
+  sqlite3
+  test-unit (= 1.2.3)

data/spec/rails-3.0/Gemfile

@@ -4,5 +4,6 @@ gem 'sqlite3'
 gem 'rails', '~>3.0.3'
 gem 'rspec'
 gem 'rspec-rails'
+gem 'cucumber', '<2'
 gem 'cucumber_factory', :path => '../..'
 

data/spec/rails-3.0/Gemfile.lock

@@ -0,0 +1,116 @@
+PATH
+  remote: ../..
+  specs:
+    cucumber_factory (1.11.0)
+      activesupport
+      cucumber
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
+      mail (~> 2.2.19)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      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.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
+    arel (2.0.10)
+    builder (2.1.2)
+    cucumber (1.3.15)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.5.3)
+    json (1.8.1)
+    mail (2.2.20)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    polyglot (0.3.4)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
+      bundler (~> 1.0)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.2.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sqlite3 (1.3.9)
+    thor (0.14.6)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (< 2)
+  cucumber_factory!
+  rails (~> 3.0.3)
+  rspec
+  rspec-rails
+  sqlite3

data/spec/rails-3.2/Gemfile

@@ -4,5 +4,6 @@ gem 'sqlite3'
 gem 'rails', '~>3.2'
 gem 'rspec'
 gem 'rspec-rails'
+gem 'cucumber', '<2'
 gem 'cucumber_factory', :path => '../..'
 

data/spec/rails-3.2/Gemfile.lock

@@ -0,0 +1,124 @@
+PATH
+  remote: ../..
+  specs:
+    cucumber_factory (1.11.0)
+      activesupport
+      cucumber
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    cucumber (1.3.15)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    multi_json (1.9.2)
+    multi_test (0.1.1)
+    polyglot (0.3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
+      bundler (~> 1.0)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.2.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (< 2)
+  cucumber_factory!
+  rails (~> 3.2)
+  rspec
+  rspec-rails
+  sqlite3

data/spec/rails-4.0/Gemfile

@@ -4,5 +4,6 @@ gem 'sqlite3'
 gem 'rails', '~>4.0'
 gem 'rspec', '~>2.13.0'
 gem 'rspec-rails'
+gem 'minitest'
+gem 'cucumber', '<2'
 gem 'cucumber_factory', :path => '../..'
-

data/spec/rails-4.0/Gemfile.lock

@@ -0,0 +1,119 @@
+PATH
+  remote: ../..
+  specs:
+    cucumber_factory (1.11.0)
+      activesupport
+      cucumber
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
+      mail (~> 2.5.4)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
+      builder (~> 3.1.0)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.4)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    atomic (1.1.16)
+    builder (3.1.4)
+    cucumber (1.3.15)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    i18n (0.6.9)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.9.2)
+    multi_test (0.1.1)
+    polyglot (0.3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.4)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (< 2)
+  cucumber_factory!
+  minitest
+  rails (~> 4.0)
+  rspec (~> 2.13.0)
+  rspec-rails
+  sqlite3

data/spec/shared/cucumber_factory/steps_spec.rb

@@ -45,6 +45,12 @@ describe 'steps provided by cucumber_factory' do
     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" })
+    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" })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_factory
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,7 +126,9 @@ files:
 - lib/cucumber_factory.rb
 - lib/cucumber_factory/switcher.rb
 - lib/cucumber_factory/version.rb
+- spec/app_root/log/.keep
 - spec/rails-2.3/Gemfile
+- spec/rails-2.3/Gemfile.lock
 - spec/rails-2.3/Rakefile
 - spec/rails-2.3/app_root/config/boot.rb
 - spec/rails-2.3/app_root/config/database.yml
@@ -140,6 +142,7 @@ files:
 - spec/rails-2.3/spec/spec_helper.rb
 - spec/rails-3.0/.rspec
 - spec/rails-3.0/Gemfile
+- spec/rails-3.0/Gemfile.lock
 - spec/rails-3.0/Rakefile
 - spec/rails-3.0/app_root/.gitignore
 - spec/rails-3.0/app_root/config/application.rb
@@ -158,6 +161,7 @@ files:
 - spec/rails-3.0/spec/spec_helper.rb
 - spec/rails-3.2/.rspec
 - spec/rails-3.2/Gemfile
+- spec/rails-3.2/Gemfile.lock
 - spec/rails-3.2/Rakefile
 - spec/rails-3.2/app_root/.gitignore
 - spec/rails-3.2/app_root/config/application.rb
@@ -176,6 +180,7 @@ files:
 - spec/rails-3.2/spec/spec_helper.rb
 - spec/rails-4.0/.rspec
 - spec/rails-4.0/Gemfile
+- spec/rails-4.0/Gemfile.lock
 - spec/rails-4.0/Rakefile
 - spec/rails-4.0/app_root/.gitignore
 - spec/rails-4.0/app_root/config/application.rb
@@ -238,4 +243,3 @@ signing_key:
 specification_version: 3
 summary: Create records from Cucumber features without writing step definitions.
 test_files: []
-has_rdoc: