pickle 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b58eef50218f9337a561a6bb1037202cc200fc2a
-  data.tar.gz: 4ef8f88b81920ea1e5297a10dc1407d61f4cba71
+  metadata.gz: 7e7168521d6d499e30be9d1fec65880ef854e0e9
+  data.tar.gz: 8708853820e50391f50f23ce5bb07fec56b3edc4
 SHA512:
-  metadata.gz: 0dd3d6376c5c8d7372935fc15d451e69c975155461003679e7bdfc6e82bb31775d3fb112eb2d7c2f4eb415591aa50b10ba72028ce68f3f9e4077ef63bda1d9d5
-  data.tar.gz: cece36b98a29a5b44c3751f6a592cbf8a2cca0d48e25f97e8ca97d599a55f689a310b1b94288da2cf5d89a193a58860a75aefba7dc5d6f673bd6d0087a9f890b
+  metadata.gz: 0cae7674d31fbba4431d990edc9c179159a3036725df417898d55197941a4b81edf65ca7125f85c622c35527cbac0d7aafbbe39c9942037d4dc88916fe117d0d
+  data.tar.gz: d247e0339a2254ab3c377160162213ff83c26f077cae65cef833ba67113eb44968e04c380e2d52f1e0642961d498c2cdbbbe27615ef3339146b8e3a7f78b43da

data/.gitignore

@@ -4,7 +4,6 @@
 # local ruby/gems dev stuff
 .rvmrc
 .bundle
-Gemfile.lock
 cucumber_test_app
 pickle-email*
 
@@ -14,4 +13,4 @@ doc
 
 # built gems
 pkg
-*.gem
+*.gem

data/.travis.yml

@@ -1,10 +1,17 @@
 language: ruby
+dist: xenial
+cache: bundler
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+  - 2.1.10
+matrix:
+  allow_failures:
+    - rvm: 2.1.10
+  fast_finish: true
 
-before_install:
-  - cp Gemfile.lock.development Gemfile.lock
 script:
+  - gem install bundler
   - bundle exec rake spec
   - bundle exec rake cucumber

data/Gemfile

@@ -1,3 +1,7 @@
 source "http://rubygems.org"
 
+# Bundler 1.x default to insecure http:// for github: shortcut
+git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" }
+
 gemspec
+gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800'

data/Gemfile.lock

@@ -0,0 +1,201 @@
+GIT
+  remote: https://github.com/mathieujobin/fabrication.git
+  revision: 923cf6fcefd0566b1d6be7bd2f685b89388f4800
+  ref: 923cf6fcefd0566b1d6be7bd2f685b89388f4800
+  specs:
+    fabrication (2.16.2)
+
+PATH
+  remote: .
+  specs:
+    pickle (0.5.4)
+      cucumber (>= 0.8, < 3.0)
+      rake
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
+      globalid (>= 0.3.0)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
+      arel (~> 6.0)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    builder (3.2.3)
+    capybara (2.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    codecov (0.1.10)
+      json
+      simplecov
+      url
+    concurrent-ruby (1.0.5)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-rails (1.5.0)
+      capybara (>= 1.1.2, < 3)
+      cucumber (>= 1.3.8, < 4)
+      mime-types (>= 1.17, < 4)
+      nokogiri (~> 1.5)
+      railties (>= 4, < 5.2)
+    cucumber-wire (0.0.1)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubis (2.7.0)
+    factory_bot (4.8.2)
+      activesupport (>= 3.0.0)
+    gherkin (4.1.3)
+    git (1.3.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.6)
+    json (2.1.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    machinist (2.0)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_mime (0.1.4)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    public_suffix (2.0.5)
+    rack (1.6.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.9)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    url (0.3.2)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
+    yard (0.9.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  capybara
+  codecov
+  cucumber-rails
+  database_cleaner
+  fabrication!
+  factory_bot
+  git
+  machinist
+  pickle!
+  rack
+  rails (~> 4.2.6)
+  rspec-rails (~> 3.0)
+  sqlite3
+  yard
+
+BUNDLED WITH
+   1.16.0

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.4
+* updated FactoryGirl to FactoryBot
+
 == 0.5.3
 * small fix to pickle_path_for_resources_action_segment
 * update for fabrication adapter with protected method klass

data/README.md

@@ -88,7 +88,7 @@ Given a post exists with title: "My Post", body: "My body"
 
 ### Using with factory-girl or machinist
 
-But you're using Machinist or FactoryGirl right?!  To leverage all of the factories/blueprints you've written, you can just do stuff like
+But you're using Machinist or FactoryBot right?!  To leverage all of the factories/blueprints you've written, you can just do stuff like
 
 ```gherkin
 Given a user exists
@@ -107,14 +107,14 @@ In your `features/support/env.rb` add the following lines at the bottom
 require "#{Rails.root}/spec/blueprints" # or wherever they live
 ```
 
-#### FactoryGirl: make sure factories are loaded
+#### FactoryBot: make sure factories are loaded
 
 In your config/environments/cucumber.rb file, make sure the factory-girl gem is included (unless it's installed as a plugin).
 
-If that doesn't solve loading issues then require your factories.rb file directly in a file called 'features/support/factory_girl.rb'
+If that doesn't solve loading issues then require your factories.rb file directly in a file called 'features/support/factory_bot.rb'
 
 ```ruby
-# example features/support/factory_girl.rb
+# example features/support/factory_bot.rb
 require File.dirname(__FILE__) + '/../../spec/factories'
 ```
 
@@ -174,7 +174,7 @@ Given a user exists with name: "Fred"
 Given a user exists with name: "Fred", activated: false
 ```
 
-This last step could be better expressed by using Machinist/FactoryGirl to create an activated user.  Then you can do
+This last step could be better expressed by using Machinist/FactoryBot to create an activated user.  Then you can do
 
 ```gherkin
 Given an activated user exists with name: "Fred"

data/Rakefile.d/cucumber.rake

@@ -2,7 +2,7 @@ require 'cucumber/rake/task'
 
 desc "Run features"
 Cucumber::Rake::Task.new(:cucumber => [:cucumber_test_app]) do |t|
-  t.cucumber_opts = ['--format', 'pretty', '--require', 'features']
+  t.cucumber_opts = %w[--format pretty --require features -t ~@wip]
 end
 
 desc "setup a rails app for running cucumber"
@@ -16,12 +16,13 @@ namespace :cucumber do
     Bundler.with_clean_env do
       gemfile = "cucumber_test_app/Gemfile"
       rm_rf "cucumber_test_app"
-      sh "bundle exec rails new cucumber_test_app --skip-javascript --skip-sprockets"
+      sh "bundle exec rails new cucumber_test_app --skip-spring --skip-javascript --skip-sprockets"
       sh "echo 'gem \"cucumber-rails\", :require => false' >> #{gemfile}"
       sh "echo 'gem \"rspec-rails\", \"~>3.0\"' >> #{gemfile}"
       sh "echo 'gem \"capybara\"' >> #{gemfile}"
+      sh "echo 'gem \"pickle\", path: \"#{__dir__}/..\"' >> #{gemfile}"
       sh "bundle install --gemfile=#{gemfile}"
-      sh "ln -s ../../.. cucumber_test_app/vendor/plugins/pickle"
+      sh "(cd cucumber_test_app ; bundle exec rake db:migrate)"
     end
   end
 end

data/Rakefile.d/repoclean.rake

@@ -0,0 +1,3 @@
+task :repoclean do
+  system "rm -fr pickle-email-* .bundle/ .yardoc/ cucumber_test_app/ doc/ tmp"
+end

data/features/app/factories.rb

@@ -1,13 +1,13 @@
 # Factories
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   sequence :fork_name do |n|
     "fork %d04" % n
   end
 
   factory :fork do |f|
-    f.name { FactoryGirl.generate(:fork_name) }
+    f.name { FactoryBot.generate(:fork_name) }
   end
 
   factory :tine do |t|
@@ -20,6 +20,6 @@ FactoryGirl.define do
   end
 
   factory :fancy_fork, :class => Fork do |t|
-    t.name { "Fancy " + FactoryGirl.generate(:fork_name) }
+    t.name { "Fancy " + FactoryBot.generate(:fork_name) }
   end
 end

data/features/email/email.feature

@@ -1,3 +1,4 @@
+@wip
 Feature: I can test emails are sent
   In order write features with emails as outcomes
   As a feature writer

data/features/step_definitions/extra_email_steps.rb

@@ -1,12 +1,12 @@
 Given(/^an email "(.*?)" with body: "(.*?)" is delivered to (.+?)$/) do |subject, body, to|
-  Notifier.email(to, subject, body).deliver
+  Notifier.email(to, subject, body).deliver_now
 end
 
 Given(/^an email with a link "(.+?)" to (.+?) is delivered to (.+?)$/) do |text, page, to|
-  body = "some text <a href='http://example.com/#{path_to(page)}'>#{text}</a> more text" 
-  Notifier.email(to, "example", body).deliver
+  body = "some text <a href='http://example.com/#{path_to(page)}'>#{text}</a> more text"
+  Notifier.email(to, "example", body).deliver_now
 end
 
 Given(/^#{capture_model}'s email is delivered$/) do |model|
-  Notifier.user_email(model!(model)).deliver
-end
+  Notifier.user_email(model!(model)).deliver_now
+end

data/features/support/env.rb

@@ -1,14 +1,20 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
 ENV["RAILS_ENV"] ||= "test"
 ENV["RAILS_ROOT"] ||= File.expand_path(File.dirname(__FILE__) + '/../../cucumber_test_app')
 
+Bundler.setup
+
+require 'simplecov'
+require 'codecov'
+SimpleCov.formatter = SimpleCov::Formatter::Codecov
+
 require 'capybara'
 require 'cucumber/rails'
 Capybara.default_selector = :css
 ActionController::Base.allow_rescue = false
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :truncation

data/features/support/pickle.rb

@@ -7,9 +7,9 @@
 #    require 'machinist/active_record' # or your chosen adaptor
 #    require File.dirname(__FILE__) + '/../../spec/blueprints' # or wherever your blueprints are
 #
-# For FactoryGirl add: features/support/factory_girl.rb
+# For FactoryBot add: features/support/factory_bot.rb
 #
-#    require 'factory_girl'
+#    require 'factory_bot'
 #    require File.dirname(__FILE__) + '/../../spec/factories' # or wherever your factories are
 #
 # For Fabrication, just include it in the adapter list when configuring pickle as explained below.

data/lib/pickle.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'pickle/version'
 require 'pickle/adapter'
 require 'pickle/config'

data/lib/pickle/adapter.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext'
-
 module Pickle
   # Abstract Factory adapter class, if you have a factory type setup, you
   # can easily create an adaptor to make it work with Pickle.
@@ -100,11 +98,11 @@ module Pickle
     end
 
     # factory-girl adapter
-    class FactoryGirl < Adapter
+    class FactoryBot < Adapter
       def self.factories
-        if defined? ::FactoryGirl
+        if defined? ::FactoryBot
           factories = []
-          ::FactoryGirl.factories.each do |factory|
+          ::FactoryBot.factories.each do |factory|
             factory.names.each do |name|
               factories << new(factory, name)
             end
@@ -116,7 +114,7 @@ module Pickle
       end
 
       def initialize(factory, factory_name)
-        if defined? ::FactoryGirl
+        if defined? ::FactoryBot
           @klass, @name = factory.build_class, factory_name.to_s
         else
           @klass, @name = factory.build_class, factory.factory_name.to_s
@@ -124,16 +122,16 @@ module Pickle
       end
 
       def create(attrs = {})
-        if defined? ::FactoryGirl
-          ::FactoryGirl.create(@name, attrs)
+        if defined? ::FactoryBot
+          ::FactoryBot.create(@name, attrs)
         else
           Factory(@name, attrs)
         end
       end
 
       def build(attrs = {})
-        if defined? ::FactoryGirl
-          ::FactoryGirl.build(@name, attrs)
+        if defined? ::FactoryBot
+          ::FactoryBot.build(@name, attrs)
         else
           Factory.build(@name, attrs)
         end

data/lib/pickle/config.rb

@@ -11,7 +11,7 @@ module Pickle
     end
 
     def adapters
-      @adapters ||= [:machinist, :factory_girl, :fabrication, :orm]
+      @adapters ||= [:machinist, :factory_bot, :fabrication, :orm]
     end
 
     def adapter_classes

data/lib/pickle/version.rb

@@ -1,3 +1,3 @@
 module Pickle
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/pickle.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.version = Pickle::VERSION.dup
   s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
-  s.authors = ["Ian White", "James Le Cuirot"]
+  s.authors = ["Ian White", "James Le Cuirot", "Mathieu Jobin"]
   s.description = "Easy model creation and reference in your cucumber features"
   s.summary = "Easy model creation and reference in your cucumber features."
-  s.email = ["ian.w.white@gmail.com", "chewi@aura-online.co.uk"]
+  s.email = ["ian.w.white@gmail.com", "chewi@aura-online.co.uk", "mathieu.jobin@gmail.com"]
   s.homepage = "https://github.com/ianwhite/pickle"
 
   s.rubyforge_project = "pickle"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
   
-  s.add_dependency "cucumber", ">=0.8"
+  s.add_dependency "cucumber", ">=0.8", "< 3.0"
   s.add_dependency "rake"
    
   s.add_development_dependency "rack"
@@ -27,12 +27,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency "git"
   s.add_development_dependency "yard"
   s.add_development_dependency "rspec-rails", "~>3.0"
-  s.add_development_dependency "rails", "~>3.1.0"
+  s.add_development_dependency "rails", "~>4.2.6"
   s.add_development_dependency "cucumber-rails"
-  s.add_development_dependency "factory_girl"
+  s.add_development_dependency "factory_bot"
   s.add_development_dependency "fabrication", '~> 2.0'
-  s.add_development_dependency "machinist", "~>2.0"
+  s.add_development_dependency "machinist" # , "~>2.0"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "capybara"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "codecov"
 end

data/rails_generators/pickle/templates/pickle.rb

@@ -7,9 +7,9 @@
 #    require 'machinist/active_record' # or your chosen adaptor
 #    require File.dirname(__FILE__) + '/../../spec/blueprints' # or wherever your blueprints are
 #
-# For FactoryGirl add: features/support/factory_girl.rb
+# For FactoryBot add: features/support/factory_bot.rb
 #
-#    require 'factory_girl'
+#    require 'factory_bot'
 #    require File.dirname(__FILE__) + '/../../spec/factories' # or wherever your factories are
 #
 # For Fabrication, just include it in the adapter list when configuring pickle as explained below.

data/spec/pickle/adapter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require 'active_record'
-require 'factory_girl'
+require 'factory_bot'
 require 'fabrication'
 require 'machinist/active_record'
 require 'pickle/adapters/active_record'
@@ -58,17 +58,17 @@ describe Pickle::Adapter do
       end
     end
 
-    describe 'FactoryGirl' do
+    describe 'FactoryBot' do
       before do
-        allow(Pickle::Adapter::FactoryGirl).to receive(:model_classes).and_return([One, One::Two, Three])
-
-        if defined? ::FactoryGirl
-          @orig_factories = ::FactoryGirl.factories.dup
-          ::FactoryGirl.factories.clear
-          ::FactoryGirl::Syntax::Default::DSL.new.factory(:one, :class => One) {}
-          ::FactoryGirl::Syntax::Default::DSL.new.factory(:two, :class => One::Two) {}
-          @factory1 = ::FactoryGirl.factories[:one]
-          @factory2 = ::FactoryGirl.factories[:two]
+        allow(Pickle::Adapter::FactoryBot).to receive(:model_classes).and_return([One, One::Two, Three])
+
+        if defined? ::FactoryBot
+          @orig_factories = ::FactoryBot.factories.dup
+          ::FactoryBot.factories.clear
+          ::FactoryBot::Syntax::Default::DSL.new.factory(:one, :class => One) {}
+          ::FactoryBot::Syntax::Default::DSL.new.factory(:two, :class => One::Two) {}
+          @factory1 = ::FactoryBot.factories[:one]
+          @factory2 = ::FactoryBot.factories[:two]
         else
           @orig_factories, Factory.factories = Factory.factories, {}
           Factory.define(:one, :class => One) {}
@@ -79,23 +79,23 @@ describe Pickle::Adapter do
       end
 
       after do
-        if defined? ::FactoryGirl
-          ::FactoryGirl.factories.clear
-          @orig_factories.each {|f| ::FactoryGirl.factories.add(f) }
+        if defined? ::FactoryBot
+          ::FactoryBot.factories.clear
+          @orig_factories.each {|f| ::FactoryBot.factories.add(f) }
         else
           Factory.factories = @orig_factories
         end
       end
 
       it ".factories should create one for each factory" do
-        expect(Pickle::Adapter::FactoryGirl).to receive(:new).with(@factory1, @factory1.name).once
-        expect(Pickle::Adapter::FactoryGirl).to receive(:new).with(@factory2, @factory2.name).once
-        Pickle::Adapter::FactoryGirl.factories
+        expect(Pickle::Adapter::FactoryBot).to receive(:new).with(@factory1, @factory1.name).once
+        expect(Pickle::Adapter::FactoryBot).to receive(:new).with(@factory2, @factory2.name).once
+        Pickle::Adapter::FactoryBot.factories
       end
 
       describe ".new(factory, factory_name)" do
         before do
-          @factory = Pickle::Adapter::FactoryGirl.new(@factory1, @factory1.name)
+          @factory = Pickle::Adapter::FactoryBot.new(@factory1, @factory1.name)
         end
 
         it "should have name of factory_name" do
@@ -106,7 +106,7 @@ describe Pickle::Adapter do
           expect(@factory.klass).to eq(One)
         end
 
-        unless defined? ::FactoryGirl
+        unless defined? ::FactoryBot
           it "#create(attrs) should call Factory(<:key>, attrs)" do
             expect(Factory).to receive(:create).with("one", {:key => "val"})
             @factory.create(:key => "val")

data/spec/pickle/config_spec.rb

@@ -5,12 +5,12 @@ describe Pickle::Config do
     @config = Pickle::Config.new
   end
 
-  it "#adapters should default to :machinist, :factory_girl, :orm" do
-    expect(@config.adapters).to eq([:machinist, :factory_girl, :fabrication, :orm])
+  it "#adapters should default to :machinist, :factory_bot, :orm" do
+    expect(@config.adapters).to eq([:machinist, :factory_bot, :fabrication, :orm])
   end
 
-  it "#adapter_classes should default to Adapter::Machinist, Adapter::FactoryGirl, Adapter::Orm" do
-    expect(@config.adapter_classes).to eq([Pickle::Adapter::Machinist, Pickle::Adapter::FactoryGirl, Pickle::Adapter::Fabrication, Pickle::Adapter::Orm])
+  it "#adapter_classes should default to Adapter::Machinist, Adapter::FactoryBot, Adapter::Orm" do
+    expect(@config.adapter_classes).to eq([Pickle::Adapter::Machinist, Pickle::Adapter::FactoryBot, Pickle::Adapter::Fabrication, Pickle::Adapter::Orm])
   end
 
   describe "setting adapters to [:machinist, SomeAdapter]" do
@@ -28,7 +28,7 @@ describe Pickle::Config do
   describe "#factories" do
     it "should call adaptor.factories for each adaptor" do
       expect(Pickle::Adapter::Machinist).to receive(:factories).and_return([])
-      expect(Pickle::Adapter::FactoryGirl).to receive(:factories).and_return([])
+      expect(Pickle::Adapter::FactoryBot).to receive(:factories).and_return([])
       expect(Pickle::Adapter::Fabrication).to receive(:factories).and_return([])
       expect(Pickle::Adapter::Orm).to receive(:factories).and_return([])
       @config.factories
@@ -36,18 +36,18 @@ describe Pickle::Config do
 
     it "should aggregate factories into a hash using factory name as key" do
       expect(Pickle::Adapter::Machinist).to receive(:factories).and_return([@machinist = double('machinist', :name => 'machinist')])
-      expect(Pickle::Adapter::FactoryGirl).to receive(:factories).and_return([@factory_girl = double('factory_girl', :name => 'factory_girl')])
+      expect(Pickle::Adapter::FactoryBot).to receive(:factories).and_return([@factory_bot = double('factory_bot', :name => 'factory_bot')])
       expect(Pickle::Adapter::Fabrication).to receive(:factories).and_return([@fabrication = double('fabrication', :name => 'fabrication')])
       expect(Pickle::Adapter::Orm).to receive(:factories).and_return([@orm = double('orm', :name => 'orm')])
-      expect(@config.factories).to eq({'machinist' => @machinist, 'factory_girl' => @factory_girl, 'fabrication' => @fabrication, 'orm' => @orm})
+      expect(@config.factories).to eq({'machinist' => @machinist, 'factory_bot' => @factory_bot, 'fabrication' => @fabrication, 'orm' => @orm})
     end
 
     it "should give preference to adaptors first in the list" do
       expect(Pickle::Adapter::Machinist).to receive(:factories).and_return([@machinist_one = double('one', :name => 'one')])
-      expect(Pickle::Adapter::FactoryGirl).to receive(:factories).and_return([@factory_girl_one = double('one', :name => 'one'), @factory_girl_two = double('two', :name => 'two')])
+      expect(Pickle::Adapter::FactoryBot).to receive(:factories).and_return([@factory_bot_one = double('one', :name => 'one'), @factory_bot_two = double('two', :name => 'two')])
       expect(Pickle::Adapter::Fabrication).to receive(:factories).and_return([@fabrication_one = double('one', :name => 'one'), @fabrication_three = double('three', :name => 'three')])
       expect(Pickle::Adapter::Orm).to receive(:factories).and_return([@orm_two = double('two', :name => 'two'), @orm_four = double('four', :name => 'four')])
-      expect(@config.factories).to eq({'one' => @machinist_one, 'two' => @factory_girl_two, 'three' => @fabrication_three, 'four' => @orm_four})
+      expect(@config.factories).to eq({'one' => @machinist_one, 'two' => @factory_bot_two, 'three' => @fabrication_three, 'four' => @orm_four})
     end
   end
 

data/spec/pickle/email_spec.rb

@@ -162,7 +162,7 @@ describe Pickle::Email do
       it "should not raise an error when the email body is not a string, but needs to_s [#26]" do
         allow(self).to receive(:visit)
         allow(@email1).to receive(:body).and_return(:a_string_body)
-        expect { click_first_link_in_email(@email1) }.not_to raise_error
+        click_first_link_in_email(@email1)
       end
     end
 

data/spec/pickle/session_spec.rb

@@ -37,7 +37,7 @@ describe Pickle::Session do
     end
 
     it "should raise error if pickle_parser don't know about em" do
-      expect { subject.parse_infinity }.to raise_error
+      expect { subject.parse_infinity }.to raise_error(NoMethodError, /^undefined method `parse_infinity' for /)
     end
   end
 
@@ -300,10 +300,10 @@ describe Pickle::Session do
     let(:shirl) { double("shirl", :class => user_class, :id => 3) }
     let(:noname) { double("noname", :class => user_class, :id => 4) }
 
-    if defined? ::FactoryGirl
-      let(:super_admin_factory) { Pickle::Adapter::FactoryGirl.new(double(:build_class => user_class, :name => :super_admin), :super_admin) }
+    if defined? ::FactoryBot
+      let(:super_admin_factory) { Pickle::Adapter::FactoryBot.new(double(:build_class => user_class, :name => :super_admin), :super_admin) }
     else
-      let(:super_admin_factory) { Pickle::Adapter::FactoryGirl.new(double(:build_class => user_class, :factory_name => :super_admin), :super_admin) }
+      let(:super_admin_factory) { Pickle::Adapter::FactoryBot.new(double(:build_class => user_class, :factory_name => :super_admin), :super_admin) }
     end
 
     before do
@@ -391,7 +391,7 @@ describe Pickle::Session do
     end
 
     it "#parser.parse_fields 'author: user \"JIM\"' should raise Error, as model deos not refer" do
-      expect { pickle_parser.parse_fields('author: user "JIM"') }.to raise_error
+      expect { pickle_parser.parse_fields('author: user "JIM"') }.to raise_error(Pickle::Session::ModelNotKnownError, %q[The model: 'user "JIM"' is not known in this scenario.  Use #create_model to create, or #find_model to find, and store a reference in this scenario.])
     end
 
     it "#parser.parse_fields 'author: the user' should return {\"author\" => <user>}" do

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
+require 'rails'
 require 'active_support'
 require 'active_record'
-require 'factory_girl'
+require 'factory_bot'
+
+require 'simplecov'
+require 'codecov'
+SimpleCov.formatter = SimpleCov::Formatter::Codecov
 
 $:.unshift(File.expand_path('../../lib', __FILE__))
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pickle
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ian White
 - James Le Cuirot
+- Mathieu Jobin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -18,6 +19,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +29,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +122,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +145,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -169,16 +176,16 @@ dependencies:
   name: machinist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -221,10 +228,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  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'
 description: Easy model creation and reference in your cucumber features
 email:
 - ian.w.white@gmail.com
 - chewi@aura-online.co.uk
+- mathieu.jobin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -233,13 +255,14 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock.development
+- Gemfile.lock
 - History.txt
 - License.txt
 - README.md
 - Rakefile
 - Rakefile.d/cucumber.rake
 - Rakefile.d/release.rake
+- Rakefile.d/repoclean.rake
 - Rakefile.d/rspec.rake
 - Rakefile.d/yard.rake
 - Todo.txt
@@ -270,7 +293,6 @@ files:
 - features/support/paths.rb
 - features/support/pickle.rb
 - features/support/pickle_app.rb
-- init.rb
 - lib/generators/pickle_generator.rb
 - lib/pickle.rb
 - lib/pickle/adapter.rb
@@ -326,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: pickle
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easy model creation and reference in your cucumber features.

data/Gemfile.lock.development

@@ -1,158 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pickle (0.5.1)
-      cucumber (>= 0.8)
-      rake
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.12)
-      actionpack (= 3.1.12)
-      mail (~> 2.4.4)
-    actionpack (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    arel (2.2.3)
-    builder (3.0.4)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    cucumber (1.3.18)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    cucumber-rails (1.4.2)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 2)
-      mime-types (>= 1.16, < 3)
-      nokogiri (~> 1.5)
-      rails (>= 3, < 5)
-    database_cleaner (1.4.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    fabrication (2.12.0)
-    factory_girl (4.5.0)
-      activesupport (>= 3.0.0)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    git (1.2.9)
-    hike (1.2.3)
-    i18n (0.7.0)
-    json (1.8.2)
-    machinist (2.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mini_portile (0.6.2)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    polyglot (0.3.5)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.1.12)
-      actionmailer (= 3.1.12)
-      actionpack (= 3.1.12)
-      activerecord (= 3.1.12)
-      activeresource (= 3.1.12)
-      activesupport (= 3.1.12)
-      bundler (~> 1.0)
-      railties (= 3.1.12)
-    railties (3.1.12)
-      actionpack (= 3.1.12)
-      activesupport (= 3.1.12)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sprockets (2.0.5)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
-    thor (0.14.6)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  capybara
-  cucumber-rails
-  database_cleaner
-  fabrication (~> 2.0)
-  factory_girl
-  git
-  machinist (~> 2.0)
-  pickle!
-  rack
-  rails (~> 3.1.0)
-  rspec-rails (~> 3.0)
-  sqlite3
-  yard