shoulda 2.11.0 → 2.11.1

data/lib/shoulda/context.rb

@@ -116,7 +116,7 @@ module Shoulda
     #      context "on GET" do
     #        setup { get :index }
     #
-    #        should_respond_with :success
+    #        should respond_with(:success)
     #
     #        # runs before "get :index"
     #        before_should "find all users" do
@@ -215,7 +215,7 @@ module Shoulda
     #     subject { User.first }
     #
     #     # uses the existing user
-    #     should_validate_uniqueness_of :email
+    #     should validate_uniqueness_of(:email)
     #   end
     def subject(&block)
       @subject_block = block

data/lib/shoulda/integrations/rspec2.rb

@@ -0,0 +1,22 @@
+require 'shoulda/active_record/matchers'
+require 'shoulda/action_controller/matchers'
+require 'shoulda/action_mailer/matchers'
+
+# :enddoc:
+
+module RSpec
+  module Matchers
+    include Shoulda::ActiveRecord::Matchers
+  end
+
+  module Rails
+    module ControllerExampleGroup
+      include Shoulda::ActionController::Matchers
+    end
+
+    module MailerExampleGroup
+      include Shoulda::ActionMailer::Matchers
+    end
+  end
+end
+

data/lib/shoulda/macros.rb

@@ -36,8 +36,23 @@ module Shoulda # :nodoc:
     #
     #   # Assert the value changed to "new:"
     #   should_change("the post title", :to => "new") { @post.title }
+    #
+    # This macro was deprecated because these tests aren't as valuable as
+    # alternative tests that explicitly test the final state.
+    #
+    # Consider an alternative:
+    #
+    #   context "updating a post" do
+    #     setup do
+    #       @post = Post.create(:title => "old")
+    #       put :update, :post => {:title => "new"}, :id => @post.to_param
+    #     end
+    #     should "update the title" do
+    #       assert_equal "new", @post.reload.title
+    #     end
+    #   end
     def should_change(description, options = {}, &block)
-      ::ActiveSupport::Deprecation.warn
+      ::ActiveSupport::Deprecation.warn("Not considered a useful test. Instead, test the end state explicitly.")
       by, from, to = get_options!([options], :by, :from, :to)
       stmt = "change #{description}"
       stmt << " from #{from.inspect}" if from
@@ -69,8 +84,23 @@ module Shoulda # :nodoc:
     #     setup { @post.update_attributes(:title => "new") }
     #     should_not_change("the number of posts") { Post.count }
     #   end
+    #
+    # This macro was deprecated because these tests aren't as valuable as
+    # alternative tests that explicitly test the final state.
+    #
+    # Consider an alternative:
+    #
+    #   context "updating a post" do
+    #     setup do
+    #       @post = Post.create(:title => "old")
+    #       put :update, :post => {:title => ""}, :id => @post.to_param
+    #     end
+    #     should "not update the title" do
+    #       assert_equal "old", @post.reload.title
+    #     end
+    #   end
     def should_not_change(description, &block)
-      ::ActiveSupport::Deprecation.warn
+      ::ActiveSupport::Deprecation.warn("Not considered a useful test. Instead, test the end state explicitly.")
       before = lambda { @_before_should_not_change = block.bind(self).call }
       should "not change #{description}", :before => before do
         new_value = block.bind(self).call

data/lib/shoulda/tasks/yaml_to_shoulda.rake

@@ -1,28 +1,28 @@
 namespace :shoulda do
   # From http://blog.internautdesign.com/2007/11/2/a-yaml_to_shoulda-rake-task
   # David.Lowenfels@gmail.com
-  desc "Converts a YAML file (FILE=./path/to/yaml) into a Shoulda skeleton" 
+  desc "Converts a YAML file (FILE=./path/to/yaml) into a Shoulda skeleton"
   task :from_yaml do
     require 'yaml'
-    
+
     def yaml_to_context(hash, indent = 0)
       indent1 = '  ' * indent
       indent2 = '  ' * (indent + 1)
       hash.each_pair do |context, shoulds|
-        puts indent1 + "context \"#{context}\" do" 
-        puts    
+        puts indent1 + "context \"#{context}\" do"
+        puts
         shoulds.each do |should|
           yaml_to_context( should, indent + 1 ) and next if should.is_a?( Hash )
-          puts indent2 + "should_eventually \"" + should.gsub(/^should +/,'') + "\" do" 
-          puts indent2 + "end" 
+          puts indent2 + "should_eventually \"" + should.gsub(/^should +/,'') + "\" do"
+          puts indent2 + "end"
           puts
         end
-        puts indent1 + "end" 
+        puts indent1 + "end"
       end
-    end 
-    
+    end
+
     puts("Please pass in a FILE argument.") and exit unless ENV['FILE']
-      
+
     yaml_to_context( YAML.load_file( ENV['FILE'] ) )
   end
-end
+end

data/lib/shoulda/version.rb

@@ -1,4 +1,4 @@
 module Shoulda
-  VERSION = "2.11.0"
+  VERSION = "2.11.1"
 end
 

data/rails/init.rb

@@ -1,8 +1,8 @@
 if RAILS_ENV == 'test'
   if defined? Spec
-    require 'shoulda/rspec'
+    require 'shoulda/integrations/rspec'
   else
-    require 'shoulda/rails' 
+    require 'shoulda/integrations/test_unit'
     Shoulda.autoload_macros RAILS_ROOT, File.join("vendor", "{plugins,gems}", "*")
   end
 end

data/test/matchers/action_mailer/have_sent_email_test.rb

@@ -1,6 +1,14 @@
 require 'test_helper'
 
 class HaveSentEmailTest < ActiveSupport::TestCase # :nodoc:
+  def add_mail_to_deliveries
+    if defined?(AbstractController::Rendering)
+      ::ActionMailer::Base.deliveries << Mailer.the_email
+    else
+      ::ActionMailer::Base.deliveries << Mailer.create_the_email
+    end
+  end
+
   context "an email" do
     setup do
       define_mailer :mailer, [:the_email] do
@@ -18,31 +26,40 @@ class HaveSentEmailTest < ActiveSupport::TestCase # :nodoc:
           end
         end
       end
-      if defined?(AbstractController::Rendering)
-        ::ActionMailer::Base.deliveries << Mailer.the_email
-      else
-        ::ActionMailer::Base.deliveries << Mailer.create_the_email
-      end
+      add_mail_to_deliveries
     end
 
+    teardown { ::ActionMailer::Base.deliveries.clear }
+
     should "accept based on the subject" do
       assert_accepts have_sent_email.with_subject(/is spam$/), nil
-      assert_rejects have_sent_email.with_subject(/totally safe/), nil
+      assert_rejects have_sent_email.with_subject(/totally safe/), nil,
+                     :message => /Expected sent email with subject/
     end
 
     should "accept based on the sender" do
       assert_accepts have_sent_email.from('do-not-reply@example.com'), nil
-      assert_rejects have_sent_email.from('you@example.com'), nil
+      assert_rejects have_sent_email.from('you@example.com'), nil,
+                     :message => /Expected sent email from/
     end
 
     should "accept based on the body" do
       assert_accepts have_sent_email.with_body(/is spam\./), nil
-      assert_rejects have_sent_email.with_body(/totally safe/), nil
+      assert_rejects have_sent_email.with_body(/totally safe/), nil,
+                     :message => /Expected sent email with body/
     end
 
-    should "accept baed on the recipienct" do
+    should "accept based on the recipient" do
       assert_accepts have_sent_email.to('myself@me.com'), nil
-      assert_rejects have_sent_email.to('you@example.com'), nil
+      assert_rejects have_sent_email.to('you@example.com'), nil,
+                     :message => /Expected sent email to/
+    end
+
+    should "list all deliveries within failure message" do
+      add_mail_to_deliveries
+
+      assert_rejects have_sent_email.to('you@example.com'), nil,
+                                        :message => /Deliveries:\n"This is spam" to \["myself@me\.com"\]\n"This is spam" to \["myself@me\.com"\]/
     end
 
     should "chain" do

data/test/other/context_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 
 class ContextTest < ActiveSupport::TestCase # :nodoc:
-  
+
   def self.context_macro(&blk)
     context "with a subcontext made by a macro" do
       setup { @context_macro = :foo }
 
-      merge_block &blk 
+      merge_block &blk
     end
   end
 
@@ -21,11 +21,11 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
     setup do
       @blah = "blah"
     end
-    
+
     should "run the setup block" do
       assert_equal "blah", @blah
     end
-    
+
     should "have name set right" do
       assert_match(/^test: context with setup block/, self.to_s)
     end
@@ -34,11 +34,11 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
       setup do
         @blah = "#{@blah} twice"
       end
-      
+
       should "be named correctly" do
         assert_match(/^test: context with setup block and a subcontext should be named correctly/, self.to_s)
       end
-      
+
       should "run the setup blocks in order" do
         assert_equal @blah, "blah twice"
       end
@@ -64,7 +64,7 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
     setup do
       @blah = "foo"
     end
-    
+
     should "have @blah == 'foo'" do
       assert_equal "foo", @blah
     end
@@ -73,12 +73,12 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
       assert_match(/^test: another context with setup block/, self.to_s)
     end
   end
-  
+
   context "context with method definition" do
     setup do
       def hello; "hi"; end
     end
-    
+
     should "be able to read that method" do
       assert_equal "hi", hello
     end
@@ -87,52 +87,52 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
       assert_match(/^test: context with method definition/, self.to_s)
     end
   end
-  
+
   context "another context" do
     should "not define @blah" do
       assert_nil @blah
     end
   end
-    
+
   context "context with multiple setups and/or teardowns" do
-    
+
     cleanup_count = 0
-        
+
     2.times do |i|
       setup { cleanup_count += 1 }
       teardown { cleanup_count -= 1 }
     end
-    
+
     2.times do |i|
       should "call all setups and all teardowns (check ##{i + 1})" do
         assert_equal 2, cleanup_count
       end
     end
-    
+
     context "subcontexts" do
-      
+
       2.times do |i|
         setup { cleanup_count += 1 }
         teardown { cleanup_count -= 1 }
       end
-                  
+
       2.times do |i|
         should "also call all setups and all teardowns in parent and subcontext (check ##{i + 1})" do
           assert_equal 4, cleanup_count
         end
       end
-      
+
     end
-    
+
   end
-  
+
   should_eventually "pass, since it's unimplemented" do
     flunk "what?"
   end
 
   should_eventually "not require a block when using should_eventually"
   should "pass without a block, as that causes it to piggyback to should_eventually"
-  
+
   context "context for testing should piggybacking" do
     should "call should_eventually as we are not passing a block"
   end
@@ -164,7 +164,7 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
       should "return the result of the block as the subject" do
         assert_equal @expected, subject
       end
-      
+
       context "nested context block without a subject block" do
         should "return the result of the parent context's subject block" do
           assert_equal @expected, subject

data/test/other/convert_to_should_syntax_test.rb

@@ -41,7 +41,7 @@ class ConvertToShouldSyntaxTest < ActiveSupport::TestCase # :nodoc:
 
     end
   EOS
-  
+
   FIXTURE_PATH = "./convert_to_should_syntax_fixture.dat"
 
   RUBY = ENV['RUBY'] || 'ruby'

data/test/other/private_helpers_test.rb

@@ -22,7 +22,7 @@ class PrivateHelpersTest < ActiveSupport::TestCase # :nodoc:
         get_options!(args, :one)
       end
     end
-    
+
     should "return single wanted option" do
       args = [:a, :b, {:class => Object}]
       klass = get_options!(args,:class)

data/test/other/should_test.rb

@@ -4,11 +4,11 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
   should "be able to define a should statement outside of a context" do
     assert true
   end
-  
+
   should "see the name of my class as ShouldTest" do
     assert_equal "ShouldTest", self.class.name
   end
-  
+
   def self.should_see_class_methods
     should "be able to see class methods" do
       assert true
@@ -27,13 +27,13 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
 
   def self.should_see_blah
     should "see @blah through a macro" do
-      assert @blah 
+      assert @blah
     end
   end
 
   def self.should_not_see_blah
     should "not see @blah through a macro" do
-      assert_nil @blah 
+      assert_nil @blah
     end
   end
 
@@ -75,12 +75,12 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
     setup do
       @blah = "blah"
     end
-    
+
     should "have @blah == 'blah'" do
       assert_equal "blah", @blah
     end
     should_see_blah
-    
+
     should "have name set right" do
       assert_match(/^test: Context with setup block/, self.to_s)
     end
@@ -89,11 +89,11 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
       setup do
         @blah = "#{@blah} twice"
       end
-      
+
       should "be named correctly" do
         assert_match(/^test: Context with setup block and a subcontext should be named correctly/, self.to_s)
       end
-      
+
       should "run the setup methods in order" do
         assert_equal @blah, "blah twice"
       end
@@ -105,7 +105,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
     setup do
       @blah = "foo"
     end
-    
+
     should "have @blah == 'foo'" do
       assert_equal "foo", @blah
     end
@@ -115,7 +115,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
     end
     should_see_blah
   end
-  
+
   should_eventually "pass, since it's a should_eventually" do
     flunk "what?"
   end
@@ -152,7 +152,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
       should "be good" do; end
       should "another" do; end
     end
-    
+
     names = context.shoulds.map {|s| s[:name]}
     assert_equal ["another", "be good"], names.sort
   end
@@ -164,7 +164,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
       setup    do; "setup";    end
       teardown do; "teardown"; end
     end
-    
+
     assert_equal "setup",    context.setup_blocks.first.call
     assert_equal "teardown", context.teardown_blocks.first.call
   end