shoulda-matchers 1.4.2 → 1.5.0

data/gemfiles/3.1.gemfile

@@ -9,7 +9,7 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
-gem "rails", "3.1.8"
+gem "rails", "~> 3.1.8"
 gem "jquery-rails"
 gem "sass-rails"
 

data/gemfiles/3.1.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/
@@ -36,7 +36,7 @@ GEM
       activesupport (= 3.1.8)
     activesupport (3.1.8)
       multi_json (>= 1.0, < 1.3)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (2.2.3)
@@ -44,39 +44,38 @@ 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 (3.0.4)
     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.7.0)
-    ffi (1.2.0)
-    gherkin (2.9.3)
+    ffi (1.3.1)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.1)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.10.5)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
     multi_json (1.2.0)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.3.9)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -100,7 +99,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.5)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -116,19 +115,22 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    sass (3.2.3)
+    sass (3.2.5)
     sass-rails (3.1.6)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.10)
       tilt (~> 1.3.2)
-    shoulda-context (1.0.1)
+    shoulda-context (1.0.2)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
+    sqlite3 (1.3.7)
+    strong_parameters (0.1.6)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.12)
@@ -142,18 +144,19 @@ 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
   jquery-rails
   jruby-openssl
-  rails (= 3.1.8)
-  rake (~> 0.9.2)
+  rails (~> 3.1.8)
+  rake (>= 0.9.2)
   rspec-rails (~> 2.8.1)
   sass-rails
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
+  strong_parameters
   therubyrhino

data/gemfiles/3.2.gemfile

@@ -9,7 +9,7 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
-gem "rails", "3.2.8"
+gem "rails", "~> 3.2.8"
 gem "jquery-rails"
 gem "sass-rails"
 

data/gemfiles/3.2.gemfile.lock

@@ -1,41 +1,41 @@
 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/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    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)
@@ -43,62 +43,61 @@ 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 (3.0.4)
     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.7.0)
-    ffi (1.2.0)
-    gherkin (2.9.3)
+    ffi (1.3.1)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
+    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.19)
-    mocha (0.10.5)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
-    multi_json (1.3.7)
+    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.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    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.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      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, < 2.0)
-    rake (0.9.5)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -114,18 +113,22 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    sass (3.2.3)
-    sass-rails (3.2.5)
+    sass (3.2.5)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    shoulda-context (1.0.1)
-    sprockets (2.1.3)
+    shoulda-context (1.0.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
+    sqlite3 (1.3.7)
+    strong_parameters (0.1.6)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
     thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.12)
@@ -139,18 +142,19 @@ 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
   jquery-rails
   jruby-openssl
-  rails (= 3.2.8)
-  rake (~> 0.9.2)
+  rails (~> 3.2.8)
+  rake (>= 0.9.2)
   rspec-rails (~> 2.8.1)
   sass-rails
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
+  strong_parameters
   therubyrhino

data/lib/shoulda/matchers/action_controller.rb

@@ -8,6 +8,7 @@ require 'shoulda/matchers/action_controller/set_session_matcher'
 require 'shoulda/matchers/action_controller/route_matcher'
 require 'shoulda/matchers/action_controller/redirect_to_matcher'
 require 'shoulda/matchers/action_controller/render_template_matcher'
+require 'shoulda/matchers/action_controller/strong_parameters_matcher'
 
 module Shoulda
   module Matchers
@@ -16,7 +17,7 @@ module Shoulda
     #
     # This code segment:
     #
-    #   describe UsersController, "on GET to show with a valid id" do
+    #   describe UsersController, 'on GET to show with a valid id' do
     #     before(:each) do
     #       get :show, :id => User.first.to_param
     #     end
@@ -26,7 +27,7 @@ module Shoulda
     #     it { should render_template(:show) }
     #     it { should not_set_the_flash) }
     #
-    #     it "should do something else really cool" do
+    #     it 'does something else really cool' do
     #       assigns[:user].id.should == 1
     #     end
     #   end

data/lib/shoulda/matchers/action_controller/assign_to_matcher.rb

@@ -1,7 +1,8 @@
+require 'active_support/deprecation'
+
 module Shoulda # :nodoc:
   module Matchers
     module ActionController # :nodoc:
-
       # Ensures that the controller assigned to the named instance variable.
       #
       # Options:
@@ -20,9 +21,10 @@ module Shoulda # :nodoc:
       end
 
       class AssignToMatcher # :nodoc:
-        attr_reader :failure_message, :negative_failure_message
+        attr_reader :failure_message_for_should, :failure_message_for_should_not
 
         def initialize(variable)
+          ActiveSupport::Deprecation.warn 'The assign_to matcher is deprecated and will be removed in 2.0'
           @variable    = variable.to_s
           @options = {}
           @options[:check_value] = false
@@ -65,12 +67,12 @@ module Shoulda # :nodoc:
 
         def assigned_value?
           if @controller.instance_variables.map(&:to_s).include?("@#{@variable}")
-            @negative_failure_message =
+            @failure_message_for_should_not =
               "Didn't expect action to assign a value for @#{@variable}, " <<
               "but it was assigned to #{assigned_value.inspect}"
             true
           else
-            @failure_message =
+            @failure_message_for_should =
               "Expected action to assign a value for @#{@variable}"
             false
           end
@@ -79,12 +81,12 @@ module Shoulda # :nodoc:
         def kind_of_expected_class?
           if @options.key?(:expected_class)
             if assigned_value.kind_of?(@options[:expected_class])
-              @negative_failure_message =
+              @failure_message_for_should_not =
                 "Didn't expect action to assign a kind of #{@options[:expected_class]} " <<
                 "for #{@variable}, but got one anyway"
               true
             else
-              @failure_message =
+              @failure_message_for_should =
                 "Expected action to assign a kind of #{@options[:expected_class]} " <<
                 "for #{@variable}, but got #{assigned_value.inspect} " <<
                 "(#{assigned_value.class.name})"
@@ -98,12 +100,12 @@ module Shoulda # :nodoc:
         def equal_to_expected_value?
           if @options[:check_value]
             if @options[:expected_value] == assigned_value
-              @negative_failure_message =
+              @failure_message_for_should_not =
                 "Didn't expect action to assign #{@options[:expected_value].inspect} " <<
                 "for #{@variable}, but got it anyway"
               true
             else
-              @failure_message =
+              @failure_message_for_should =
                 "Expected action to assign #{@options[:expected_value].inspect} " <<
                 "for #{@variable}, but got #{assigned_value.inspect}"
               false

data/lib/shoulda/matchers/action_controller/filter_param_matcher.rb

@@ -1,7 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
     module ActionController # :nodoc:
-
       # Ensures that filter_parameter_logging is set for the specified key.
       #
       # Example:
@@ -17,15 +16,14 @@ module Shoulda # :nodoc:
         end
 
         def matches?(controller)
-          @controller = controller
           filters_key?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{@key} to be filtered; filtered keys: #{filtered_keys.join(', ')}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{@key} to be filtered"
         end