shoulda-matchers 1.3.0 → 1.4.0

data/spec/shoulda/active_model/validation_message_finder_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
+  context '#allow_description' do
+    it 'describes its attribute' do
+      finder = build_finder(:attribute => :attr)
+
+      description = finder.allow_description('allowed values')
+
+      description.should == 'allow attr to be set to allowed values'
+    end
+  end
+
+  context '#expected_message_from' do
+    it 'returns the message as-is' do
+      finder = build_finder
+
+      message = finder.expected_message_from('some message')
+
+      message.should == 'some message'
+    end
+  end
+
+  context '#has_messages?' do
+    it 'has messages when some validations fail' do
+      finder = build_finder(:format => /abc/, :value => 'xyz')
+
+      result = finder.has_messages?
+
+      result.should be_true
+    end
+
+    it 'has no messages when all validations pass' do
+      finder = build_finder(:format => /abc/, :value => 'abc')
+
+      result = finder.has_messages?
+
+      result.should be_false
+    end
+  end
+
+  context '#messages' do
+    it 'returns errors for the given attribute' do
+      finder = build_finder(:format => /abc/, :value => 'xyz')
+
+      messages = finder.messages
+
+      messages.should == ['is invalid']
+    end
+  end
+
+  context '#messages_description' do
+    it 'describes errors for the given attribute' do
+      value = 'xyz'
+      finder = build_finder(
+        :attribute => :attr,
+        :format => /abc/,
+        :value => 'xyz'
+      )
+
+      description = finder.messages_description
+
+      expected_messages = ['attr is invalid ("xyz")']
+      description.should == "errors: #{expected_messages}"
+    end
+
+    it 'describes errors when there are none' do
+      finder = build_finder(:format => /abc/, :value => 'abc')
+
+      description = finder.messages_description
+
+      description.should == 'no errors'
+    end
+  end
+
+  context '#source_description' do
+    it 'describes the source of its messages' do
+      finder = build_finder
+
+      description = finder.source_description
+
+      description.should == 'errors'
+    end
+  end
+
+  def build_finder(arguments = {})
+    arguments[:attribute] ||= :attr
+    instance = build_instance_validating(
+      arguments[:attribute],
+      arguments[:format] || /abc/,
+      arguments[:value] || 'abc'
+    )
+    Shoulda::Matchers::ActiveModel::ValidationMessageFinder.new(
+      instance,
+      arguments[:attribute]
+    )
+  end
+
+  def build_instance_validating(attribute, format, value)
+    model_class = define_model(:example, attribute => :string) do
+      attr_accessible attribute
+      validates_format_of attribute, :with => format
+    end
+
+    model_class.new(attribute => value)
+  end
+end

data/spec/shoulda/active_record/association_matcher_spec.rb

@@ -370,6 +370,14 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Person.new.should_not @matcher
     end
 
+    it "should accept an association with an existing custom foreign key" do
+      define_model :detail, :detailed_person_id => :integer
+      define_model :person do
+        has_one :detail, :foreign_key => :detailed_person_id
+      end
+      Person.new.should @matcher.with_foreign_key(:detailed_person_id)
+    end
+
     it "should reject an association with a bad :as option" do
       define_model :detail, :detailable_id   => :integer,
                             :detailable_type => :string

data/spec/shoulda/active_record/have_db_index_matcher_spec.rb

@@ -85,4 +85,21 @@ describe Shoulda::Matchers::ActiveRecord::HaveDbIndexMatcher do
   it "should not context an index's uniqueness when it isn't important" do
     have_db_index(:user_id).description.should_not =~ /unique/
   end
+
+  it "allows an IndexDefinition to have a truthy value for unique" do
+    db_connection = create_table 'superheros' do |table|
+      table.integer :age
+    end
+    db_connection.add_index :superheros, :age
+    define_model_class 'Superhero'
+
+    @matcher = have_db_index(:age).unique(true)
+
+    index_definition = stub("ActiveRecord::ConnectionAdapters::IndexDefinition",
+                            :unique => 7,
+                            :name => :age)
+    @matcher.stubs(:matched_index => index_definition)
+
+    Superhero.new.should @matcher
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,7 +87,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,8 @@ files:
 - lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb
+- lib/shoulda/matchers/active_model/errors.rb
+- lib/shoulda/matchers/active_model/exception_message_finder.rb
 - lib/shoulda/matchers/active_model/helpers.rb
 - lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
@@ -214,6 +216,7 @@ files:
 - lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb
 - lib/shoulda/matchers/active_model/validation_matcher.rb
+- lib/shoulda/matchers/active_model/validation_message_finder.rb
 - lib/shoulda/matchers/active_record.rb
 - lib/shoulda/matchers/active_record/accept_nested_attributes_for_matcher.rb
 - lib/shoulda/matchers/active_record/association_matcher.rb
@@ -250,6 +253,7 @@ files:
 - spec/shoulda/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_length_of_matcher_spec.rb
+- spec/shoulda/active_model/exception_message_finder_spec.rb
 - spec/shoulda/active_model/helpers_spec.rb
 - spec/shoulda/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_confirmation_of_matcher_spec.rb
@@ -257,6 +261,7 @@ files:
 - spec/shoulda/active_model/validate_numericality_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_presence_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
+- spec/shoulda/active_model/validation_message_finder_spec.rb
 - spec/shoulda/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/shoulda/active_record/association_matcher_spec.rb
 - spec/shoulda/active_record/have_db_column_matcher_spec.rb
@@ -282,15 +287,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 813377459972856034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 813377459972856034
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Making tests easy on the fingers and eyes
@@ -321,6 +332,7 @@ test_files:
 - spec/shoulda/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/active_model/ensure_length_of_matcher_spec.rb
+- spec/shoulda/active_model/exception_message_finder_spec.rb
 - spec/shoulda/active_model/helpers_spec.rb
 - spec/shoulda/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_confirmation_of_matcher_spec.rb
@@ -328,6 +340,7 @@ test_files:
 - spec/shoulda/active_model/validate_numericality_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_presence_of_matcher_spec.rb
 - spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
+- spec/shoulda/active_model/validation_message_finder_spec.rb
 - spec/shoulda/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/shoulda/active_record/association_matcher_spec.rb
 - spec/shoulda/active_record/have_db_column_matcher_spec.rb
@@ -341,4 +354,3 @@ test_files:
 - spec/support/controller_builder.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
-has_rdoc: