shoulda 2.10.3 → 2.11.0

data/Rakefile

@@ -10,7 +10,7 @@ load 'tasks/shoulda.rake'
 # Test::Unit::UI::VERBOSE
 test_files_pattern = 'test/{unit,functional,other,matchers}/**/*_test.rb'
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
+  t.libs << 'lib' << 'test'
   t.pattern = test_files_pattern
   t.verbose = false
 end
@@ -35,28 +35,15 @@ task :sync_docs => 'rdoc' do
   `rsync -ave ssh doc/ dev@dev.thoughtbot.com:/home/dev/www/dev.thoughtbot.com/shoulda`
 end
 
-desc 'Default: run tests.'
-task :default => ['test']
-
-spec = Gem::Specification.new do |s|
-  s.name              = "shoulda"
-  s.version           = Shoulda::VERSION
-  s.summary           = "Making tests easy on the fingers and eyes"
-  s.homepage          = "http://thoughtbot.com/projects/shoulda"
-  s.rubyforge_project = "shoulda"
-
-  s.files       = FileList["[A-Z]*", "{bin,lib,rails,test}/**/*"]
-  s.executables = s.files.grep(/^bin/) { |f| File.basename(f) }
-
-  s.has_rdoc         = true
-  s.extra_rdoc_files = ["README.rdoc", "CONTRIBUTION_GUIDELINES.rdoc"]
-  s.rdoc_options     = ["--line-numbers", "--main", "README.rdoc"]
-
-  s.authors = ["Tammer Saleh"]
-  s.email   = "tsaleh@thoughtbot.com"
+desc 'Default: run tests for all supported versions of Rails'
+task :default do
+  %w(2.3.8 3.0.0.beta3).each do |version|
+    system("RAILS_VERSION=#{version} rake -s test;")
+  end
 end
 
-Rake::GemPackageTask.new spec do |pkg|
+eval("$specification = begin; #{IO.read('shoulda.gemspec')}; end")
+Rake::GemPackageTask.new $specification do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end
@@ -64,9 +51,3 @@ end
 desc "Clean files generated by rake tasks"
 task :clobber => [:clobber_rdoc, :clobber_package]
 
-desc "Generate a gemspec file for GitHub"
-task :gemspec do
-  File.open("#{spec.name}.gemspec", 'w') do |f|
-    f.write spec.to_ruby
-  end
-end

data/lib/shoulda.rb

@@ -1,6 +1,4 @@
-module Shoulda
-  VERSION = "2.10.3"
-end
+require 'shoulda/version'
 
 if defined? Spec
   require 'shoulda/rspec'

data/lib/shoulda/action_controller.rb

@@ -24,3 +24,11 @@ module ActionController #:nodoc: all
     end
   end
 end
+
+if defined?(ActionController::TestCase)
+  class ActionController::TestCase
+    def subject
+      @controller
+    end
+  end
+end

data/lib/shoulda/action_controller/macros.rb

@@ -24,37 +24,30 @@ module Shoulda # :nodoc:
     module Macros
       include Matchers
 
+      # Deprecated: use ActionController::Matchers#set_the_flash instead.
+      #
       # Macro that creates a test asserting that the flash contains the given
       # value. Expects a +String+ or +Regexp+.
       #
-      # If the argument is +nil+, it will assert that the flash is not set.
-      # This behavior is deprecated.
-      #
       # Example:
       #
       #   should_set_the_flash_to "Thank you for placing this order."
       #   should_set_the_flash_to /created/i
       def should_set_the_flash_to(val)
-        if val
-          matcher = set_the_flash.to(val)
-          should matcher.description do
-            assert_accepts matcher, @controller
-          end
-        else
-          warn "[DEPRECATION] should_set_the_flash_to nil is deprecated. " <<
-               "Use should_not_set_the_flash instead."
-          should_not_set_the_flash
-        end
+        ::ActiveSupport::Deprecation.warn("use: should set_the_flash")
+        should set_the_flash.to(val)
       end
 
+      # Deprecated: use ActionController::Matchers#set_the_flash instead.
+      #
       # Macro that creates a test asserting that the flash is empty.
       def should_not_set_the_flash
-        matcher = set_the_flash
-        should "not #{matcher.description}" do
-          assert_rejects matcher, @controller
-        end
+        ::ActiveSupport::Deprecation.warn("use: should_not set_the_flash")
+        should_not set_the_flash
       end
 
+      # Deprecated: use ActionController::Matchers#filter_param instead.
+      #
       # Macro that creates a test asserting that filter_parameter_logging
       # is set for the specified keys
       #
@@ -62,14 +55,14 @@ module Shoulda # :nodoc:
       #
       #   should_filter_params :password, :ssn
       def should_filter_params(*keys)
+        ::ActiveSupport::Deprecation.warn("use: should filter_param")
         keys.each do |key|
-          matcher = filter_param(key)
-          should matcher.description do
-            assert_accepts matcher, @controller
-          end
+          should filter_param(key)
         end
       end
 
+      # Deprecated: use ActionController::Matchers#assign_to instead.
+      #
       # Macro that creates a test asserting that the controller assigned to
       # each of the named instance variable(s).
       #
@@ -85,20 +78,17 @@ module Shoulda # :nodoc:
       #   should_assign_to :user, :class => User
       #   should_assign_to(:user) { @user }
       def should_assign_to(*names, &block)
+        ::ActiveSupport::Deprecation.warn("use: should assign_to")
         klass = get_options!(names, :class)
         names.each do |name|
           matcher = assign_to(name).with_kind_of(klass)
-          should matcher.description do
-            if block
-              expected_value = instance_eval(&block)
-              matcher = matcher.with(expected_value)
-            end
-
-            assert_accepts matcher, @controller
-          end
+          matcher = matcher.with(&block) if block
+          should matcher
         end
       end
 
+      # Deprecated: use ActionController::Matchers#assign_to instead.
+      #
       # Macro that creates a test asserting that the controller did not assign to
       # any of the named instance variable(s).
       #
@@ -106,25 +96,25 @@ module Shoulda # :nodoc:
       #
       #   should_not_assign_to :user, :posts
       def should_not_assign_to(*names)
+        ::ActiveSupport::Deprecation.warn("use: should_not assign_to")
         names.each do |name|
-          matcher = assign_to(name)
-          should "not #{matcher.description}" do
-            assert_rejects matcher, @controller
-          end
+          should_not assign_to(name)
         end
       end
 
+      # Deprecated: use ActionController::Matchers#respond_with instead.
+      #
       # Macro that creates a test asserting that the controller responded with a 'response' status code.
       # Example:
       #
       #   should_respond_with :success
       def should_respond_with(response)
-        should "respond with #{response}" do
-          matcher = respond_with(response)
-          assert_accepts matcher, @controller
-        end
+        ::ActiveSupport::Deprecation.warn("use: should respond_with")
+        should respond_with(response)
       end
 
+      # Deprecated: use ActionController::Matchers#respond_with_content_type instead.
+      #
       # Macro that creates a test asserting that the response content type was 'content_type'.
       # Example:
       #
@@ -132,12 +122,12 @@ module Shoulda # :nodoc:
       #   should_respond_with_content_type :rss
       #   should_respond_with_content_type /rss/
       def should_respond_with_content_type(content_type)
-        matcher = respond_with_content_type(content_type)
-        should matcher.description do
-          assert_accepts matcher, @controller
-        end
+        ::ActiveSupport::Deprecation.warn("use: should respond_with_content_type")
+        should respond_with_content_type(content_type)
       end
 
+      # Deprecated: use ActionController::Matchers#set_session instead.
+      #
       # Macro that creates a test asserting that a value returned from the
       # session is correct. Expects the session key as a parameter, and a block
       # that returns the expected value.
@@ -147,47 +137,45 @@ module Shoulda # :nodoc:
       #   should_set_session(:user_id) { @user.id }
       #   should_set_session(:message) { "Free stuff" }
       def should_set_session(key, &block)
+        ::ActiveSupport::Deprecation.warn("use: should set_session")
         matcher = set_session(key)
-        should matcher.description do
-          expected_value = instance_eval(&block)
-          matcher = matcher.to(expected_value)
-          assert_accepts matcher, @controller
-        end
+        matcher = matcher.to(&block) if block
+        should matcher
       end
 
+      # Deprecated: use ActionController::Matchers#render_template instead.
+      #
       # Macro that creates a test asserting that the controller rendered the given template.
       # Example:
       #
       #   should_render_template :new
       def should_render_template(template)
-        should "render template #{template.inspect}" do
-          assert_template template.to_s
-        end
+        ::ActiveSupport::Deprecation.warn("use: should render_template")
+        should render_template(template)
       end
 
+      # Deprecated: use ActionController::Matchers#render_with_layout instead.
+      #
       # Macro that creates a test asserting that the controller rendered with the given layout.
       # Example:
       #
       #   should_render_with_layout 'special'
       def should_render_with_layout(expected_layout = 'application')
-        matcher = render_with_layout(expected_layout)
-        if expected_layout
-          should matcher.description do
-            assert_accepts matcher, @controller
-          end
-        else
-          should "render without layout" do
-            assert_rejects matcher, @controller
-          end
-        end
+        ::ActiveSupport::Deprecation.warn("use: should render_with_layout")
+        should render_with_layout(expected_layout)
       end
 
+      # Deprecated: use ActionController::Matchers#render_with_layout instead.
+      #
       # Macro that creates a test asserting that the controller rendered without a layout.
       # Same as @should_render_with_layout false@
       def should_render_without_layout
-        should_render_with_layout nil
+        ::ActiveSupport::Deprecation.warn("use: should_not render_with_layout")
+        should_not render_with_layout
       end
 
+      # Deprecated: use ActionController::Matchers#redirect_to instead.
+      #
       # Macro that creates a test asserting that the controller returned a
       # redirect to the given path. The passed description will be used when
       # generating a test name. Expects a block that returns the expected path
@@ -197,12 +185,12 @@ module Shoulda # :nodoc:
       #
       #   should_redirect_to("the user's profile") { user_url(@user) }
       def should_redirect_to(description, &block)
-        should "redirect to #{description}" do
-          expected_url = instance_eval(&block)
-          assert_redirected_to expected_url
-        end
+        ::ActiveSupport::Deprecation.warn("use: should redirect_to")
+        should redirect_to(description, &block)
       end
 
+      # Deprecated: use ActionController::Matchers#route instead.
+      #
       # Macro that creates a routing test. It tries to use the given HTTP
       # +method+ on the given +path+, and asserts that it routes to the
       # given +options+.
@@ -225,15 +213,8 @@ module Shoulda # :nodoc:
       #     :action => :show, :id => 1, :user_id => 1
       #
       def should_route(method, path, options)
-        unless options[:controller]
-          options[:controller] = self.name.gsub(/ControllerTest$/, '').tableize
-        end
-
-        matcher = route(method, path).to(options)
-
-        should matcher.description do
-          assert_accepts matcher.in_context(self), self
-        end
+        ::ActiveSupport::Deprecation.warn("use: should route")
+        should route(method, path).to(options)
       end
     end
   end

data/lib/shoulda/action_controller/matchers.rb

@@ -6,6 +6,8 @@ require 'shoulda/action_controller/matchers/respond_with_matcher'
 require 'shoulda/action_controller/matchers/respond_with_content_type_matcher'
 require 'shoulda/action_controller/matchers/set_session_matcher'
 require 'shoulda/action_controller/matchers/route_matcher'
+require 'shoulda/action_controller/matchers/redirect_to_matcher'
+require 'shoulda/action_controller/matchers/render_template_matcher'
 
 module Shoulda # :nodoc:
   module ActionController # :nodoc:

data/lib/shoulda/action_controller/matchers/assign_to_matcher.rb

@@ -30,13 +30,15 @@ module Shoulda # :nodoc:
           self
         end
 
-        def with(expected_value)
+        def with(expected_value = nil, &block)
           @expected_value = expected_value
+          @expectation_block = block
           self
         end
 
         def matches?(controller)
           @controller = controller
+          @expected_value = @context.instance_eval(&@expectation_block) if @expectation_block
           assigned_value? && kind_of_expected_class? && equal_to_expected_value?
         end
 
@@ -48,6 +50,11 @@ module Shoulda # :nodoc:
           description
         end
 
+        def in_context(context)
+          @context = context
+          self
+        end
+
         private
 
         def assigned_value?
@@ -95,11 +102,7 @@ module Shoulda # :nodoc:
         end
 
         def assigned_value
-          assigns[@variable]
-        end
-
-        def assigns
-          @controller.response.template.assigns 
+          @controller.instance_variable_get("@#{@variable}")
         end
 
       end

data/lib/shoulda/action_controller/matchers/filter_param_matcher.rb

@@ -37,7 +37,8 @@ module Shoulda # :nodoc:
         private
 
         def filters_params?
-          @controller.respond_to?(:filter_parameters)
+          @controller.respond_to?(:filter_parameters) ||
+            request.respond_to?(:filtered_parameters)
         end
 
         def filters_key?
@@ -45,11 +46,27 @@ module Shoulda # :nodoc:
         end
 
         def filtered_value
+          if request.respond_to?(:filtered_parameters)
+            filtered_request_value
+          else
+            filtered_controller_value
+          end
+        end
+
+        def filtered_controller_value
           filtered = @controller.send(:filter_parameters,
                                       @key.to_s => @key.to_s)
           filtered[@key.to_s]
         end
 
+        def filtered_request_value
+          request.env['action_dispatch.request.parameters'] = { @key.to_s => 'value' }
+          request.filtered_parameters[@key.to_s]
+        end
+
+        def request
+          @request ||= ::ActionController::TestRequest.new
+        end
       end
 
     end

data/lib/shoulda/action_controller/matchers/redirect_to_matcher.rb

@@ -0,0 +1,62 @@
+module Shoulda # :nodoc:
+  module ActionController # :nodoc:
+    module Matchers
+
+      # Ensures a controller redirected to the given url.
+      #
+      # Example:
+      #
+      #   it { should redirect_to('http://somewhere.com')  }
+      #   it { should redirect_to(users_path)  }
+      def redirect_to(url_or_description, &block)
+        RedirectToMatcher.new(url_or_description, self, &block)
+      end
+
+      class RedirectToMatcher # :nodoc:
+
+        def initialize(url_or_description, context, &block)
+          if block
+            @url_block = block
+            @location = @url_or_description
+          else
+            @url = url_or_description
+            @location = @url
+          end
+          @context = context
+        end
+
+        def in_context(context)
+          @context = context
+          self
+        end
+
+        def matches?(controller)
+          @controller = controller
+          redirects_to_url?
+        end
+
+        attr_reader :failure_message, :negative_failure_message
+
+        def description
+          "redirect to #{@location}"
+        end
+
+        private
+
+        def redirects_to_url?
+          @url = @context.instance_eval(&@url_block) if @url_block
+          begin
+            @context.send(:assert_redirected_to, @url)
+            @negative_failure_message = "Didn't expect to redirect to #{@url}"
+            true
+          rescue Test::Unit::AssertionFailedError => error
+            @failure_message = error.message
+            false
+          end
+        end
+
+      end
+
+    end
+  end
+end