rspec-expectations 2.13.0 → 2.99.0

data/spec/rspec/matchers/yield_spec.rb

@@ -63,10 +63,87 @@ describe "yield_control matcher" do
       }.to fail_with(/expected given block to yield control/)
     end
 
-    it 'raises an error if it yields multiple times' do
-      expect {
-        expect { |b| [1, 2].each(&b) }.to yield_control
-      }.to raise_error(/not designed.*yields multiple times/)
+    context "with exact count" do
+      it 'fails if the block yields wrong number of times' do
+        expect {
+          expect { |b| [1, 2, 3].each(&b) }.to yield_control.twice
+        }.to fail_with(/expected given block to yield control twice/)
+
+        expect {
+          expect { |b| [1, 2].each(&b) }.to yield_control.exactly(3).times
+        }.to fail_with(/expected given block to yield control 3 times/)
+      end
+
+      it 'passes if the block yields the specified number of times' do
+        expect { |b| [1].each(&b) }.to yield_control.once
+        expect { |b| [1, 2].each(&b) }.to yield_control.twice
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.exactly(3).times
+      end
+    end
+
+    context "with at_least count" do
+      it 'passes if the block yields the given number of times' do
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_least(2).times
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_least(3).times
+      end
+
+      it 'passes if the block yields more times' do
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_least(2).times
+        expect { |b| [1, 2, 3, 4].each(&b) }.to yield_control.at_least(3).times
+      end
+
+      it 'allows :once and :twice to be passed as counts' do
+        expect { |b| [1].each(&b) }.to yield_control.at_least(:once)
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_least(:once)
+
+        expect {
+          expect { |b| [].each(&b) }.to yield_control.at_least(:once)
+        }.to fail_with(/at least once/)
+
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_least(:twice)
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_least(:twice)
+
+        expect {
+          expect { |b| [1].each(&b) }.to yield_control.at_least(:twice)
+        }.to fail_with(/at least twice/)
+      end
+
+      it 'fails if the block yields too few times' do
+        expect {
+          expect { |b| _yield_with_no_args(&b) }.to yield_control.at_least(2).times
+        }.to fail_with(/expected given block to yield control at least twice/)
+      end
+    end
+
+    context "with at_most count" do
+      it 'passes if the block yields the given number of times' do
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_most(2).times
+        expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_most(3).times
+      end
+
+      it 'passes if the block yields fewer times' do
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_most(3).times
+      end
+
+      it 'allows :once and :twice to be passed as counts' do
+        expect { |b| [1].each(&b) }.to yield_control.at_most(:once)
+
+        expect {
+          expect { |b| [1, 2].each(&b) }.to yield_control.at_most(:once)
+        }.to fail_with(/expected given block to yield control at most once/)
+
+        expect { |b| [1, 2].each(&b) }.to yield_control.at_most(:twice)
+
+        expect {
+          expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_most(:twice)
+        }.to fail_with(/expected given block to yield control at most twice/)
+      end
+
+      it 'fails if the block yields too many times' do
+        expect {
+          expect { |b| [1, 2, 3].each(&b) }.to yield_control.at_most(2).times
+        }.to fail_with(/expected given block to yield control at most twice/)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ Dir['./spec/support/**/*'].each {|f| require f}
 
 RSpec::configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.color_enabled = true
-  config.filter_run :focused
+  config.color = true
+  config.filter_run :focus
   config.run_all_when_everything_filtered = true
   config.order = :random
 
@@ -11,6 +11,8 @@ RSpec::configure do |config|
     $default_expectation_syntax = expectations.syntax
     expectations.syntax = :expect
   end
+
+  config.include DeprecationHelpers
 end
 
 shared_context "with #should enabled", :uses_should do
@@ -46,7 +48,7 @@ module TestUnitIntegrationSupport
   def with_test_unit_loaded
     in_sub_process do
       require 'test/unit'
-      load 'rspec/matchers.rb'
+      load 'rspec/matchers/test_unit_integration.rb'
       yield
     end
   end

data/spec/support/helper_methods.rb

@@ -0,0 +1,42 @@
+module DeprecationHelpers
+
+  def expect_deprecation_with_call_site(file, line, snippet = //)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      matcher = include([file, line].join(':'))
+      call_site = options[:call_site] || options[:message]
+
+      unless matcher.matches?(call_site)
+        # RSpec::Expectations::ExpectationNotMetError is rescued in the `match` block
+        # of a custom matcher and returned as `false` from `matches?`. This would
+        # prevent an expectation failure here from surfacing in the test suite if
+        # it's triggered from within a `match` block, so we need to raise
+        # a different error class instead.
+        raise matcher.failure_message_for_should
+      end
+
+      deprecated = options[:deprecated] || options[:message]
+      expect(deprecated).to match(snippet)
+    end
+  end
+
+  def expect_deprecation_with_type(expression, message, type)
+    expect(RSpec).to receive(:deprecate).with(expression,
+      :replacement => message,
+      :type        => type
+    )
+  end
+
+  def expect_deprecation_with_replacement(snippet)
+    expect(RSpec).to receive(:deprecate) do |_, options|
+      expect(options[:replacement]).to match(snippet)
+    end
+  end
+
+  def allow_deprecation
+    allow(RSpec.configuration.reporter).to receive(:deprecation)
+  end
+
+  def expect_no_deprecation
+    expect(RSpec.configuration.reporter).not_to receive(:deprecation)
+  end
+end

data/spec/support/shared_examples.rb

@@ -1,13 +1,55 @@
 shared_examples_for "an RSpec matcher" do |options|
   let(:valid_value)   { options.fetch(:valid_value) }
   let(:invalid_value) { options.fetch(:invalid_value) }
+  let(:deprecations)  { [] }
+
+  def matched_deprecations
+    deprecations.select { |opts| opts[:deprecated] =~ /matcher == value/ }
+  end
+
+  before do
+    allow(RSpec.configuration.reporter).to receive(:deprecation) do |opts|
+      deprecations << opts
+    end
+  end
 
   it 'matches a valid value when using #== so it can be composed' do
     expect(matcher).to eq(valid_value)
   end
 
+  it 'matches a valid value when using #=== so it can be composed' do
+    expect(matcher).to be === valid_value
+  end
+
   it 'does not match an invalid value when using #== so it can be composed' do
     expect(matcher).not_to eq(invalid_value)
   end
+
+  it 'does not match an invalid value when using #=== so it can be composed' do
+    expect(matcher).not_to be === invalid_value
+  end
+
+  it 'does not print a deprecation warning when using #===' do
+    matcher === valid_value
+    matcher === invalid_value
+    expect(matched_deprecations).to eq([])
+  end
+
+  it 'does not print a deprecation warning when using #== if it returns false' do
+    (matcher == invalid_value).nil? # calling a method to avoid a warning
+    expect(matched_deprecations).to eq([])
+  end
+
+  it 'does not print a deprecation warning when using #== if it returns true because it was given the same object' do
+    expect(matcher).to be == matcher
+    expect(matched_deprecations).to eq([])
+  end
+
+  it 'prints a deprecation warning for #== when given a valid value since' do
+    (matcher == valid_value).nil? # calling a method to avoid a warning
+    expect(matched_deprecations.count).to eq(1)
+    deprecation = matched_deprecations.first
+    expect(deprecation[:call_site]).to include([__FILE__, __LINE__ - 3].join(':'))
+  end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.13.0
+  version: 2.99.0
 platform: ruby
 authors:
 - Steven Baker
@@ -10,10 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,10 +21,9 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
+  type: :runtime
   prerelease: false
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,56 +31,48 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-    none: false
-  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
-    none: false
-  prerelease: false
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
-    none: false
-  prerelease: false
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
-    none: false
+        version: '0.5'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: rspec expectations (should[_not] and matchers)
 email: rspec-users@rubyforge.org
 executables: []
@@ -90,6 +81,8 @@ extra_rdoc_files: []
 files:
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
+- lib/rspec/expectations/caller_filter.rb
+- lib/rspec/expectations/configuration.rb
 - lib/rspec/expectations/deprecation.rb
 - lib/rspec/expectations/differ.rb
 - lib/rspec/expectations/errors.rb
@@ -127,14 +120,16 @@ files:
 - lib/rspec/matchers/built_in/throw_symbol.rb
 - lib/rspec/matchers/built_in/yield.rb
 - lib/rspec/matchers/compatibility.rb
-- lib/rspec/matchers/configuration.rb
+- lib/rspec/matchers/differentiate_block_method_types.rb
 - lib/rspec/matchers/dsl.rb
 - lib/rspec/matchers/extensions/instance_eval_with_args.rb
 - lib/rspec/matchers/generated_descriptions.rb
+- lib/rspec/matchers/match_aliases.rb
 - lib/rspec/matchers/matcher.rb
 - lib/rspec/matchers/method_missing.rb
 - lib/rspec/matchers/operator_matcher.rb
 - lib/rspec/matchers/pretty.rb
+- lib/rspec/matchers/test_unit_integration.rb
 - README.md
 - License.txt
 - Changelog.md
@@ -172,14 +167,17 @@ files:
 - features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/support/rubinius.rb
 - features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
+- spec/rspec/expectations/configuration_spec.rb
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
 - spec/rspec/expectations/syntax_spec.rb
+- spec/rspec/expectations_spec.rb
 - spec/rspec/matchers/base_matcher_spec.rb
 - spec/rspec/matchers/be_close_spec.rb
 - spec/rspec/matchers/be_instance_of_spec.rb
@@ -187,9 +185,9 @@ files:
 - spec/rspec/matchers/be_spec.rb
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
-- spec/rspec/matchers/configuration_spec.rb
 - spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
+- spec/rspec/matchers/differentiate_block_method_types_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
 - spec/rspec/matchers/eq_spec.rb
 - spec/rspec/matchers/eql_spec.rb
@@ -202,9 +200,9 @@ files:
 - spec/rspec/matchers/match_array_spec.rb
 - spec/rspec/matchers/match_spec.rb
 - spec/rspec/matchers/matcher_spec.rb
-- spec/rspec/matchers/matchers_spec.rb
 - spec/rspec/matchers/method_missing_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
+- spec/rspec/matchers/pretty_spec.rb
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
@@ -213,6 +211,7 @@ files:
 - spec/rspec/matchers/yield_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
+- spec/support/helper_methods.rb
 - spec/support/in_sub_process.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb
@@ -220,6 +219,7 @@ files:
 homepage: http://github.com/rspec/rspec-expectations
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -230,25 +230,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3249637945894736858
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3249637945894736858
-  none: false
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
-summary: rspec-expectations-2.13.0
+specification_version: 4
+summary: rspec-expectations-2.99.0
 test_files:
 - features/README.md
 - features/Upgrade.md
@@ -282,14 +274,17 @@ test_files:
 - features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/support/rubinius.rb
 - features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
+- spec/rspec/expectations/configuration_spec.rb
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
 - spec/rspec/expectations/syntax_spec.rb
+- spec/rspec/expectations_spec.rb
 - spec/rspec/matchers/base_matcher_spec.rb
 - spec/rspec/matchers/be_close_spec.rb
 - spec/rspec/matchers/be_instance_of_spec.rb
@@ -297,9 +292,9 @@ test_files:
 - spec/rspec/matchers/be_spec.rb
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
-- spec/rspec/matchers/configuration_spec.rb
 - spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
+- spec/rspec/matchers/differentiate_block_method_types_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
 - spec/rspec/matchers/eq_spec.rb
 - spec/rspec/matchers/eql_spec.rb
@@ -312,9 +307,9 @@ test_files:
 - spec/rspec/matchers/match_array_spec.rb
 - spec/rspec/matchers/match_spec.rb
 - spec/rspec/matchers/matcher_spec.rb
-- spec/rspec/matchers/matchers_spec.rb
 - spec/rspec/matchers/method_missing_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
+- spec/rspec/matchers/pretty_spec.rb
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
@@ -323,6 +318,7 @@ test_files:
 - spec/rspec/matchers/yield_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
+- spec/support/helper_methods.rb
 - spec/support/in_sub_process.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb

data/spec/rspec/matchers/matchers_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-module RSpec
-  describe Matchers do
-
-    let(:sample_matchers) do
-      [:be,
-       :be_close,
-       :be_instance_of,
-       :be_kind_of]
-    end
-
-    context "once required" do
-      include TestUnitIntegrationSupport
-
-      it "includes itself in Test::Unit::TestCase" do
-        with_test_unit_loaded do
-          test_unit_case = Test::Unit::TestCase.allocate
-          sample_matchers.each do |sample_matcher|
-              expect(test_unit_case).to respond_to(sample_matcher)
-          end
-        end
-      end
-
-      it "includes itself in MiniTest::Unit::TestCase", :if => defined?(MiniTest) do
-        with_test_unit_loaded do
-          minitest_case = MiniTest::Unit::TestCase.allocate
-          sample_matchers.each do |sample_matcher|
-              expect(minitest_case).to respond_to(sample_matcher)
-          end
-        end
-      end
-
-    end
-
-  end
-end