shoulda 2.10.3 → 2.11.0

data/test/matchers/active_record/allow_mass_assignment_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class AllowMassAssignmentOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
@@ -63,6 +63,12 @@ class AllowMassAssignmentOfMatcherTest < ActiveSupport::TestCase # :nodoc:
     should "accept being mass-assignable" do
       assert_accepts allow_mass_assignment_of(:attr), @model
     end
+
+    should "assign a negative failure message" do
+      matcher = allow_mass_assignment_of(:attr)
+      matcher.matches?(@model)
+      assert_not_nil matcher.negative_failure_message
+    end
   end
 
 end

data/test/matchers/active_record/allow_value_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class AllowValueMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/association_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class AssociationMatcherTest < ActiveSupport::TestCase # :nodoc:
 
@@ -166,55 +166,55 @@ class AssociationMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "have_one" do
     setup do
-      @matcher = have_one(:profile)
+      @matcher = have_one(:detail)
     end
 
     should "accept a valid association without any options" do
-      define_model :profile, :person_id => :integer
+      define_model :detail, :person_id => :integer
       define_model :person do
-        has_one :profile
+        has_one :detail
       end
       assert_accepts @matcher, Person.new
     end
 
     should "accept a valid association with an :as option" do
-      define_model :profile, :profilable_id   => :integer,
-                                  :profilable_type => :string
+      define_model :detail, :detailable_id   => :integer,
+                                  :detailable_type => :string
       define_model :person do
-        has_one :profile, :as => :profilable
+        has_one :detail, :as => :detailable
       end
       assert_accepts @matcher, Person.new
     end
 
     should "reject an association that has a nonexistent foreign key" do
-      define_model :profile
+      define_model :detail
       define_model :person do
-        has_one :profile
+        has_one :detail
       end
       assert_rejects @matcher, Person.new
     end
 
     should "reject an association with a bad :as option" do
-      define_model :profile, :profilable_id   => :integer,
-                                  :profilable_type => :string
+      define_model :detail, :detailable_id   => :integer,
+                                  :detailable_type => :string
       define_model :person do
-        has_one :profile, :as => :describable
+        has_one :detail, :as => :describable
       end
       assert_rejects @matcher, Person.new
     end
 
     should "accept an association with a valid :dependent option" do
-      define_model :profile, :person_id => :integer
+      define_model :detail, :person_id => :integer
       define_model :person do
-        has_one :profile, :dependent => :destroy
+        has_one :detail, :dependent => :destroy
       end
       assert_accepts @matcher.dependent(:destroy), Person.new
     end
 
     should "reject an association with a bad :dependent option" do
-      define_model :profile, :person_id => :integer
+      define_model :detail, :person_id => :integer
       define_model :person do
-        has_one :profile
+        has_one :detail
       end
       assert_rejects @matcher.dependent(:destroy), Person.new
     end

data/test/matchers/active_record/ensure_inclusion_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class EnsureInclusionOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
@@ -56,7 +56,8 @@ class EnsureInclusionOfMatcherTest < ActiveSupport::TestCase # :nodoc:
   context "an attribute with custom range validations" do
     setup do
       define_model :example, :attr => :integer do
-        def validate
+        validate :custom_validation
+        def custom_validation
           if attr < 2
             errors.add(:attr, 'too low')
           elsif attr > 5

data/test/matchers/active_record/ensure_length_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class EnsureLengthOfMatcher < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/have_db_column_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class HaveDbColumnMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/have_db_index_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class HaveDbIndexMatcherTest < ActiveSupport::TestCase # :nodoc:
   

data/test/matchers/active_record/have_readonly_attributes_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class HaveReadonlyAttributesMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/validate_acceptance_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class ValidateAcceptanceOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/validate_format_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class ValidateFormatOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/validate_numericality_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class ValidateNumericalityOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/validate_presence_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class ValidatePresenceOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/active_record/validate_uniqueness_of_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class ValidateUniquenessOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 

data/test/matchers/controller/assign_to_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class AssignToMatcherTest < ActionController::TestCase # :nodoc:
 
@@ -30,6 +30,16 @@ class AssignToMatcherTest < ActionController::TestCase # :nodoc:
     should "reject assigning to another variable" do
       assert_rejects assign_to(:other), @controller
     end
+
+    should "accept assigning to the same value in the test context" do
+      @expected = 'value'
+      assert_accepts assign_to(:var).with { @expected }, @controller
+    end
+
+    should "reject assigning to the another value in the test context" do
+      @expected = 'other'
+      assert_rejects assign_to(:var).with { @expected }, @controller
+    end
   end
 
 end

data/test/matchers/controller/filter_param_matcher_test.rb

@@ -1,9 +1,12 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class FilterParamMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller that filters no parameters" do
     setup do
+      if Rails.respond_to?(:application)
+        Rails.application.config.filter_parameters = []
+      end
       @controller = define_controller(:examples).new
     end
 
@@ -14,8 +17,13 @@ class FilterParamMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller that filters a parameter" do
     setup do
+      if Rails.respond_to?(:application)
+        Rails.application.config.filter_parameters = [:password]
+      end
       @controller = define_controller :examples do
-        filter_parameter_logging :password
+        unless Rails.respond_to?(:application)
+          filter_parameter_logging :password
+        end
       end.new
     end
 

data/test/matchers/controller/redirect_to_matcher_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class RedirectToMatcherTest < ActionController::TestCase # :nodoc:
+
+  context "a controller that redirects" do
+    setup do
+      @controller = build_response { redirect_to '/some/url' }
+    end
+
+    should "accept redirecting to that url" do
+      assert_accepts redirect_to('/some/url'), @controller
+    end
+
+    should "reject redirecting to a different url" do
+      assert_rejects redirect_to('/some/other/url'), @controller
+    end
+
+    should "accept redirecting to that url in a block" do
+      assert_accepts redirect_to('somewhere') { '/some/url' }, @controller
+    end
+
+    should "reject redirecting to a different url in a block" do
+      assert_rejects redirect_to('somewhere else') { '/some/other/url' }, @controller
+    end
+  end
+
+  context "a  controller that doesn't redirect" do
+    setup do
+      @controller = build_response { render :text => 'hello' }
+    end
+
+    should "reject redirecting to a url" do
+      assert_rejects redirect_to('/some/url'), @controller
+    end
+  end
+
+end

data/test/matchers/controller/render_template_matcher_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class RenderTemplateMatcherTest < ActionController::TestCase # :nodoc:
+
+  context "a controller that renders a template" do
+    setup do
+      @controller = build_response(:action => 'show') { render }
+    end
+
+    should "accept rendering that template" do
+      assert_accepts render_template(:show), @controller
+    end
+
+    should "reject rendering a different template" do
+      assert_rejects render_template(:index), @controller
+    end
+
+    should "accept rendering that template in the given context" do
+      assert_accepts self.class.render_template(:show).in_context(self), @controller
+    end
+
+    should "reject rendering a different template in the given context" do
+      assert_rejects self.class.render_template(:index).in_context(self), @controller
+    end
+  end
+
+  context "a  controller that doesn't render a template" do
+    setup do
+      @controller = build_response { render :nothing => true }
+    end
+
+    should "reject rendering a template" do
+      assert_rejects render_template(:show), @controller
+    end
+  end
+
+end

data/test/matchers/controller/render_with_layout_matcher_test.rb

@@ -1,9 +1,10 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class RenderWithLayoutMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller that renders with a layout" do
     setup do
+      create_view('layouts/wide.html.erb', 'some content, <%= yield %>')
       @controller = build_response { render :layout => 'wide' }
     end
 
@@ -30,4 +31,17 @@ class RenderWithLayoutMatcherTest < ActionController::TestCase # :nodoc:
     end
   end
 
+  context "given a context with layouts" do
+    setup do
+      @layout = 'happy'
+      @controller = build_response { render :layout => false }
+      @layouts = Hash.new(0)
+      @layouts[@layout] = 1
+    end
+
+    should "accept that layout in that context" do
+      assert_accepts render_with_layout(@layout).in_context(self), @controller
+    end
+  end
+
 end

data/test/matchers/controller/respond_with_content_type_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class RespondWithContentTypeMatcherTest < ActionController::TestCase # :nodoc:
 

data/test/matchers/controller/respond_with_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class RespondWithMatcherTest < ActionController::TestCase # :nodoc:
 
@@ -91,16 +91,6 @@ class RespondWithMatcherTest < ActionController::TestCase # :nodoc:
       assert_rejects respond_with(:success), @controller
     end
   end
-  
-  context "a controller raising an error" do
-    setup do
-      @controller = build_response { raise RailsError }
-    end
-
-    should "reject responding with any status" do
-      assert_rejects respond_with(:success), @controller
-    end
-  end
 
 end
 

data/test/matchers/controller/route_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class RouteToMatcherTest < ActionController::TestCase # :nodoc:
 

data/test/matchers/controller/set_session_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class SetSessionMatcherTest < ActionController::TestCase # :nodoc:
 
@@ -33,6 +33,16 @@ class SetSessionMatcherTest < ActionController::TestCase # :nodoc:
     should "accept assigning false to that variable" do
       assert_accepts set_session(:false_var).to(false), @controller
     end
+
+    should "accept assigning to the same value in the test context" do
+      @expected = 'value'
+      assert_accepts set_session(:var).to { @expected }, @controller
+    end
+
+    should "reject assigning to the another value in the test context" do
+      @expected = 'other'
+      assert_rejects set_session(:var).to { @expected }, @controller
+    end
   end
 
 end

data/test/matchers/controller/set_the_flash_matcher.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class SetTheFlashMatcherTest < ActionController::TestCase # :nodoc:
 

data/test/other/autoload_macro_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class AutoloadMacroTest < ActiveSupport::TestCase # :nodoc:
   context "The macro auto-loader" do

data/test/other/context_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class ContextTest < ActiveSupport::TestCase # :nodoc:
   
@@ -158,11 +158,6 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
       assert_kind_of SomeModel, subject
     end
 
-    should "return an existing instance of the described type as the subject" do
-      @some_model = SomeModel.new
-      assert_equal @some_model, subject
-    end
-
     context "with an explicit subject block" do
       setup { @expected = SomeModel.new }
       subject { @expected }
@@ -179,6 +174,163 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
   end
 end
 
+class ShouldMatcherTest < Test::Unit::TestCase
+  class FakeMatcher
+    attr_reader :subject
+    attr_accessor :fail
+
+    def description
+      "do something"
+    end
+
+    def matches?(subject)
+      @subject = subject
+      !@fail
+    end
+
+    def failure_message
+      "a failure message"
+    end
+
+    def negative_failure_message
+      "not a failure message"
+    end
+  end
+
+  def run_test
+    @test_suite.run(@test_result) { |event, name |}
+  end
+
+  def setup
+    @matcher = FakeMatcher.new
+    @test_result = Test::Unit::TestResult.new
+    class << @test_result
+      def failure_messages
+        @failures.map { |failure| failure.message }
+      end
+    end
+  end
+
+  def create_test_suite(&definition)
+    test_class = Class.new(Test::Unit::TestCase, &definition)
+    test_class.suite
+  end
+
+  def assert_failed_with(message, test_result)
+    assert_equal 1, test_result.failure_count
+    assert_equal [message], test_result.failure_messages
+  end
+
+  def assert_passed(test_result)
+    assert_equal 0, test_result.failure_count
+  end
+
+  def assert_test_named(expected_name, test_suite)
+    name = test_suite.tests.map { |test| test.method_name }.first
+    assert name.include?(expected_name), "Expected #{name} to include #{expected_name}"
+  end
+
+  def self.should_use_positive_matcher
+    should "generate a test using the matcher's description" do
+      assert_test_named "should #{@matcher.description}", @test_suite
+    end
+
+    should "pass with a passing matcher" do
+      @matcher.fail = false
+      run_test
+      assert_passed @test_result
+    end
+
+    should "fail with a failing matcher" do
+      @matcher.fail = true
+      run_test
+      assert_failed_with @matcher.failure_message, @test_result
+    end
+
+    should "provide the subject" do
+      @matcher.fail = false
+      run_test
+      assert_equal 'a subject', @matcher.subject
+    end
+  end
+
+  def self.should_use_negative_matcher
+    should "generate a test using the matcher's description" do
+      assert_test_named "should not #{@matcher.description}", @test_suite
+    end
+
+    should "pass with a failing matcher" do
+      @matcher.fail = true
+      run_test
+      assert_passed @test_result
+    end
+
+    should "fail with a passing matcher" do
+      @matcher.fail = false
+      run_test
+      assert_failed_with @matcher.negative_failure_message, @test_result
+    end
+
+    should "provide the subject" do
+      @matcher.fail = false
+      run_test
+      assert_equal 'a subject', @matcher.subject
+    end
+  end
+
+  context "a should block with a matcher" do
+    setup do
+      matcher = @matcher
+      @test_suite = create_test_suite do
+        subject { 'a subject' }
+        should matcher
+      end
+    end
+
+    should_use_positive_matcher
+  end
+
+  context "a should block with a matcher within a context" do
+    setup do
+      matcher = @matcher
+      @test_suite = create_test_suite do
+        context "in context" do
+          subject { 'a subject' }
+          should matcher
+        end
+      end
+    end
+
+    should_use_positive_matcher
+  end
+
+  context "a should_not block with a matcher" do
+    setup do
+      matcher = @matcher
+      @test_suite = create_test_suite do
+        subject { 'a subject' }
+        should_not matcher
+      end
+    end
+
+    should_use_negative_matcher
+  end
+
+  context "a should_not block with a matcher within a context" do
+    setup do
+      matcher = @matcher
+      @test_suite = create_test_suite do
+        context "in context" do
+          subject { 'a subject' }
+          should_not matcher
+        end
+      end
+    end
+
+    should_use_negative_matcher
+  end
+end
+
 class Subject; end
 
 class SubjectTest < ActiveSupport::TestCase
@@ -196,8 +348,25 @@ end
 
 class SubjectLazinessTest < ActiveSupport::TestCase
   subject { Subject.new }
-  
+
   should "only build the subject once" do
     assert_equal subject, subject
   end
-end
+end
+
+class SomeController < ActionController::Base
+end
+
+class ControllerSubjectTest < ActionController::TestCase
+  tests SomeController
+
+  should "use the controller as the subject outside a context" do
+    assert_equal @controller, subject
+  end
+
+  context "in a context" do
+    should "use the controller as the subject" do
+      assert_equal @controller, subject
+    end
+  end
+end