shoulda-matchers 2.5.0 → 2.6.0

data/spec/spec_helper.rb

@@ -16,6 +16,10 @@ $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 Dir[ File.join(PROJECT_ROOT, 'spec/support/**/*.rb') ].each { |file| require file }
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.mock_with :mocha
   config.include Shoulda::Matchers::ActionController,
                  example_group: { file_path: /action_controller/ }

data/spec/support/activemodel_helpers.rb

@@ -1,6 +1,6 @@
 module ActiveModelHelpers
   def custom_validation(&block)
-    define_model(:example, :attr => :integer) do
+    define_model(:example, attr: :integer) do
       validate :custom_validation
 
       define_method(:custom_validation, &block)
@@ -8,7 +8,7 @@ module ActiveModelHelpers
   end
 
   def validating_format(options)
-    define_model :example, :attr => :string do
+    define_model :example, attr: :string do
       validates_format_of :attr, options
     end.new
   end

data/spec/support/capture_helpers.rb

@@ -0,0 +1,19 @@
+module Kernel
+  unless method_defined?(:capture)
+    def capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
+    end
+  end
+end

data/spec/support/controller_builder.rb

@@ -21,10 +21,10 @@ module ControllerBuilder
     end
   end
 
-  def build_response(opts = {}, &block)
+  def build_fake_response(opts = {}, &block)
     action = opts[:action] || 'example'
     partial = opts[:partial] || '_partial'
-    block ||= lambda { render :nothing => true }
+    block ||= lambda { render nothing: true }
     controller_class = define_controller('Examples') do
       layout false
       define_method(action, &block)
@@ -32,7 +32,7 @@ module ControllerBuilder
     controller_class.view_paths = [ $test_app.temp_views_dir_path ]
 
     define_routes do
-      get 'examples', :to => "examples##{action}"
+      get 'examples', to: "examples##{action}"
     end
 
     create_view("examples/#{action}.html.erb", 'action')
@@ -58,6 +58,25 @@ module ControllerBuilder
     $test_app.create_temp_view(path, contents)
   end
 
+  def controller_for_resource_with_strong_parameters(options = {}, &block)
+    define_model "User"
+    controller_class = define_controller "Users" do
+      define_method options.fetch(:action) do
+        @user = User.create(user_params)
+        render nothing: true
+      end
+
+      private
+      define_method :user_params, &block
+    end
+
+    setup_rails_controller_test(controller_class)
+
+    define_routes { resources :users }
+
+    controller_class
+  end
+
   private
 
   def delete_temporary_views

data/spec/support/fail_with_message_including_matcher.rb

@@ -0,0 +1,33 @@
+RSpec::Matchers.define :fail_with_message_including do |expected|
+  match do |block|
+    @actual = nil
+
+    begin
+      block.call
+    rescue RSpec::Expectations::ExpectationNotMetError => ex
+      @actual = ex.message
+    end
+
+    @actual && @actual.include?(expected)
+  end
+
+  failure_message_for_should do
+    msg = "Expectation should have failed with message including '#{expected}'"
+
+    if @actual
+      msg << ", actually failed with '#{@actual}'"
+    else
+      msg << ", but did not fail."
+    end
+
+    msg
+  end
+
+  failure_message_for_should_not do
+    msg  = "Expectation should not have failed with message including '#{expected}'"
+    msg << ", but did."
+
+    msg
+  end
+
+end

data/spec/support/model_builder.rb

@@ -59,7 +59,7 @@ module ModelBuilder
 
     if columns.key?(:id) && columns[:id] == false
       columns.delete(:id)
-      create_table(table_name, :id => false, &table_block)
+      create_table(table_name, id: false, &table_block)
     else
       create_table(table_name, &table_block)
     end

data/spec/support/shared_examples/numerical_submatcher.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+shared_examples 'a numerical submatcher' do
+  it 'implements the with_message method' do
+    expect(subject).to respond_to(:with_message).with(1).arguments
+  end
+
+  it 'implements the matches? method' do
+    expect(subject).to respond_to(:matches?).with(1).arguments
+  end
+
+  it 'implements the failure_message method' do
+    expect(subject).to respond_to(:failure_message).with(0).arguments
+  end
+
+  it 'implements the failure_message_when_negated method' do
+    expect(subject).to respond_to(:failure_message_when_negated).with(0).arguments
+  end
+end

data/spec/support/shared_examples/numerical_type_submatcher.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+shared_examples 'a numerical type submatcher' do
+  it 'implements the allowed_type method' do
+    expect(subject).to respond_to(:allowed_type).with(0).arguments
+    expect { subject.allowed_type }.not_to raise_error
+  end
+
+  it 'implements the diff_to_compare' do
+    expect(subject).to respond_to(:diff_to_compare).with(0).arguments
+    expect { subject.diff_to_compare }.not_to raise_error
+  end
+
+  it 'returns itself when given a message' do
+    expect(subject.with_message('some message')).to eq subject
+  end
+end

data/spec/support/test_application.rb

@@ -56,9 +56,32 @@ class TestApplication
   end
 
   def generate
+    rails_new
+    fix_available_locales_warning
+  end
+
+  def rails_new
     `rails new #{ROOT_DIR} --skip-bundle`
   end
 
+  def fix_available_locales_warning
+    # See here for more on this:
+    # http://stackoverflow.com/questions/20361428/rails-i18n-validation-deprecation-warning
+
+    filename = File.join(ROOT_DIR, 'config/application.rb')
+
+    lines = File.read(filename).split("\n")
+    lines.insert(-3, <<EOT)
+if I18n.respond_to?(:enforce_available_locales=)
+  I18n.enforce_available_locales = false
+end
+EOT
+
+    File.open(filename, 'w') do |f|
+      f.write(lines.join("\n"))
+    end
+  end
+
   def load_environment
     require environment_file_path
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Tammer Saleh
@@ -13,53 +14,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -67,6 +91,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,6 +99,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -81,6 +107,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,6 +115,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,6 +123,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,6 +131,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,6 +139,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,22 +147,25 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
     - - <
@@ -140,8 +174,9 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
     - - <
@@ -176,9 +211,12 @@ files:
 - gemfiles/4.0.0.gemfile.lock
 - gemfiles/4.0.1.gemfile
 - gemfiles/4.0.1.gemfile.lock
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
 - lib/shoulda-matchers.rb
 - lib/shoulda/matchers.rb
 - lib/shoulda/matchers/action_controller.rb
+- lib/shoulda/matchers/action_controller/callback_matcher.rb
 - lib/shoulda/matchers/action_controller/filter_param_matcher.rb
 - lib/shoulda/matchers/action_controller/redirect_to_matcher.rb
 - lib/shoulda/matchers/action_controller/render_template_matcher.rb
@@ -189,6 +227,7 @@ files:
 - lib/shoulda/matchers/action_controller/route_params.rb
 - lib/shoulda/matchers/action_controller/set_session_matcher.rb
 - lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
+- lib/shoulda/matchers/action_controller/strong_parameters_matcher.rb
 - lib/shoulda/matchers/active_model.rb
 - lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
@@ -201,7 +240,9 @@ files:
 - lib/shoulda/matchers/active_model/have_secure_password_matcher.rb
 - lib/shoulda/matchers/active_model/helpers.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/comparison_matcher.rb
-- lib/shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher.rb
+- lib/shoulda/matchers/active_model/numericality_matchers/even_number_matcher.rb
+- lib/shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher.rb
+- lib/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher.rb
 - lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
@@ -216,6 +257,7 @@ files:
 - lib/shoulda/matchers/active_record/association_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/counter_cache_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/dependent_matcher.rb
+- lib/shoulda/matchers/active_record/association_matchers/inverse_of_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb
 - lib/shoulda/matchers/active_record/association_matchers/model_reflector.rb
 - lib/shoulda/matchers/active_record/association_matchers/option_verifier.rb
@@ -227,11 +269,18 @@ files:
 - lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb
 - lib/shoulda/matchers/active_record/serialize_matcher.rb
 - lib/shoulda/matchers/assertion_error.rb
+- lib/shoulda/matchers/error.rb
+- lib/shoulda/matchers/independent.rb
+- lib/shoulda/matchers/independent/delegate_matcher.rb
+- lib/shoulda/matchers/independent/delegate_matcher/stubbed_target.rb
+- lib/shoulda/matchers/integrations/nunit_test_case_detection.rb
 - lib/shoulda/matchers/integrations/rspec.rb
 - lib/shoulda/matchers/integrations/test_unit.rb
 - lib/shoulda/matchers/rails_shim.rb
 - lib/shoulda/matchers/version.rb
+- lib/shoulda/matchers/warn.rb
 - shoulda-matchers.gemspec
+- spec/shoulda/matchers/action_controller/callback_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb
@@ -242,6 +291,7 @@ files:
 - spec/shoulda/matchers/action_controller/route_params_spec.rb
 - spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/strong_parameters_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
@@ -252,7 +302,8 @@ files:
 - spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/shoulda/matchers/active_model/helpers_spec.rb
 - spec/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb
-- spec/shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/even_number_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher_spec.rb
 - spec/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
@@ -268,47 +319,57 @@ files:
 - spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
 - spec/shoulda/matchers/active_record/serialize_matcher_spec.rb
+- spec/shoulda/matchers/independent/delegate_matcher/stubbed_target_spec.rb
+- spec/shoulda/matchers/independent/delegate_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
 - spec/support/active_resource_builder.rb
 - spec/support/activemodel_helpers.rb
+- spec/support/capture_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
+- spec/support/fail_with_message_including_matcher.rb
 - spec/support/fail_with_message_matcher.rb
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
 - spec/support/rails_versions.rb
-- spec/support/shared_examples/numerical_submatcher_spec.rb
+- spec/support/shared_examples/numerical_submatcher.rb
+- spec/support/shared_examples/numerical_type_submatcher.rb
 - spec/support/test_application.rb
 homepage: http://thoughtbot.com/community/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3861964174441044757
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Making tests easy on the fingers and eyes
 test_files:
 - features/rails_integration.feature
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
+- spec/shoulda/matchers/action_controller/callback_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb
@@ -319,6 +380,7 @@ test_files:
 - spec/shoulda/matchers/action_controller/route_params_spec.rb
 - spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/strong_parameters_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
@@ -329,7 +391,8 @@ test_files:
 - spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/shoulda/matchers/active_model/helpers_spec.rb
 - spec/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb
-- spec/shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/even_number_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher_spec.rb
 - spec/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
@@ -345,16 +408,21 @@ test_files:
 - spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
 - spec/shoulda/matchers/active_record/serialize_matcher_spec.rb
+- spec/shoulda/matchers/independent/delegate_matcher/stubbed_target_spec.rb
+- spec/shoulda/matchers/independent/delegate_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
 - spec/support/active_resource_builder.rb
 - spec/support/activemodel_helpers.rb
+- spec/support/capture_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
+- spec/support/fail_with_message_including_matcher.rb
 - spec/support/fail_with_message_matcher.rb
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
 - spec/support/rails_versions.rb
-- spec/support/shared_examples/numerical_submatcher_spec.rb
+- spec/support/shared_examples/numerical_submatcher.rb
+- spec/support/shared_examples/numerical_type_submatcher.rb
 - spec/support/test_application.rb