rspec-collection_matchers 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 86054489823ad2296c0bffaea74803acb7488d8a
+  data.tar.gz: b5d8d76f482bcbcd7d8c290bdd656379d3efd0dc
+SHA512:
+  metadata.gz: ac223d5be9e8bcb6bd1a70dc7e09934428ecee6efe7d2e2d3d0f81ed6a25ea7237cfe8fecbc8cdd67ae69aa84cbb044e87d114ee051de4c54f29d5abf977cef1
+  data.tar.gz: a73e52b3b592bb067306d666522352d8c61fdaf7051bbcd17f475b0d1a4f1d17154e2f965d3a93f9db8ece4fce2e176806d3e8836354e0306cebef7f7944a2d5

data/Changelog.md

@@ -1,3 +1,11 @@
+### 0.0.4 / 2014-04-24
+
+[full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v0.0.3...v0.0.4)
+
+Enhancements:
+
+* Add Rails extension `have(n).errors_on(:whatever)` (Bradley Schaefer)
+
 ### 0.0.3 / 2014-02-16
 
 [full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v0.0.2...v0.0.3)

data/Gemfile

@@ -12,13 +12,34 @@ gemspec
   end
 end
 
-# only the master branche is supported on rspec-support
+# only the master branch is supported on rspec-support
 gem "rspec-support", :git => "git://github.com/rspec/rspec-support.git"
 
 gem "cucumber", "~> 1.1.9"
 gem "aruba",    "~> 0.5"
 gem "rake",     "~> 10.0.0"
 
+version_file = File.expand_path("../.rails-version", __FILE__)
+rails_gem_args = case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp)
+when /master/
+ { :git => "git://github.com/rails/rails.git" }
+when /stable$/
+ { :git => "git://github.com/rails/rails.git", :branch => version }
+when nil, false, ""
+  if RUBY_VERSION < '1.9.3'
+    # Rails 4+ requires 1.9.3+, so on earlier versions default to the last 3.x release.
+     "3.2.17"
+  else
+    "4.0.4"
+  end
+else
+  version
+end
+
+gem "activesupport", *rails_gem_args
+gem "activemodel",   *rails_gem_args
+
+
 platform :rbx do
   gem 'rubysl'
 end

data/lib/rspec/collection_matchers.rb

@@ -1,3 +1,4 @@
 require 'rspec/collection_matchers/version'
 require 'rspec/collection_matchers/matchers'
 require 'rspec/collection_matchers/have'
+require 'rspec/collection_matchers/rails_extensions'

data/lib/rspec/collection_matchers/have.rb

@@ -70,6 +70,7 @@ module RSpec
       end
 
       def failure_message
+        return errors_on_message(:expected, ", got #{@actual}") if is_errors_on?
         "expected #{relative_expectation} #{@collection_name}, got #{@actual}"
       end
       alias failure_message_for_should failure_message
@@ -98,6 +99,7 @@ EOF
       alias failure_message_for_should_not failure_message_when_negated
 
       def description
+        return errors_on_message(:have) if is_errors_on?
         "have #{relative_expectation} #{@collection_name}"
       end
 
@@ -124,6 +126,14 @@ EOF
       def enumerator_class
         RUBY_VERSION < '1.9' ? Enumerable::Enumerator : Enumerator
       end
+
+      def is_errors_on?
+        [:errors_on, :error_on].include? @collection_name
+      end
+
+      def errors_on_message(prefix, suffix = nil)
+        "#{prefix} #{relative_expectation} #{@collection_name.to_s.gsub('_', ' ')} :#{@args[0]}#{suffix}"
+      end
     end
 
     module Syntax

data/lib/rspec/collection_matchers/rails_extensions.rb

@@ -0,0 +1,26 @@
+if defined?(::ActiveModel)
+  module ::ActiveModel::Validations
+    # Extension to enhance `to have` on AR Model instances.  Calls
+    # model.valid? in order to prepare the object's errors object. Accepts
+    # a :context option to specify the validation context.
+    #
+    # You can also use this to specify the content of the error messages.
+    #
+    # @example
+    #
+    #     expect(model).to have(:no).errors_on(:attribute)
+    #     expect(model).to have(1).error_on(:attribute)
+    #     expect(model).to have(n).errors_on(:attribute)
+    #     expect(model).to have(n).errors_on(:attribute, :context => :create)
+    #
+    #     expect(model.errors_on(:attribute)).to include("can't be blank")
+    def errors_on(attribute, options = {})
+      valid_args = [options[:context]].compact
+      self.valid?(*valid_args)
+
+      [self.errors[attribute]].flatten.compact
+    end
+
+    alias :error_on :errors_on
+  end
+end

data/lib/rspec/collection_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module CollectionMatchers
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/rspec-collection_matchers.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency     "rspec-expectations", ">= 2.99.0.beta1"
 
-  spec.add_development_dependency "bundler",    "~> 1.3"
+  spec.add_development_dependency "bundler",     "~> 1.3"
+  spec.add_development_dependency "activemodel", ">= 3.0"
 end

data/spec/rspec/collection_matchers/have_spec.rb

@@ -338,14 +338,14 @@ EOF
   describe "have(n).items(args, block)" do
     it "passes args to target" do
       target = double("target")
-      target.should_receive(:items).with("arg1","arg2").and_return([1,2,3])
+      expect(target).to receive(:items).with("arg1","arg2").and_return([1,2,3])
       expect(target).to have(3).items("arg1","arg2")
     end
 
     it "passes block to target" do
       target = double("target")
       block = Proc.new { 5 }
-      target.should_receive(:items).with("arg1","arg2", block).and_return([1,2,3])
+      expect(target).to receive(:items).with("arg1","arg2", block).and_return([1,2,3])
       expect(target).to have(3).items("arg1","arg2", block)
     end
   end

data/spec/rspec/collection_matchers/rails_extensions_spec.rb

@@ -0,0 +1,99 @@
+require "spec_helper"
+require 'active_model'
+
+module RSpec::CollectionMatchers
+  describe "Have extensions for rails" do
+    describe "error_on" do
+      it "provides a description including the name of what the error is on" do
+        expect(have(1).error_on(:whatever).description).to eq "have 1 error on :whatever"
+      end
+
+      it "provides a failure message including the number actually given" do
+        expect {
+          expect([]).to have(1).error_on(:whatever)
+        }.to raise_error("expected 1 error on :whatever, got 0")
+      end
+    end
+
+    describe "errors_on" do
+      it "provides a description including the name of what the error is on" do
+        expect(have(2).errors_on(:whatever).description).to eq "have 2 errors on :whatever"
+      end
+
+      it "provides a failure message including the number actually given" do
+        expect {
+          expect([1]).to have(3).errors_on(:whatever)
+        }.to raise_error("expected 3 errors on :whatever, got 1")
+      end
+
+      let(:klass) do
+        Class.new do
+          include ActiveModel::Validations
+        end
+      end
+
+      it "calls valid?" do
+        model = klass.new
+        expect(model).to receive(:valid?)
+        model.errors_on(:foo)
+      end
+
+      it "returns the errors on that attribute" do
+        model = klass.new
+        allow(model).to receive(:errors) do
+          { :foo => ['a', 'b'] }
+        end
+        expect(model.errors_on(:foo)).to eq(['a','b'])
+      end
+
+      context "ActiveModel class that takes no arguments to valid?" do
+        let(:klass) {
+          Class.new do
+            include ActiveModel::Validations
+
+            def self.name
+              "ActiveModelValidationsFake"
+            end
+
+            def valid?
+              super
+            end
+
+            attr_accessor :name
+            validates_presence_of :name
+          end
+        }
+
+        context "with nil name" do
+          it "has one error" do
+            object = klass.new
+            object.name = ""
+
+            expect(object).to have(1).error_on(:name)
+          end
+        end
+
+        context "with non-blank name" do
+          it "has no error" do
+            object = klass.new
+            object.name = "Ywen"
+
+            expect(object).to have(:no).error_on(:name)
+          end
+        end
+      end
+    end
+
+    describe "have something other than error_on or errors_on" do
+      it "has a standard rspec failure message" do
+        expect {
+          expect([1,2,3]).to have(2).elements
+        }.to raise_error("expected 2 elements, got 3")
+      end
+
+      it "has a standard rspec description" do
+        expect(have(2).elements.description).to eq "have 2 elements"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,27 @@
+require 'active_model'
+
+# to avoid deprecation warning:
+# [deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message.
+I18n.enforce_available_locales = false
+
 require 'rspec/collection_matchers'
 
 Dir['./spec/support/**/*'].each {|f| require f}
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true if RSpec::Core::Version::STRING < "3.0"
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
   config.order = 'random'
+
+  config.expect_with :rspec do |rspec|
+    rspec.syntax = :expect
+  end
+
+  config.mock_with :rspec do |rspec|
+    rspec.syntax = :expect
+  end
 end
 
 shared_context "with #should enabled", :uses_should do

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rspec-collection_matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Hugo Baraúna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.99.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.99.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Collection cardinality matchers, extracted from rspec-expectations
 email:
 - hugo.barauna@plataformatec.com.br
@@ -50,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -63,10 +72,12 @@ files:
 - lib/rspec/collection_matchers.rb
 - lib/rspec/collection_matchers/have.rb
 - lib/rspec/collection_matchers/matchers.rb
+- lib/rspec/collection_matchers/rails_extensions.rb
 - lib/rspec/collection_matchers/version.rb
 - rspec-collection_matchers.gemspec
 - script/test_all
 - spec/rspec/collection_matchers/have_spec.rb
+- spec/rspec/collection_matchers/rails_extensions_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
 - spec/support/matchers.rb
@@ -74,38 +85,32 @@ files:
 homepage: https://github.com/rspec/rspec-collection_matchers
 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: '0'
-      segments:
-      - 0
-      hash: -3346654767301501509
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3346654767301501509
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
-summary: rspec-collection_matchers-0.0.3
+specification_version: 4
+summary: rspec-collection_matchers-0.0.4
 test_files:
 - features/have.feature
 - features/support/env.rb
 - spec/rspec/collection_matchers/have_spec.rb
+- spec/rspec/collection_matchers/rails_extensions_spec.rb
 - spec/spec_helper.rb
 - spec/support/classes.rb
 - spec/support/matchers.rb