RubyGems - shoulda-matchers - Versions diffs - 2.5.0 → 2.6.0 - Mend

shoulda-matchers 2.5.0 → 2.6.0

Files changed (121) hide show

data/Rakefile CHANGED

@@ -15,14 +15,15 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
-task :default do |t|
+task :default do
   if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
-    exec 'rake spec cucumber'
+    Rake::Task['spec'].invoke
+    Rake::Task['cucumber'].invoke
   else
-    Rake::Task['appraise'].execute
+    Rake::Task['appraise'].invoke
   end
 end
-task :appraise => ['appraisal:install'] do |t|
-  exec 'rake appraisal'
+task :appraise do
+  exec 'appraisal install && appraisal rake'
 end

data/features/rails_integration.feature CHANGED

@@ -12,7 +12,7 @@ Feature: integrate with Rails
         end
       end
       """
-    When I successfully run `bundle exec rake db:migrate --trace`
+    When I successfully run `bundle exec rake db:migrate db:test:prepare --trace`
     And I write to "app/models/user.rb" with:
       """
       class User < ActiveRecord::Base

data/features/step_definitions/rails_steps.rb CHANGED

@@ -33,14 +33,14 @@ When 'I generate a new rails application' do
 end
 When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
-  append_to_gemfile "gem '#{name}', :path => '#{PROJECT_ROOT}'"
+  append_to_gemfile "gem '#{name}', path: '#{PROJECT_ROOT}'"
   steps %{And I install gems}
 end
 When /^I configure the application to use "([^\"]+)" from this project in test and development$/ do |name|
   append_to_gemfile <<-GEMFILE
   group :test, :development do
-    gem '#{name}', :path => '#{PROJECT_ROOT}'
+    gem '#{name}', path: '#{PROJECT_ROOT}'
   end
   GEMFILE
   steps %{And I install gems}
@@ -67,7 +67,8 @@ When 'I configure the application to use rspec-rails in test and development' do
 end
 When 'I configure the application to use shoulda-context' do
-  append_to_gemfile %q(gem 'shoulda-context', '~> 1.0')
+  append_to_gemfile %q(gem 'shoulda-context', '~> 1.2.0')
+  append_to_gemfile %q(gem 'pry')
   steps %{And I install gems}
 end
@@ -112,7 +113,7 @@ Then /^the output should indicate that (\d+) tests? (?:was|were) run/ do |number
   # Rails 4 has slightly different output than Rails 3 due to
   # Test::Unit::TestCase -> MiniTest
   if rails_4?
-    steps %{Then the output should contain "#{number} tests, #{number} assertions, 0 failures, 0 errors, 0 skips"}
+    steps %{Then the output should match /#{number} (tests|runs), #{number} assertions, 0 failures, 0 errors, 0 skips/}
   else
     steps %{Then the output should contain "#{number} tests, #{number} assertions, 0 failures, 0 errors"}
   end
@@ -125,7 +126,7 @@ Then /^the output should indicate that (\d+) unit and (\d+) functional tests? we
   # Rails 3 runs separate test suites in separate processes, but Rails 4 does
   # not, so that's why we have to check for different things here
   if rails_4?
-    steps %{Then the output should contain "#{total} tests, #{total} assertions, 0 failures, 0 errors, 0 skips"}
+    steps %{Then the output should match /#{total} (tests|runs), #{total} assertions, 0 failures, 0 errors, 0 skips/}
   else
     steps %{Then the output should match /#{n1} tests, #{n1} assertions, 0 failures, 0 errors.+#{n2} tests, #{n2} assertions, 0 failures, 0 errors/}
   end
@@ -154,7 +155,7 @@ module FileHelpers
   end
   def rails_4?
-    match = ORIGINAL_BUNDLE_VARS['BUNDLE_GEMFILE'].match(/(\d)\.\d\.(\d\.)?gemfile$/)
+    match = ORIGINAL_BUNDLE_VARS['BUNDLE_GEMFILE'].match(/(\d)\.\d\.(\d\.)?(\w+\.)?gemfile$/)
     match.captures[0] == '4'
   end
 end

data/gemfiles/3.0.gemfile CHANGED

@@ -2,7 +2,7 @@
 source "https://rubygems.org"
-gem "shoulda-context", "~> 1.1.2"
+gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
@@ -12,4 +12,4 @@ gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.0.17"
 gem "strong_parameters"
-gemspec :path=>"../"
+gemspec :path=>".././"

data/gemfiles/3.0.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.0)
       activesupport (>= 3.0.0)
 GEM
@@ -34,9 +34,10 @@ GEM
       activemodel (= 3.0.20)
       activesupport (= 3.0.20)
     activesupport (3.0.20)
-    appraisal (0.5.1)
+    appraisal (1.0.0.beta2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (2.0.10)
     aruba (0.5.1)
       childprocess (~> 0.3.6)
@@ -47,6 +48,7 @@ GEM
     builder (2.1.2)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
     cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -66,11 +68,16 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
+    method_source (0.8.2)
     mime-types (1.21)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_json (1.7.1)
     polyglot (0.3.3)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -104,7 +111,8 @@ GEM
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    shoulda-context (1.1.4)
+    shoulda-context (1.2.0)
+    slop (3.4.7)
     sqlite3 (1.3.7)
     strong_parameters (0.2.0)
       actionpack (~> 3.0)
@@ -122,17 +130,18 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4)
+  appraisal (~> 1.0.0.beta2)
   aruba
   bourne (~> 1.3)
   bundler (~> 1.1)
   cucumber (~> 1.1)
   jdbc-sqlite3
   jruby-openssl
+  pry
   rails (~> 3.0.17)
   rake (>= 0.9.2)
   rspec-rails (>= 2.13.1, < 3)
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3
   strong_parameters

data/gemfiles/3.1.gemfile CHANGED

@@ -2,7 +2,7 @@
 source "https://rubygems.org"
-gem "shoulda-context", "~> 1.1.2"
+gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
@@ -15,4 +15,4 @@ gem "jquery-rails"
 gem "sass-rails"
 gem "strong_parameters"
-gemspec :path=>"../"
+gemspec :path=>".././"

data/gemfiles/3.1.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.0)
       activesupport (>= 3.0.0)
 GEM
@@ -35,9 +35,10 @@ GEM
       activesupport (= 3.1.11)
     activesupport (3.1.11)
       multi_json (~> 1.0)
-    appraisal (0.5.1)
+    appraisal (1.0.0.beta2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (2.2.3)
     aruba (0.5.1)
       childprocess (~> 0.3.6)
@@ -49,6 +50,7 @@ GEM
     builder (3.0.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
     cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -70,11 +72,16 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
+    method_source (0.8.2)
     mime-types (1.21)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_json (1.7.1)
     polyglot (0.3.3)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.3.10)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -119,7 +126,8 @@ GEM
       railties (~> 3.1.0)
       sass (>= 3.1.10)
       tilt (~> 1.3.2)
-    shoulda-context (1.1.4)
+    shoulda-context (1.2.0)
+    slop (3.4.7)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -142,7 +150,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4)
+  appraisal (~> 1.0.0.beta2)
   aruba
   bcrypt-ruby (~> 3.0.0)
   bourne (~> 1.3)
@@ -151,11 +159,12 @@ DEPENDENCIES
   jdbc-sqlite3
   jquery-rails
   jruby-openssl
+  pry
   rails (~> 3.1.8)
   rake (>= 0.9.2)
   rspec-rails (>= 2.13.1, < 3)
   sass-rails
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3
   strong_parameters

data/gemfiles/3.2.gemfile CHANGED

@@ -2,7 +2,7 @@
 source "https://rubygems.org"
-gem "shoulda-context", "~> 1.1.2"
+gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
@@ -15,4 +15,4 @@ gem "jquery-rails"
 gem "sass-rails"
 gem "strong_parameters"
-gemspec :path=>"../"
+gemspec :path=>".././"

data/gemfiles/3.2.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.0)
       activesupport (>= 3.0.0)
 GEM
@@ -34,9 +34,10 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    appraisal (0.5.1)
+    appraisal (1.0.0.beta2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (3.0.2)
     aruba (0.5.1)
       childprocess (~> 0.3.6)
@@ -48,6 +49,7 @@ GEM
     builder (3.0.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
     cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -70,11 +72,16 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
+    method_source (0.8.2)
     mime-types (1.21)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_json (1.7.1)
     polyglot (0.3.3)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -97,7 +104,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec-core (2.13.1)
@@ -116,7 +123,8 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    shoulda-context (1.1.4)
+    shoulda-context (1.2.0)
+    slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -127,7 +135,7 @@ GEM
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
-    thor (0.17.0)
+    thor (0.18.1)
     tilt (1.3.6)
     treetop (1.4.12)
       polyglot
@@ -140,7 +148,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4)
+  appraisal (~> 1.0.0.beta2)
   aruba
   bcrypt-ruby (~> 3.0.0)
   bourne (~> 1.3)
@@ -149,11 +157,12 @@ DEPENDENCIES
   jdbc-sqlite3
   jquery-rails
   jruby-openssl
+  pry
   rails (~> 3.2.13)
   rake (>= 0.9.2)
   rspec-rails (>= 2.13.1, < 3)
   sass-rails
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3
   strong_parameters

data/gemfiles/4.0.0.gemfile CHANGED

@@ -2,7 +2,7 @@
 source "https://rubygems.org"
-gem "shoulda-context", "~> 1.1.2"
+gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
@@ -16,4 +16,4 @@ gem "rails", "4.0.0"
 gem "sass-rails", "4.0.0"
 gem "bcrypt-ruby", "~> 3.0.0"
-gemspec :path=>"../"
+gemspec :path=>".././"

data/gemfiles/4.0.0.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.0)
       activesupport (>= 3.0.0)
 GEM
@@ -35,9 +35,10 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
+    appraisal (1.0.0.beta2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (4.0.1)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
@@ -50,6 +51,7 @@ GEM
     builder (3.1.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
     cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -70,6 +72,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
+    method_source (0.8.2)
     mime-types (1.25.1)
     minitest (4.7.5)
     mocha (0.14.0)
@@ -79,6 +82,10 @@ GEM
     polyglot (0.3.3)
     protected_attributes (1.0.3)
       activemodel (>= 4.0.0, < 5.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -97,7 +104,7 @@ GEM
       activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -114,7 +121,8 @@ GEM
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    shoulda-context (1.1.6)
+    shoulda-context (1.2.0)
+    slop (3.4.7)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -141,7 +149,7 @@ DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
   activeresource (= 4.0.0)
-  appraisal (~> 0.4)
+  appraisal (~> 1.0.0.beta2)
   aruba
   bcrypt-ruby (~> 3.0.0)
   bourne (~> 1.3)
@@ -151,11 +159,12 @@ DEPENDENCIES
   jquery-rails
   jruby-openssl
   protected_attributes
+  pry
   rails (= 4.0.0)
   rake (>= 0.9.2)
   rspec-rails (>= 2.13.1, < 3)
   sass-rails (= 4.0.0)
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3
   therubyrhino