rspec-expectations 2.99.0.rc1 → 2.99.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6638fae315b3f230a14e4e9a58b845016e1f2cd1
-  data.tar.gz: 7f54fd6c65671705178edae5454c4b7c6712aac2
-SHA512:
-  metadata.gz: dc9c8cc98c5d0863ba78a930e14866fed155ff606f83b96eac184ae2beeec7077d5a17613f7a49b79d7809bbf359e49289f6730ab9736ced587338769f5720bc
-  data.tar.gz: 4cef0dcd237b8853ef730e171d333e325d141826f13e4c721a92c5e9bd71a136ea7e375c4d01d808a529dc0d209b710993ed2e949c3a3bc5e4d43b0a082ad511
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjkxOGIyZDlkOGFkYmNlNTNiZTg1NzY3MmVmZDg4ZTE2YTg1NjNlZg==
+  data.tar.gz: !binary |-
+    MDc2MmQyNGE4OWNlOTdhYTgyMDkyMDQ4MmI2NzQ1ZmRhYjhiYzE4Ng==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODczNTI0ZjZjOWRhNzQ0Zjc5ZjVjODdjYTc1NzJjYzc1ZmM3NjQ5OGU0NDQ1
+    Y2MzODUzYzk5OTY1ZDI5MmY3OTlhZTRjNzJhZmQ4MzZmMzhkZWUwY2YxNTdl
+    ZmZiMmI1MWUzZThiOThlZWE3NDI3ZDFjMjhjZjBlM2E3OGRhYjM=
+  data.tar.gz: !binary |-
+    ODJlOTYzOGFkMjRhZTQ1OWQ5YjZhNTk4NWY0ZjZhMzhhMzk2OGRiOGNiYThl
+    YWFiZWNmYWJhNWVhNGJkNWEwYmViYTQ0ZjUwMTU4NmViOGE2YTQwODY3NTkz
+    NDQ5ZTU4M2M0MTBlMzEwMjRiNzM0Nzg3NWQzZDE0NzM3ZmU2Yzc=

data/Changelog.md

@@ -1,3 +1,11 @@
+### 2.99.0 / 2014-06-01
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.0.rc1...v2.99.0)
+
+Enhancements:
+
+* Special case deprecation message for `errors_on` with `rspec-rails` to be more useful.
+  (Aaron Kromer)
+
 ### 2.99.0.rc1 / 2014-05-18
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.0.beta2...2.99.0.rc1)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.99.0.rc1'
+      STRING = '2.99.0'
     end
   end
 end

data/lib/rspec/matchers/built_in/have.rb

@@ -142,19 +142,37 @@ EOF
         def print_deprecation_message(query_method)
           deprecation_message = "the rspec-collection_matchers gem "
           deprecation_message << "or replace your expectation with something like "
-          deprecation_message << "`expect(#{cardinality_expression(query_method)}).#{expectation_format_method} #{suggested_matcher_expression}`"
+          if for_rspec_rails_error_on?
+            # It is supposed to be safe to be able to convert the args array to
+            # a string. This is because the `errors_on` method only takes two
+            # valid arguments: attribute name (symbol/string) and a hash
+            deprecated_call = expectation_expression(query_method, "record")
+            deprecated_call << "(#{errors_on_args_list})" unless @args.empty?
+
+            deprecation_message << <<-EOS.gsub(/^\s+\|/, '')
+              |
+              |
+              |    #{record_valid_expression}
+              |    expect(#{record_errors_expression(query_method)}).#{expectation_format_method} #{suggested_matcher_expression}
+              |
+            EOS
+          else
+            deprecated_call = expectation_expression(query_method)
+            deprecation_message << "`expect(#{cardinality_expression(query_method)}).#{expectation_format_method} #{suggested_matcher_expression}`"
+          end
 
-          RSpec.deprecate("`#{expectation_expression(query_method)}`",
+          RSpec.deprecate("`#{deprecated_call}`",
             :replacement => deprecation_message,
             :type        => "the have matcher"
           )
         end
 
-        def expectation_expression(query_method)
+        def expectation_expression(query_method, target = nil)
+          target ||= target_expression
           if @negative_expectation
-            RSpec::Expectations::Syntax.negative_expression(target_expression, original_matcher_expression)
+            RSpec::Expectations::Syntax.negative_expression(target, original_matcher_expression)
           else
-            RSpec::Expectations::Syntax.positive_expression(target_expression, original_matcher_expression)
+            RSpec::Expectations::Syntax.positive_expression(target, original_matcher_expression)
           end
         end
 
@@ -218,6 +236,37 @@ EOF
             "have_at_least"
           end
         end
+
+        # RSpec Rails `errors_on` specific helpers
+        def for_rspec_rails_error_on?
+          defined?(RSpec::Rails) &&
+            /\.errors?_on\b/ =~ original_matcher_expression
+        end
+
+        def errors_on_args_list
+          list = @args.first.inspect
+          context = validation_context
+          list << ", :context => #{context}" if context
+          list
+        end
+
+        def record_valid_expression
+          expression = "record.valid?"
+          if on_context = validation_context
+            expression << "(#{on_context})"
+          end
+          expression
+        end
+
+        def validation_context
+          return unless Hash === @args.last
+          @args.last[:context].inspect
+        end
+
+        def record_errors_expression(query_method)
+          attribute = (@args.first || :attr)
+          "record.errors[#{attribute.inspect}].#{String(query_method)}"
+        end
       end
     end
   end

data/spec/rspec/matchers/have_spec.rb

@@ -532,6 +532,96 @@ EOF
       end
     end
 
+    context "when the target is a Rails record" do
+      class TheModel
+        attr_reader :errors
+
+        def initialize(errors)
+          @errors = {}
+          @errors[:attr] = Array(errors)
+        end
+
+        def errors_on(attr, _ignore_opts = {})
+          Array(@errors[attr]).flatten.compact
+        end
+        alias_method :error_on, :errors_on
+      end
+
+      let(:message_preamble) do
+        "the rspec-collection_matchers gem " +
+          "or replace your expectation with something like "
+      end
+
+      before do
+        stub_const "RSpec::Rails", Module.new
+      end
+
+      it "prints a specific message for the positive expectation format" do
+        expectation_expression = "expect(record).to have(2).errors_on(:attr)"
+        message = message_preamble + <<-EOS.gsub(/^\s+\|/, '')
+          |
+          |
+          |    record.valid?
+          |    expect(record.errors[:attr].size).to eq(2)
+          |
+        EOS
+
+        expect_have_deprecation(expectation_expression, message)
+
+        target = TheModel.new(%w(foo bar))
+        expect(target).to have(2).errors_on(:attr)
+      end
+
+      it "prints a specific message for the negative expectation format" do
+        expectation_expression = "expect(record).not_to have(2).errors_on(:attr)"
+        message = message_preamble + <<-EOS.gsub(/^\s+\|/, '')
+          |
+          |
+          |    record.valid?
+          |    expect(record.errors[:attr].size).to_not eq(2)
+          |
+        EOS
+
+        expect_have_deprecation(expectation_expression, message)
+
+        target = TheModel.new('foo')
+        expect(target).not_to have(2).errors_on(:attr)
+      end
+
+      it "prints message for singular form: `error_on`" do
+        expectation_expression = "expect(record).to have(1).error_on(:attr)"
+        message = message_preamble + <<-EOS.gsub(/^\s+\|/, '')
+          |
+          |
+          |    record.valid?
+          |    expect(record.errors[:attr].size).to eq(1)
+          |
+        EOS
+
+        expect_have_deprecation(expectation_expression, message)
+
+        target = TheModel.new('foo')
+        expect(target).to have(1).error_on(:attr)
+      end
+
+      it "includes a validation context when provided" do
+        expectation_expression = "expect(record).to have(2).errors_on(:attr, :context => :spec)"
+        message = message_preamble + <<-EOS.gsub(/^\s+\|/, '')
+          |
+          |
+          |    record.valid?(:spec)
+          |    expect(record.errors[:attr].size).to eq(2)
+          |
+        EOS
+
+        expect_have_deprecation(expectation_expression, message)
+
+        target = TheModel.new(%w(foo bar))
+        options = {:context => :spec, :should_be_ignored => true}
+        expect(target).to have(2).errors_on(:attr, options)
+      end
+    end
+
     context "when the target is an enumerator" do
       it "prints a specific message for the positive expectation format" do
         target = %w[a b c].to_enum(:each)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 2.99.0.rc1
+  version: 2.99.0
 platform: ruby
 authors:
 - Steven Baker
@@ -9,68 +9,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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)
@@ -79,46 +79,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".yardopts"
-- Changelog.md
-- License.txt
-- README.md
-- features/README.md
-- features/Upgrade.md
-- features/built_in_matchers/README.md
-- features/built_in_matchers/be.feature
-- features/built_in_matchers/be_within.feature
-- features/built_in_matchers/cover.feature
-- features/built_in_matchers/end_with.feature
-- features/built_in_matchers/equality.feature
-- features/built_in_matchers/exist.feature
-- features/built_in_matchers/expect_change.feature
-- features/built_in_matchers/expect_error.feature
-- features/built_in_matchers/have.feature
-- features/built_in_matchers/include.feature
-- features/built_in_matchers/match.feature
-- features/built_in_matchers/operators.feature
-- features/built_in_matchers/predicates.feature
-- features/built_in_matchers/respond_to.feature
-- features/built_in_matchers/satisfy.feature
-- features/built_in_matchers/start_with.feature
-- features/built_in_matchers/throw_symbol.feature
-- features/built_in_matchers/types.feature
-- features/built_in_matchers/yield.feature
-- features/custom_matchers/access_running_example.feature
-- features/custom_matchers/define_diffable_matcher.feature
-- features/custom_matchers/define_matcher.feature
-- features/custom_matchers/define_matcher_outside_rspec.feature
-- features/custom_matchers/define_matcher_with_fluent_interface.feature
-- features/customized_message.feature
-- features/diffing.feature
-- 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
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
 - lib/rspec/expectations/caller_filter.rb
@@ -170,6 +130,46 @@ files:
 - lib/rspec/matchers/operator_matcher.rb
 - lib/rspec/matchers/pretty.rb
 - lib/rspec/matchers/test_unit_integration.rb
+- README.md
+- License.txt
+- Changelog.md
+- .yardopts
+- .document
+- features/README.md
+- features/Upgrade.md
+- features/built_in_matchers/README.md
+- features/built_in_matchers/be.feature
+- features/built_in_matchers/be_within.feature
+- features/built_in_matchers/cover.feature
+- features/built_in_matchers/end_with.feature
+- features/built_in_matchers/equality.feature
+- features/built_in_matchers/exist.feature
+- features/built_in_matchers/expect_change.feature
+- features/built_in_matchers/expect_error.feature
+- features/built_in_matchers/have.feature
+- features/built_in_matchers/include.feature
+- features/built_in_matchers/match.feature
+- features/built_in_matchers/operators.feature
+- features/built_in_matchers/predicates.feature
+- features/built_in_matchers/respond_to.feature
+- features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/start_with.feature
+- features/built_in_matchers/throw_symbol.feature
+- features/built_in_matchers/types.feature
+- features/built_in_matchers/yield.feature
+- features/custom_matchers/access_running_example.feature
+- features/custom_matchers/define_diffable_matcher.feature
+- features/custom_matchers/define_matcher.feature
+- features/custom_matchers/define_matcher_outside_rspec.feature
+- features/custom_matchers/define_matcher_with_fluent_interface.feature
+- features/customized_message.feature
+- features/diffing.feature
+- 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
@@ -222,25 +222,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-2.99.0.rc1
+summary: rspec-expectations-2.99.0
 test_files:
 - features/README.md
 - features/Upgrade.md