shoulda-matchers 2.6.1 → 2.6.2

data/gemfiles/4.1.gemfile

@@ -2,6 +2,18 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 1.0.0.beta2"
+gem "aruba"
+gem "bourne", "~> 1.3"
+gem "bundler", "~> 1.1"
+gem "cucumber", "~> 1.1"
+gem "pry"
+gem "rake", ">= 0.9.2"
+gem "rspec-rails", ">= 2.13.1", "< 3"
+gem "yard"
+gem "redcarpet"
+gem "pygments.rb"
+gem "watchr"
 gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
@@ -9,11 +21,18 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
+gem "spring-commands-rspec"
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
 gem "jquery-rails"
+gem "turbolinks"
 gem "activeresource", "4.0.0"
 gem "rails", "~> 4.1.0"
-gem "sass-rails", "4.0.3"
-gem "bcrypt-ruby", "~> 3.1.2"
+gem "jbuilder", "~> 2.0"
+gem "sass-rails", "~> 4.0.3"
+gem "sdoc", "~> 0.4.0"
+gem "bcrypt", "~> 3.1.7"
 gem "protected_attributes", "~> 1.0.6"
+gem "spring"
 
 gemspec :path=>".././"

data/gemfiles/4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .././
   specs:
-    shoulda-matchers (2.6.1)
+    shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
 
 GEM
@@ -46,13 +46,20 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.7)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.2.2)
     childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
     cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -61,11 +68,15 @@ GEM
       multi_test (>= 0.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
+    execjs (2.0.2)
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
     i18n (0.6.9)
+    jbuilder (2.0.6)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -82,12 +93,16 @@ GEM
     multi_json (1.9.2)
     multi_test (0.0.3)
     polyglot (0.3.4)
+    posix-spawn (0.3.8)
     protected_attributes (1.0.7)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pygments.rb (0.6.0)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -109,6 +124,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.2.2)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    redcarpet (3.1.2)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -127,8 +145,14 @@ GEM
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
     shoulda-context (1.2.0)
     slop (3.4.7)
+    spring (1.1.2)
+    spring-commands-rspec (1.0.2)
+      spring (>= 0.9.1)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -145,8 +169,16 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    turbolinks (2.2.2)
+      coffee-rails
     tzinfo (1.1.0)
       thread_safe (~> 0.1)
+    uglifier (2.5.0)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    watchr (0.7)
+    yajl-ruby (1.1.0)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
@@ -157,20 +189,31 @@ DEPENDENCIES
   activeresource (= 4.0.0)
   appraisal (~> 1.0.0.beta2)
   aruba
-  bcrypt-ruby (~> 3.1.2)
+  bcrypt (~> 3.1.7)
   bourne (~> 1.3)
   bundler (~> 1.1)
+  coffee-rails (~> 4.0.0)
   cucumber (~> 1.1)
+  jbuilder (~> 2.0)
   jdbc-sqlite3
   jquery-rails
   jruby-openssl
   protected_attributes (~> 1.0.6)
   pry
+  pygments.rb
   rails (~> 4.1.0)
   rake (>= 0.9.2)
+  redcarpet
   rspec-rails (>= 2.13.1, < 3)
-  sass-rails (= 4.0.3)
+  sass-rails (~> 4.0.3)
+  sdoc (~> 0.4.0)
   shoulda-context (~> 1.2.0)
   shoulda-matchers!
+  spring
+  spring-commands-rspec
   sqlite3
   therubyrhino
+  turbolinks
+  uglifier (>= 1.3.0)
+  watchr
+  yard

data/lib/shoulda/matchers/action_controller.rb

@@ -13,26 +13,6 @@ require 'shoulda/matchers/action_controller/strong_parameters_matcher'
 
 module Shoulda
   module Matchers
-    # By using the matchers you can quickly and easily create concise and
-    # easy to read test suites.
-    #
-    # This code segment:
-    #
-    #   describe UsersController, 'on GET to show with a valid id' do
-    #     before(:each) do
-    #       get :show, id: User.first.to_param
-    #     end
-    #
-    #     it { should respond_with(:success) }
-    #     it { should render_template(:show) }
-    #     it { should not_set_the_flash) }
-    #
-    #     it 'does something else really cool' do
-    #       expect(assigns[:user].id).to eq 1
-    #     end
-    #   end
-    #
-    # Would produce 5 tests for the show action
     module ActionController
     end
   end

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

@@ -1,67 +1,158 @@
-module Shoulda # :nodoc:
+module Shoulda
   module Matchers
-    module ActionController # :nodoc:
-      # Ensure a controller uses a given before_filter
+    module ActionController
+      # The `use_before_filter` matcher is used to test that a before_filter
+      # callback is defined within your controller.
       #
-      # Example:
+      #     class UsersController < ApplicationController
+      #       before_filter :authenticate_user!
+      #     end
+      #
+      #     # RSpec
+      #     describe UsersController do
+      #       it { should use_before_filter(:authenticate_user!) }
+      #       it { should_not use_before_filter(:prevent_ssl) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class UsersControllerTest < ActionController::TestCase
+      #       should use_before_filter(:authenticate_user!)
+      #       should_not use_before_filter(:prevent_ssl)
+      #     end
+      #
+      # @return [CallbackMatcher]
       #
-      #   it { should use_before_filter(:authenticate_user!) }
-      #   it { should_not use_before_filter(:prevent_ssl) }
       def use_before_filter(callback)
         CallbackMatcher.new(callback, :before, :filter)
       end
 
-      # Ensure a controller uses a given before_filter
+      # The `use_after_filter` matcher is used to test that an after_filter
+      # callback is defined within your controller.
+      #
+      #     class IssuesController < ApplicationController
+      #       after_filter :log_activity
+      #     end
+      #
+      #     # RSpec
+      #     describe IssuesController do
+      #       it { should use_after_filter(:log_activity) }
+      #       it { should_not use_after_filter(:destroy_user) }
+      #     end
       #
-      # Example:
+      #     # Test::Unit
+      #     class IssuesControllerTest < ActionController::TestCase
+      #       should use_after_filter(:log_activity)
+      #       should_not use_after_filter(:destroy_user)
+      #     end
+      #
+      # @return [CallbackMatcher]
       #
-      #   it { should use_after_filter(:log_activity) }
-      #   it { should_not use_after_filter(:destroy_user) }
       def use_after_filter(callback)
         CallbackMatcher.new(callback, :after, :filter)
       end
 
-      # Ensure a controller uses a given before_action
+      # The `use_before_action` matcher is used to test that a before_action
+      # callback is defined within your controller.
+      #
+      #     class UsersController < ApplicationController
+      #       before_action :authenticate_user!
+      #     end
+      #
+      #     # RSpec
+      #     describe UsersController do
+      #       it { should use_before_action(:authenticate_user!) }
+      #       it { should_not use_before_action(:prevent_ssl) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class UsersControllerTest < ActionController::TestCase
+      #       should use_before_action(:authenticate_user!)
+      #       should_not use_before_action(:prevent_ssl)
+      #     end
       #
-      # Example:
+      # @return [CallbackMatcher]
       #
-      #   it { should use_before_action(:authenticate_user!) }
-      #   it { should_not use_before_action(:prevent_ssl) }
       def use_before_action(callback)
         CallbackMatcher.new(callback, :before, :action)
       end
 
-      # Ensure a controller uses a given after_action
+      # The `use_after_action` matcher is used to test that an after_action
+      # callback is defined within your controller.
       #
-      # Example:
+      #     class IssuesController < ApplicationController
+      #       after_action :log_activity
+      #     end
+      #
+      #     # RSpec
+      #     describe IssuesController do
+      #       it { should use_after_action(:log_activity) }
+      #       it { should_not use_after_action(:destroy_user) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class IssuesControllerTest < ActionController::TestCase
+      #       should use_after_action(:log_activity)
+      #       should_not use_after_action(:destroy_user)
+      #     end
+      #
+      # @return [CallbackMatcher]
       #
-      #   it { should use_after_action(:log_activity) }
-      #   it { should_not use_after_action(:destroy_user) }
       def use_after_action(callback)
         CallbackMatcher.new(callback, :after, :action)
       end
 
-      # Ensure a controller uses a given around_filter
+      # The `use_around_filter` matcher is used to test that an around_filter
+      # callback is defined within your controller.
+      #
+      #     class ChangesController < ApplicationController
+      #       around_filter :wrap_in_transaction
+      #     end
+      #
+      #     # RSpec
+      #     describe ChangesController do
+      #       it { should use_around_filter(:wrap_in_transaction) }
+      #       it { should_not use_around_filter(:save_view_context) }
+      #     end
       #
-      # Example:
+      #     # Test::Unit
+      #     class ChangesControllerTest < ActionController::TestCase
+      #       should use_around_filter(:wrap_in_transaction)
+      #       should_not use_around_filter(:save_view_context)
+      #     end
+      #
+      # @return [CallbackMatcher]
       #
-      #   it { should use_around_filter(:log_activity) }
-      #   it { should_not use_around_filter(:destroy_user) }
       def use_around_filter(callback)
         CallbackMatcher.new(callback, :around, :filter)
       end
 
-      # Ensure a controller uses a given around_action
+      # The `use_around_action` matcher is used to test that an around_action
+      # callback is defined within your controller.
+      #
+      #     class ChangesController < ApplicationController
+      #       around_action :wrap_in_transaction
+      #     end
+      #
+      #     # RSpec
+      #     describe ChangesController do
+      #       it { should use_around_action(:wrap_in_transaction) }
+      #       it { should_not use_around_action(:save_view_context) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class ChangesControllerTest < ActionController::TestCase
+      #       should use_around_action(:wrap_in_transaction)
+      #       should_not use_around_action(:save_view_context)
+      #     end
       #
-      # Example:
+      # @return [CallbackMatcher]
       #
-      #   it { should use_around_action(:log_activity) }
-      #   it { should_not use_around_action(:destroy_user) }
       def use_around_action(callback)
         CallbackMatcher.new(callback, :around, :action)
       end
 
-      class CallbackMatcher # :nodoc:
+      # @private
+      class CallbackMatcher
         def initialize(method_name, kind, callback_type)
           @method_name = method_name
           @kind = kind
@@ -89,7 +180,7 @@ module Shoulda # :nodoc:
           "have :#{method_name} as a #{kind}_#{callback_type}"
         end
 
-        private
+        protected
 
         def callbacks
           controller_class._process_action_callbacks.select do |callback|

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

@@ -1,16 +1,32 @@
-module Shoulda # :nodoc:
+module Shoulda
   module Matchers
-    module ActionController # :nodoc:
-      # Ensures that filter_parameter_logging is set for the specified key.
+    module ActionController
+      # The `filter_param` matcher is used to test parameter filtering
+      # configuration. Specifically, it asserts that the given parameter is
+      # present in `config.filter_parameters`.
       #
-      # Example:
+      #     class MyApplication < Rails::Application
+      #       config.filter_parameters << :secret_key
+      #     end
+      #
+      #     # RSpec
+      #     describe ApplicationController do
+      #       it { should filter_param(:secret_key) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class ApplicationControllerTest < ActionController::TestCase
+      #       should filter_param(:secret_key)
+      #     end
+      #
+      # @return [FilterParamMatcher]
       #
-      #   it { should filter_param(:password) }
       def filter_param(key)
         FilterParamMatcher.new(key)
       end
 
-      class FilterParamMatcher # :nodoc:
+      # @private
+      class FilterParamMatcher
         def initialize(key)
           @key = key.to_s
         end

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

@@ -1,31 +1,64 @@
-module Shoulda # :nodoc:
+module Shoulda
   module Matchers
-    module ActionController # :nodoc:
-      # Ensures a controller redirected to the given url.
+    module ActionController
+      # The `redirect_to` matcher tests that an action redirects to a certain
+      # location. In a test suite using RSpec, it is very similar to
+      # rspec-rails's `redirect_to` matcher. In a test suite using Test::Unit /
+      # Shoulda, it provides a more expressive syntax over
+      # `assert_redirected_to`.
       #
-      # Example:
+      #     class PostsController < ApplicationController
+      #       def show
+      #         redirect_to :index
+      #       end
+      #     end
+      #
+      #     # RSpec
+      #     describe PostsController do
+      #       describe 'GET #show' do
+      #         before { get :show }
+      #
+      #         it { should redirect_to(posts_path) }
+      #         it { should redirect_to(action: :index) }
+      #       end
+      #     end
+      #
+      #     # Test::Unit
+      #     class PostsControllerTest < ActionController::TestCase
+      #       context 'GET #show' do
+      #         setup { get :show }
+      #
+      #         should redirect_to { posts_path }
+      #         should redirect_to(action: :index)
+      #       end
+      #     end
+      #
+      # @return [RedirectToMatcher]
       #
-      #   it { should redirect_to('http://somewhere.com')  }
-      #   it { should redirect_to(users_path)  }
       def redirect_to(url_or_description, &block)
         RedirectToMatcher.new(url_or_description, self, &block)
       end
 
-      class RedirectToMatcher # :nodoc:
+      # @private
+      class RedirectToMatcher
         attr_reader :failure_message, :failure_message_when_negated
 
         alias failure_message_for_should failure_message
         alias failure_message_for_should_not failure_message_when_negated
 
         def initialize(url_or_description, context, &block)
+          @url_block = nil
+          @url = nil
+          @context = context
+          @failure_message = nil
+          @failure_message_when_negated = nil
+
           if block
             @url_block = block
             @location = url_or_description
           else
-            @url = url_or_description
-            @location = @url
+            @location = @url = url_or_description
           end
-          @context = context
         end
 
         def in_context(context)