pickle 0.5.1 → 0.6.0

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/path_spec.rb

@@ -4,7 +4,7 @@ require 'pickle/path'
 
 describe Pickle::Path do
   include Pickle::Path
-  
+
   describe "#path_to_pickle, when the model doesn't exist" do
     before do
       allow(self).to receive(:model).and_return(nil)
@@ -12,81 +12,81 @@ describe Pickle::Path do
     it "('that user', :extra => 'new comment') should raise the error raised by model!" do
       expect { path_to_pickle "that user", "new comment" }.to raise_error(RuntimeError, 'Could not figure out a path for ["that user", "new comment"] {}')
     end
-    
+
   end
-  
+
   describe "#path_to_pickle" do
     describe "when model returns a user" do
       let :user_class do
         double 'User', :name => 'User'
       end
-      
+
       let :user do
         double 'user', :class => user_class
       end
-      
+
       before do
         allow(self).to receive(:model).and_return(user)
       end
-    
+
       it "('a user', 'the user: \"fred\"') should retrieve 'a user', and 'the user: \"fred\"' models" do
         expect(self).to receive(:model).with('a user')
         expect(self).to receive(:model).with('the user: "fred"')
         allow(self).to receive(:user_user_path).and_return('the path')
         expect(path_to_pickle('a user', 'the user: "fred"')).to eq('the path')
       end
-    
+
       it "('a user', :action => 'foo') should return foo_user_path(<user>)" do
         expect(self).to receive(:foo_user_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :action => 'foo')).to eq('the path')
       end
-    
+
       it "('a user', :action => 'foo') should raise informative error if foo_user_path not defined" do
         expect(self).to receive(:foo_user_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :action => 'foo') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-    
+
       it "('a user', :segment => 'foo') should return user_foo_path(<user>)" do
         expect(self).to receive(:user_foo_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :segment => 'foo')).to eq('the path')
       end
-    
+
       it "('a user', :segment => 'foo') should raise informative error if foo_user_path not defined" do
         expect(self).to receive(:user_foo_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :segment => 'foo') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-    
+
       it "('a user', :action => 'new', :segment => 'comment') should return new_user_comment_path(<user>)" do
         expect(self).to receive(:new_user_comment_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :segment => 'comment', :action => 'new')).to eq('the path')
       end
-    
+
       it "('a user', :action => 'new', :segment => 'comment') should raise informative error if new_user_comment_path not defined" do
         expect(self).to receive(:new_user_comment_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :action => 'new', :segment => 'comment') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-    
+
       it "('a user', :extra => 'new comment') should return new_user_comment_path(<user>)" do
         expect(self).to receive(:new_user_comment_path).with(user).and_return('the path')
         expect(path_to_pickle('a user', :extra => 'new comment')).to eq('the path')
       end
-    
+
       it "('a user', :extra => 'new comment') should raise informative error if new_user_comment_path not defined" do
         expect(self).to receive(:new_user_comment_path).with(user).and_raise(NoMethodError)
         expect { path_to_pickle('a user', :extra => 'new comment') }.to raise_error(Exception, /Could not figure out a path for/)
       end
-      
+
       describe "when args is a list of pickle and non pickle models" do
         before do
           allow(self).to receive(:model).with("account").and_return(nil)
         end
-      
+
         it "('account', 'the user') should return account_user_path(<user>)" do
           expect(self).to receive(:account_user_path).with(user).and_return("the path")
           expect(path_to_pickle('account', 'the user')).to eq('the path')
         end
       end
-      
+
       describe "(private API)" do
         it "('a user', :extra => 'new ish comment') should try combinations of 'new', 'ish', 'comment'" do
           expect(self).to receive(:pickle_path_for_resources_action_segment).with([user], '', 'new_ish_comment').once
@@ -97,5 +97,24 @@ describe Pickle::Path do
         end
       end
     end
+
+    describe "when model returns namespaced user" do
+      let :user_class do
+        double 'User', :name => 'Admin::User'
+      end
+
+      let :user do
+        double 'user', :class => user_class
+      end
+
+      before do
+        allow(self).to receive(:model).and_return(user)
+      end
+
+      it "('a user', :action => 'foo') should return foo_admin_user_path(<user>)" do
+        expect(self).to receive(:foo_admin_user_path).with(user).and_return('the path')
+        expect(path_to_pickle('a user', :action => 'foo')).to eq('the path')
+      end
+    end
   end
-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.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ian White
 - James Le Cuirot
+- Mathieu Jobin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -17,14 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +120,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +151,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 +182,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 +234,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: []
@@ -232,14 +260,13 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Gemfile
-- Gemfile.lock.development
 - 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 +297,14 @@ files:
 - features/support/paths.rb
 - features/support/pickle.rb
 - features/support/pickle_app.rb
-- init.rb
+- gemfiles/Gemfile-rails.5.0.x
+- gemfiles/Gemfile-rails.5.1.x
+- gemfiles/Gemfile-rails.5.2.x
+- gemfiles/Gemfile-rails.5.2.x-cukes-4
+- gemfiles/Gemfile-rails.5.2.x-cukes-5
+- gemfiles/Gemfile-rails.6.0.x
+- gemfiles/Gemfile-rails.6.0.x-cukes-5
+- gemfiles/Gemfile-rails.edge
 - lib/generators/pickle_generator.rb
 - lib/pickle.rb
 - lib/pickle/adapter.rb
@@ -325,46 +359,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: pickle
-rubygems_version: 2.2.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Easy model creation and reference in your cucumber features.
-test_files:
-- features/app/app.rb
-- features/app/blueprints.rb
-- features/app/fabricators.rb
-- features/app/factories.rb
-- features/app/views/notifier/email.erb
-- features/app/views/notifier/user_email.erb
-- features/email/email.feature
-- features/generator/generators.feature
-- features/path/models_page.feature
-- features/path/named_route_page.feature
-- features/pickle/create_from_active_record.feature
-- features/pickle/create_from_fabrication.feature
-- features/pickle/create_from_factory_girl.feature
-- features/pickle/create_from_machinist.feature
-- features/step_definitions/email_steps.rb
-- features/step_definitions/extra_email_steps.rb
-- features/step_definitions/fork_steps.rb
-- features/step_definitions/generator_steps.rb
-- features/step_definitions/path_steps.rb
-- features/step_definitions/pickle_steps.rb
-- features/step_definitions/raise_error_steps.rb
-- features/support/email.rb
-- features/support/env.rb
-- features/support/paths.rb
-- features/support/pickle.rb
-- features/support/pickle_app.rb
-- spec/pickle/adapter_spec.rb
-- spec/pickle/config_spec.rb
-- spec/pickle/email/parser_spec.rb
-- spec/pickle/email_spec.rb
-- spec/pickle/parser/matchers_spec.rb
-- spec/pickle/parser_spec.rb
-- spec/pickle/path_spec.rb
-- spec/pickle/session_spec.rb
-- spec/pickle_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-gemspec

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