shoulda-matchers 2.5.0 → 2.6.0

data/gemfiles/4.0.1.gemfile

@@ -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.1"
 gem "sass-rails", "4.0.1"
 gem "bcrypt-ruby", "~> 3.1.2"
 
-gemspec :path=>"../"
+gemspec :path=>".././"

data/gemfiles/4.0.1.gemfile.lock

@@ -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.5)
       activemodel (>= 4.0.1, < 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.1)
       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, < 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.1.2)
   bourne (~> 1.3)
@@ -151,11 +159,12 @@ DEPENDENCIES
   jquery-rails
   jruby-openssl
   protected_attributes
+  pry
   rails (= 4.0.1)
   rake (>= 0.9.2)
   rspec-rails (>= 2.13.1, < 3)
   sass-rails (= 4.0.1)
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3
   therubyrhino

data/gemfiles/4.1.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "shoulda-context", "~> 1.2.0"
+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 "jquery-rails"
+gem "activeresource", "4.0.0"
+gem "rails", "~> 4.1.0"
+gem "sass-rails", "4.0.3"
+gem "bcrypt-ruby", "~> 3.1.2"
+gem "protected_attributes", "~> 1.0.6"
+
+gemspec :path=>".././"

data/gemfiles/4.1.gemfile.lock

@@ -0,0 +1,176 @@
+PATH
+  remote: .././
+  specs:
+    shoulda-matchers (2.6.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      mail (~> 2.5.4)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activeresource (4.0.0)
+      activemodel (~> 4.0)
+      activesupport (~> 4.0)
+      rails-observers (~> 0.1.1)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.0.beta2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.0)
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bcrypt-ruby (3.1.2)
+    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)
+    cucumber (1.3.10)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.2)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (5.3.2)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.9.2)
+    multi_test (0.0.3)
+    polyglot (0.3.4)
+    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)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.0)
+      actionmailer (= 4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.0)
+      sprockets-rails (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.2)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rspec-rails (2.14.1)
+      actionpack (>= 3.0)
+      activemodel (>= 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.19)
+    sass-rails (4.0.3)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
+    shoulda-context (1.2.0)
+    slop (3.4.7)
+    sprockets (2.11.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  activeresource (= 4.0.0)
+  appraisal (~> 1.0.0.beta2)
+  aruba
+  bcrypt-ruby (~> 3.1.2)
+  bourne (~> 1.3)
+  bundler (~> 1.1)
+  cucumber (~> 1.1)
+  jdbc-sqlite3
+  jquery-rails
+  jruby-openssl
+  protected_attributes (~> 1.0.6)
+  pry
+  rails (~> 4.1.0)
+  rake (>= 0.9.2)
+  rspec-rails (>= 2.13.1, < 3)
+  sass-rails (= 4.0.3)
+  shoulda-context (~> 1.2.0)
+  shoulda-matchers!
+  sqlite3
+  therubyrhino

data/lib/shoulda/matchers.rb

@@ -1,6 +1,22 @@
-require 'shoulda/matchers/version'
 require 'shoulda/matchers/assertion_error'
+require 'shoulda/matchers/error'
 require 'shoulda/matchers/rails_shim'
+require 'shoulda/matchers/warn'
+require 'shoulda/matchers/version'
+
+require 'shoulda/matchers/independent'
+
+if defined?(ActiveModel)
+  require 'shoulda/matchers/active_model'
+end
+
+if defined?(ActiveRecord)
+  require 'shoulda/matchers/active_record'
+end
+
+if defined?(ActionController)
+  require 'shoulda/matchers/action_controller'
+end
 
 if defined?(RSpec)
   require 'shoulda/matchers/integrations/rspec'

data/lib/shoulda/matchers/action_controller.rb

@@ -8,6 +8,8 @@ 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/rescue_from_matcher'
+require 'shoulda/matchers/action_controller/callback_matcher'
+require 'shoulda/matchers/action_controller/strong_parameters_matcher'
 
 module Shoulda
   module Matchers
@@ -18,7 +20,7 @@ module Shoulda
     #
     #   describe UsersController, 'on GET to show with a valid id' do
     #     before(:each) do
-    #       get :show, :id => User.first.to_param
+    #       get :show, id: User.first.to_param
     #     end
     #
     #     it { should respond_with(:success) }
@@ -26,7 +28,7 @@ module Shoulda
     #     it { should not_set_the_flash) }
     #
     #     it 'does something else really cool' do
-    #       assigns[:user].id.should == 1
+    #       expect(assigns[:user].id).to eq 1
     #     end
     #   end
     #

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

@@ -0,0 +1,100 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActionController # :nodoc:
+      # Ensure a controller uses a given before_filter
+      #
+      # Example:
+      #
+      #   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
+      #
+      # Example:
+      #
+      #   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
+      #
+      # Example:
+      #
+      #   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
+      #
+      # Example:
+      #
+      #   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
+      #
+      # Example:
+      #
+      #   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
+      #
+      # Example:
+      #
+      #   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:
+        def initialize(method_name, kind, callback_type)
+          @method_name = method_name
+          @kind = kind
+          @callback_type = callback_type
+        end
+
+        def matches?(subject)
+          @subject = subject
+          callbacks.map(&:filter).include?(method_name)
+        end
+
+        def failure_message
+          "Expected that #{subject.name} would have :#{method_name} as a #{kind}_#{callback_type}"
+        end
+        alias failure_message_for_should failure_message
+
+        def failure_message_when_negated
+          "Expected that #{subject.name} would not have :#{method_name} as a #{kind}_#{callback_type}"
+        end
+        alias failure_message_for_should_not failure_message_when_negated
+
+        def description
+          "have :#{method_name} as a #{kind}_#{callback_type}"
+        end
+
+        private
+
+        def callbacks
+          subject._process_action_callbacks.select { |callback| callback.kind == kind }
+        end
+
+        attr_reader :method_name, :subject, :kind, :callback_type
+      end
+    end
+  end
+end