shoulda-matchers 2.3.0 → 2.4.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a8d6dec5056a7af853da41e6e4ae08288de002a7
+  data.tar.gz: ea8954413360434e6ab48488e52f5783398a6e06
+SHA512:
+  metadata.gz: fc71bcd764ed3b1810bcdd5356bda25df166d18ad2d2d2189a6a8d4f7a2795918f477ac6f59bb7ff01fcbc36091bd34c786612247d77bda0475c4f6c6b056a21
+  data.tar.gz: d76951b81ac17fd5449f1b0e15129805811c581ece8b0ec46a9bdc691dd07a51351f965a9c8cfbb9d71a9691c86fc3ff2977441edb13e027c2cac0ddbc4c8c99

data/Appraisals

@@ -1,12 +1,14 @@
 if RUBY_VERSION < '2.0'
   appraise '3.0' do
     gem 'rails', '~> 3.0.17'
+    gem 'strong_parameters'
   end
 
   appraise '3.1' do
     gem 'rails', '~> 3.1.8'
     gem 'jquery-rails'
     gem 'sass-rails'
+    gem 'strong_parameters'
   end
 end
 
@@ -14,4 +16,14 @@ appraise '3.2' do
   gem 'rails', '~> 3.2.13'
   gem 'jquery-rails'
   gem 'sass-rails'
+  gem 'strong_parameters'
+end
+
+appraise '4.0' do
+  gem 'rails', '4.0.0'
+  gem 'jquery-rails'
+  gem 'sass-rails', '~> 4.0.0'
+
+  # Test suite makes heavy use of attr_accessible
+  gem 'protected_attributes'
 end

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 # For test Rails application
-gem 'shoulda-context', '~> 1.0.0'
+gem 'shoulda-context', '~> 1.1.2'
 gem 'sqlite3', :platform => :ruby
 
 # Can't wrap in platform :jruby do...end block because appraisal doesn't support

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoulda-matchers (2.3.0)
+    shoulda-matchers (2.4.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -99,25 +99,21 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.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)
-    shoulda-context (1.0.1)
+    shoulda-context (1.1.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    strong_parameters (0.1.5)
-      actionpack (~> 3.1)
-      activemodel (~> 3.1)
-      railties (~> 3.1)
     thor (0.17.0)
     tilt (1.3.6)
     treetop (1.4.12)
@@ -140,9 +136,8 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.0)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
-  shoulda-context (~> 1.0.0)
+  rspec-rails (>= 2.13.1, < 3)
+  shoulda-context (~> 1.1.2)
   shoulda-matchers!
   sqlite3
-  strong_parameters
   therubyrhino

data/NEWS.md

@@ -1,5 +1,11 @@
 # HEAD
 
+* shoulda-matchers is now fully compatible with Rails 4.
+
+* When not using RSpec, shoulda-matchers is now auto-included into
+  ActiveSupport::TestCase instead of Test::Unit::TestCase (in Rails 4
+  the former no longer inherits from the latter).
+
 # v 2.3.0
 
 * Fix a bug in `ensure_inclusion_of` that would cause issues with using

data/features/rails_integration.feature

@@ -55,8 +55,7 @@ Feature: integrate with Rails
       """
     When I set the "TESTOPTS" environment variable to "-v"
     When I successfully run `bundle exec rake test --trace`
-    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
-    And the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
+    Then the output should indicate that 1 unit and 1 functional test were run
     And the output should contain "User should require name to be set"
     And the output should contain "should respond with 200"
 
@@ -111,4 +110,4 @@ Feature: integrate with Rails
       """
     When I successfully run `bundle exec rake spec test:functionals SPEC_OPTS=-fs --trace`
     Then the output should contain "1 example, 0 failures"
-    And the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
+    Then the output should indicate that 1 test was run

data/features/step_definitions/rails_steps.rb

@@ -16,14 +16,14 @@ end
 
 When 'I generate a new rails application' do
   steps %{
-    When I run `rails new #{APP_NAME}`
+    When I run `bundle exec rails new #{APP_NAME} --skip-bundle`
     And I cd to "#{APP_NAME}"
     And I comment out the gem "turn" from the Gemfile
     And I comment out the gem "coffee-rails" from the Gemfile
     And I comment out the gem "uglifier" from the Gemfile
     And I reset Bundler environment variables
     And I set the "BUNDLE_GEMFILE" environment variable to "Gemfile"
-    And I successfully run `bundle install --local`
+    And I install gems
   }
 
   if RUBY_VERSION >= '1.9.3'
@@ -34,7 +34,7 @@ end
 
 When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
   append_to_gemfile "gem '#{name}', :path => '#{PROJECT_ROOT}'"
-  steps %{And I run `bundle install --local`}
+  steps %{And I install gems}
 end
 
 When /^I configure the application to use "([^\"]+)" from this project in test and development$/ do |name|
@@ -43,7 +43,7 @@ When /^I configure the application to use "([^\"]+)" from this project in test a
     gem '#{name}', :path => '#{PROJECT_ROOT}'
   end
   GEMFILE
-  steps %{And I run `bundle install --local`}
+  steps %{And I install gems}
 end
 
 When 'I run the rspec generator' do
@@ -54,7 +54,7 @@ end
 
 When 'I configure the application to use rspec-rails' do
   append_to_gemfile %q(gem 'rspec-rails', '~> 2.13')
-  steps %{And I run `bundle install --local`}
+  steps %{And I install gems}
 end
 
 When 'I configure the application to use rspec-rails in test and development' do
@@ -63,12 +63,12 @@ When 'I configure the application to use rspec-rails in test and development' do
     gem 'rspec-rails', '~> 2.13'
   end
   GEMFILE
-  steps %{And I run `bundle install --local`}
+  steps %{And I install gems}
 end
 
 When 'I configure the application to use shoulda-context' do
   append_to_gemfile %q(gem 'shoulda-context', '~> 1.0')
-  steps %{And I run `bundle install --local`}
+  steps %{And I install gems}
 end
 
 When /^I set the "([^"]*)" environment variable to "([^"]*)"$/ do |key, value|
@@ -80,7 +80,7 @@ When 'I configure a wildcard route' do
     When I write to "config/routes.rb" with:
     """
     Rails.application.routes.draw do
-      match ':controller(/:action(/:id(.:format)))'
+      get ':controller(/:action(/:id(.:format)))'
     end
     """
   }
@@ -104,6 +104,33 @@ When /^I comment out the gem "([^"]*)" from the Gemfile$/ do |gemname|
   comment_out_gem_in_gemfile(gemname)
 end
 
+When /^I install gems$/ do
+  steps %{When I run `bundle install --local`}
+end
+
+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"}
+  else
+    steps %{Then the output should contain "#{number} tests, #{number} assertions, 0 failures, 0 errors"}
+  end
+end
+
+Then /^the output should indicate that (\d+) unit and (\d+) functional tests? were run/ do |n1, n2|
+  n1 = n1.to_i
+  n2 = n2.to_i
+  total = n1.to_i + n2.to_i
+  # 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"}
+  else
+    steps %{Then the output should match /#{n1} tests, #{n1} assertions, 0 failures, 0 errors.+#{n2} tests, #{n2} assertions, 0 failures, 0 errors/}
+  end
+end
+
 module FileHelpers
   def append_to(path, contents)
     in_current_dir do
@@ -125,6 +152,11 @@ module FileHelpers
       File.open('Gemfile', 'w'){ |file| file.write(gemfile) }
     end
   end
+
+  def rails_4?
+    match = ORIGINAL_BUNDLE_VARS['BUNDLE_GEMFILE'].match(/(\d)\.\d\.gemfile$/)
+    match.captures[0] == '4'
+  end
 end
 
 World(FileHelpers)

data/gemfiles/3.0.gemfile

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

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.3.0)
+    shoulda-matchers (2.4.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -96,15 +96,15 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.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)
-    shoulda-context (1.0.2)
+    shoulda-context (1.1.4)
     sqlite3 (1.3.7)
     strong_parameters (0.2.0)
       actionpack (~> 3.0)
@@ -131,8 +131,8 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.0.17)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
-  shoulda-context (~> 1.0.0)
+  rspec-rails (>= 2.13.1, < 3)
+  shoulda-context (~> 1.1.2)
   shoulda-matchers!
   sqlite3
   strong_parameters

data/gemfiles/3.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "shoulda-context", "~> 1.0.0"
+gem "shoulda-context", "~> 1.1.2"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
@@ -12,5 +12,6 @@ gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.1.8"
 gem "jquery-rails"
 gem "sass-rails"
+gem "strong_parameters"
 
 gemspec :path=>"../"

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.3.0)
+    shoulda-matchers (2.4.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -104,8 +104,8 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -118,7 +118,7 @@ GEM
       railties (~> 3.1.0)
       sass (>= 3.1.10)
       tilt (~> 1.3.2)
-    shoulda-context (1.0.2)
+    shoulda-context (1.1.4)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -151,9 +151,9 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.1.8)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
+  rspec-rails (>= 2.13.1, < 3)
   sass-rails
-  shoulda-context (~> 1.0.0)
+  shoulda-context (~> 1.1.2)
   shoulda-matchers!
   sqlite3
   strong_parameters

data/gemfiles/3.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "shoulda-context", "~> 1.0.0"
+gem "shoulda-context", "~> 1.1.2"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
@@ -12,5 +12,6 @@ gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.2.13"
 gem "jquery-rails"
 gem "sass-rails"
+gem "strong_parameters"
 
 gemspec :path=>"../"

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.3.0)
+    shoulda-matchers (2.4.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -102,8 +102,8 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -115,7 +115,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    shoulda-context (1.0.2)
+    shoulda-context (1.1.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -149,9 +149,9 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.2.13)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
+  rspec-rails (>= 2.13.1, < 3)
   sass-rails
-  shoulda-context (~> 1.0.0)
+  shoulda-context (~> 1.1.2)
   shoulda-matchers!
   sqlite3
   strong_parameters

data/gemfiles/4.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "shoulda-context", "~> 1.1.2"
+gem "sqlite3", :platform=>:ruby
+gem "activerecord-jdbc-adapter", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "jdbc-sqlite3", :platform=>:jruby
+gem "jruby-openssl", :platform=>:jruby
+gem "therubyrhino", :platform=>:jruby
+gem "rails", "4.0.0"
+gem "jquery-rails"
+gem "sass-rails", "~> 4.0.0"
+gem "protected_attributes"
+
+gemspec :path=>"../"

data/gemfiles/4.0.gemfile.lock

@@ -0,0 +1,152 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-matchers (2.4.0.rc1)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    atomic (1.1.13)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
+    builder (3.1.4)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.6)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    ffi (1.9.0)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    i18n (0.6.5)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.24)
+    minitest (4.7.5)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.7.9)
+    multi_test (0.0.2)
+    polyglot (0.3.3)
+    protected_attributes (1.0.3)
+      activemodel (>= 4.0.0, < 5.0)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sass (3.2.10)
+    sass-rails (4.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0)
+    shoulda-context (1.1.4)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 0.4)
+  aruba
+  bourne (~> 1.3)
+  bundler (~> 1.1)
+  cucumber (~> 1.1)
+  jdbc-sqlite3
+  jquery-rails
+  jruby-openssl
+  protected_attributes
+  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-matchers!
+  sqlite3
+  therubyrhino