shoulda-matchers 1.4.2 → 1.5.0

data/.travis.yml

@@ -1,13 +1,12 @@
+script: "bundle exec rake spec cucumber"
+
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ree
   - rbx-18mode
   - jruby
 
-script: "bundle exec rake spec cucumber"
-
 gemfile:
   - gemfiles/3.0.gemfile
   - gemfiles/3.1.gemfile
@@ -17,3 +16,12 @@ matrix:
   allow_failures:
     - rvm: rbx-18mode
     - rvm: jruby
+  exclude:
+    - rvm: rbx-18mode
+      gemfile: gemfiles/3.0.gemfile
+    - rvm: rbx-18mode
+      gemfile: gemfiles/3.1.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/3.0.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/3.1.gemfile

data/Appraisals

@@ -1,15 +1,15 @@
 appraise '3.0' do
-  gem 'rails', '3.0.17'
+  gem 'rails', '~> 3.0.17'
 end
 
 appraise '3.1' do
-  gem 'rails', '3.1.8'
+  gem 'rails', '~> 3.1.8'
   gem 'jquery-rails'
   gem 'sass-rails'
 end
 
 appraise '3.2' do
-  gem 'rails', '3.2.8'
+  gem 'rails', '~> 3.2.8'
   gem 'jquery-rails'
   gem 'sass-rails'
 end

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -1,106 +1,100 @@
 PATH
   remote: .
   specs:
-    shoulda-matchers (1.4.2)
+    shoulda-matchers (1.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
+      bourne (~> 1.2.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)
-    aruba (0.4.6)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.2.0)
-      cucumber (>= 1.0.2)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.2)
-      rack (~> 1.0)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    builder (3.0.0)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
-    cucumber (1.1.9)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.2.1)
+      mocha (= 0.12.7)
+    builder (3.0.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.0.11)
-    gherkin (2.9.3)
+    ffi (1.2.0)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.6)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.18)
-    mocha (0.10.5)
+    mime-types (1.19)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
-    multi_json (1.3.2)
+    multi_json (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdiscount (1.6.8)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -116,19 +110,23 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    shoulda-context (1.0.0)
-    sprockets (2.1.2)
+    shoulda-context (1.0.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    strong_parameters (0.1.5)
+      actionpack (~> 3.1)
+      activemodel (~> 3.1)
+      railties (~> 3.1)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -136,16 +134,17 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4.0)
+  appraisal (~> 0.4)
   aruba
   bundler (~> 1.1)
-  cucumber (~> 1.1.9)
+  cucumber (~> 1.1)
   jdbc-sqlite3
   jruby-openssl
   rails (~> 3.0)
-  rake (~> 0.9.2)
+  rake (>= 0.9.2)
   rspec-rails (~> 2.8.1)
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
+  strong_parameters
   therubyrhino

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, Tammer Saleh, Thoughtbot, Inc.
+Copyright (c) 2006-2013, Tammer Saleh, thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/NEWS.md

@@ -1,10 +1,28 @@
+# HEAD
+
+# v 1.5.0
+* Deprecate the following matchers:
+  * assign_to
+  * respond_with_content_type
+  * query_the_database
+  * validate_format_of
+  * have_sent_email
+  * strong_parameters_matcher
+  * delegate_method
+
+* Use RSpec's native `configure.include` syntax for including matchers into
+  RSpec (#204)
+
+* Do not force minitest loading when test-unit is available (this was fixed
+  before 1.3.0 then reverted in 1.3.0) (#181)
+
 # v1.4.2
-* Added a new delegate_method matcher.
+* Added a new `delegate_method` matcher.
 
 # v1.4.1
 * Fixes an issue when used with Test::Unit on the allow value matcher.
 
-* Fixes an issue with using ensure_inclusion_of(:attr) given an array of true or false values.
+* Fixes an issue with using `ensure_inclusion_of(:attr)` given an array of true or false values.
 
 # v1.4.0
 
@@ -16,7 +34,7 @@
 
 * You can now pass an array to `ensure_exclusion_of` using `in_array`.
 
-* Allow testing of :foreign_key option for has_one relationships using the association matcher.
+* Allow testing of `:foreign_key` option for `has_one` relationships using the association matcher.
 
 * Fix bug where `ensure_length_of` would pass if the given string was too long.
 
@@ -24,7 +42,7 @@
 
 * Test outside values for `ensure_inclusion_of` when given an array.
 
-* Fixed the output of the set_the_flash matcher.
+* Fixed the output of the `set_the_flash` matcher.
 
 # v1.3.0
 

data/README.md

@@ -51,6 +51,8 @@ Matchers to test common patterns:
 
 ```ruby
 describe PostsController, "#show" do
+  it { should permit(:title, :body).for(:create) }
+
   context "for a fictional user" do
     before do
       get :show, :id => 1
@@ -99,5 +101,5 @@ Thank you to all the [contributors](https://github.com/thoughtbot/shoulda-matche
 
 ## License
 
-Shoulda is Copyright © 2006-2012 thoughtbot, inc.
+Shoulda is Copyright © 2006-2013 thoughtbot, inc.
 It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/Rakefile

@@ -15,10 +15,14 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
-desc 'Test the plugin under all supported Rails versions.'
-task :all => ["appraisal:cleanup", "appraisal:install"] do
-  exec('rake appraisal spec cucumber')
+task :default do |t|
+  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+    exec 'rake spec cucumber'
+  else
+    Rake::Task['appraise'].execute
+  end
 end
 
-desc 'Default: run specs and cucumber features'
-task :default => [:all]
+task :appraise => ['appraisal:install'] do |t|
+  exec 'rake appraisal'
+end

data/features/step_definitions/rails_steps.rb

@@ -25,8 +25,8 @@ When 'I generate a new rails application' do
     And I set the "BUNDLE_GEMFILE" environment variable to "Gemfile"
     And I successfully run `bundle install --local`
   }
-  if RUBY_VERSION >= "1.9.3"
-    append_to_gemfile %(gem "rake", "~> 0.9.3.beta.1")
+  if RUBY_VERSION >= '1.9.3'
+    append_to_gemfile %(gem 'rake', '~> 0.9.3.beta.1')
     step %(I successfully run `bundle update rake`)
   end
 end
@@ -52,7 +52,7 @@ When 'I run the rspec generator' do
 end
 
 When 'I configure the application to use rspec-rails' do
-  append_to_gemfile "gem 'rspec-rails', '~> 2.8.1'"
+  append_to_gemfile %q(gem 'rspec-rails', '~> 2.8.1')
   steps %{And I run `bundle install --local`}
 end
 
@@ -66,7 +66,7 @@ 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 "gem 'shoulda-context', '~> 1.0.0'"
+  append_to_gemfile %q(gem 'shoulda-context', '~> 1.0.0')
   steps %{And I run `bundle install --local`}
 end
 
@@ -106,7 +106,7 @@ end
 module FileHelpers
   def append_to(path, contents)
     in_current_dir do
-      File.open(path, "a") do |file|
+      File.open(path, 'a') do |file|
         file.puts
         file.puts contents
       end
@@ -119,9 +119,9 @@ module FileHelpers
 
   def comment_out_gem_in_gemfile(gemname)
     in_current_dir do
-      gemfile = File.read("Gemfile")
+      gemfile = File.read('Gemfile')
       gemfile.sub!(/^(\s*)(gem\s*['"]#{gemname})/, "\\1# \\2")
-      File.open("Gemfile", 'w'){ |file| file.write(gemfile) }
+      File.open('Gemfile', 'w'){ |file| file.write(gemfile) }
     end
   end
 end

data/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'aruba/cucumber'
 
 Before do
-  @aruba_timeout_seconds = 120
+  @aruba_timeout_seconds = 60 * 2
 end

data/gemfiles/3.0.gemfile

@@ -9,6 +9,6 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
-gem "rails", "3.0.17"
+gem "rails", "~> 3.0.17"
 
 gemspec :path=>"../"

data/gemfiles/3.0.gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: /Users/draper/Dropbox/Development/shoulda-matchers
   specs:
-    shoulda-matchers (1.4.1)
+    shoulda-matchers (1.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
+      bourne (~> 1.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -35,7 +35,7 @@ GEM
       activemodel (= 3.0.17)
       activesupport (= 3.0.17)
     activesupport (3.0.17)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (2.0.10)
@@ -43,25 +43,24 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
+    bourne (1.2.1)
+      mocha (= 0.12.7)
     builder (2.1.2)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.1.9)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.2.0)
-    gherkin (2.9.3)
+    ffi (1.3.1)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -69,10 +68,10 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.10.5)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
     polyglot (0.3.3)
-    rack (1.2.5)
+    rack (1.2.7)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -91,7 +90,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.5)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -107,9 +106,12 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    shoulda-context (1.0.1)
-    sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
+    shoulda-context (1.0.2)
+    sqlite3 (1.3.7)
+    strong_parameters (0.1.6)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
     thor (0.14.6)
     treetop (1.4.12)
       polyglot
@@ -122,16 +124,17 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4.0)
+  appraisal (~> 0.4)
   aruba
   bundler (~> 1.1)
-  cucumber (~> 1.1.9)
+  cucumber (~> 1.1)
   jdbc-sqlite3
   jruby-openssl
-  rails (= 3.0.17)
-  rake (~> 0.9.2)
+  rails (~> 3.0.17)
+  rake (>= 0.9.2)
   rspec-rails (~> 2.8.1)
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
+  strong_parameters
   therubyrhino