shoulda 2.9.1 → 2.9.2

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

@@ -0,0 +1,83 @@
+module Shoulda # :nodoc:
+  module ActionController # :nodoc:
+    module Matchers
+
+      # Ensures that a session key was set to the expected value.
+      #
+      # Example:
+      #
+      #   it { should set_session(:message) }
+      #   it { should set_session(:user_id).to(@user.id) }
+      #   it { should_not set_session(:user_id) }
+      def set_session(key)
+        SetSessionMatcher.new(key)
+      end
+
+      class SetSessionMatcher # :nodoc:
+
+        def initialize(key)
+          @key = key.to_s
+        end
+
+        def to(value)
+          @value = value
+          self
+        end
+
+        def matches?(controller)
+          @controller = controller
+          assigned_value? && assigned_correct_value?
+        end
+
+        def failure_message
+          "Expected #{expectation}, but #{result}"
+        end
+
+        def negative_failure_message
+          "Didn't expect #{expectation}, but #{result}"
+        end
+
+        def description
+          description = "set session variable #{@key.inspect}"
+          description << " to #{@value.inspect}" if @value
+          description
+        end
+
+        private
+
+        def assigned_value?
+          !assigned_value.blank?
+        end
+
+        def assigned_correct_value?
+          return true if @value.nil?
+          assigned_value == @value
+        end
+
+        def assigned_value
+          session[@key]
+        end
+
+        def session
+          @controller.response.session.data
+        end
+
+        def expectation
+          expectation = "session variable #{@key} to be set"
+          expectation << " to #{@value.inspect}" if @value
+          expectation
+        end
+
+        def result
+          if session.empty?
+            "no session variables were set"
+          else
+            "the session was #{session.inspect}"
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+module Shoulda # :nodoc:
+  module ActionController # :nodoc:
+    module Matchers
+
+      # Ensures that the flash contains the given value. Can be a String, a
+      # Regexp, or nil (indicating that the flash should not be set).
+      #
+      # Example:
+      #
+      #   it { should set_the_flash }
+      #   it { should set_the_flash.to("Thank you for placing this order.") }
+      #   it { should set_the_flash.to(/created/i) }
+      #   it { should_not set_the_flash }
+      def set_the_flash
+        SetTheFlashMatcher.new
+      end
+
+      class SetTheFlashMatcher # :nodoc:
+
+        def to(value)
+          @value = value
+          self
+        end
+
+        def matches?(controller)
+          @controller = controller
+          sets_the_flash? && string_value_matches? && regexp_value_matches?
+        end
+
+        attr_reader :failure_message, :negative_failure_message
+
+        def description
+          description = "set the flash"
+          description << " to #{@value.inspect}" unless @value.nil?
+          description
+        end
+
+        def failure_message
+          "Expected #{expectation}"
+        end
+
+        def negative_failure_message
+          "Did not expect #{expectation}"
+        end
+
+        private
+
+        def sets_the_flash?
+          !flash.blank?
+        end
+
+        def string_value_matches?
+          return true unless String === @value
+          flash.values.any? {|value| value == @value }
+        end
+
+        def regexp_value_matches?
+          return true unless Regexp === @value
+          flash.values.any? {|value| value =~ @value }
+        end
+
+        def flash
+          @controller.response.session['flash']
+        end
+
+        def expectation
+          expectation = "the flash to be set"
+          expectation << " to #{@value.inspect}" unless @value.nil?
+          expectation << ", but #{flash_description}"
+          expectation
+        end
+
+        def flash_description
+          if flash.blank?
+            "no flash was set"
+          else
+            "was #{flash.inspect}"
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/shoulda/action_view.rb

@@ -0,0 +1,10 @@
+require 'shoulda'
+require 'shoulda/action_view/macros'
+
+module Test # :nodoc: all
+  module Unit
+    class TestCase
+      extend Shoulda::ActionView::Macros
+    end
+  end
+end

data/lib/shoulda/action_view/macros.rb

@@ -0,0 +1,56 @@
+module Shoulda # :nodoc:
+  module ActionView # :nodoc:
+    # = Macro test helpers for your view
+    #
+    # By using the macro helpers you can quickly and easily create concise and
+    # easy to read test suites.
+    #
+    # This code segment:
+    #   context "on GET to :new" do
+    #     setup do
+    #       get :new
+    #     end
+    #
+    #     should_render_a_form
+    #     should_render_page_with_metadata :title => /index/
+    #
+    #     should "do something else really cool" do
+    #       assert_select '#really_cool'
+    #     end
+    #   end
+    #
+    # Would produce 3 tests for the +show+ action
+    module Macros
+
+      # Macro that creates a test asserting that the rendered view contains a <form> element.
+      def should_render_a_form
+        should "display a form" do
+          assert_select "form", true, "The template doesn't contain a <form> element"
+        end
+      end
+
+      # Macro that creates a test asserting that the rendered view contains the selected metatags.
+      # Values can be string or Regexps.
+      # Example:
+      #
+      #   should_render_page_with_metadata :description => "Description of this page", :keywords => /post/
+      #
+      # You can also use this method to test the rendered views title.
+      #
+      # Example:
+      #   should_render_page_with_metadata :title => /index/
+      def should_render_page_with_metadata(options)
+        options.each do |key, value|
+          should "have metatag #{key}" do
+            if key.to_sym == :title
+              assert_select "title", value
+            else
+              assert_select "meta[name=?][content#{"*" if value.is_a?(Regexp)}=?]", key, value
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/shoulda/active_record/macros.rb

@@ -23,14 +23,6 @@ module Shoulda # :nodoc:
       include Helpers
       include Matchers
 
-      # <b>DEPRECATED:</b> Use <tt>fixtures :all</tt> instead
-      #
-      # Loads all fixture files (<tt>test/fixtures/*.yml</tt>)
-      def load_all_fixtures
-        warn "[DEPRECATION] load_all_fixtures is deprecated.  Use `fixtures :all` instead."
-        fixtures :all
-      end
-
       # Ensures that the model cannot be saved if one of the attributes listed is not present.
       #
       # If an instance variable has been created in the setup named after the
@@ -304,13 +296,16 @@ module Shoulda # :nodoc:
       #   should_ensure_value_in_range :age, (0..100)
       #
       def should_ensure_value_in_range(attribute, range, opts = {})
-        message = get_options!([opts], :message)
-        message ||= default_error_message(:inclusion)
-
+        message, low_message, high_message = get_options!([opts],
+                                                          :message,
+                                                          :low_message,
+                                                          :high_message)
         klass = model_class
         matcher = ensure_inclusion_of(attribute).
           in_range(range).
-          with_message(message)
+          with_message(message).
+          with_low_message(low_message).
+          with_high_message(high_message)
         should matcher.description do
           assert_accepts matcher, get_instance_of(klass)
         end
@@ -341,7 +336,7 @@ module Shoulda # :nodoc:
         end
       end
 
-      # Deprecated. See should_validate_uniqueness_of
+      # Deprecated. See should_validate_numericality_of
       def should_only_allow_numeric_values_for(*attributes)
         warn "[DEPRECATION] should_only_allow_numeric_values_for is " <<
              "deprecated. Use should_validate_numericality_of instead."

data/lib/shoulda/active_record/matchers/validate_uniqueness_of_matcher.rb

@@ -77,9 +77,9 @@ module Shoulda # :nodoc:
 
         def find_existing
           if @existing = @subject.class.find(:first)
-            @failure_message = "Can't find first #{class_name}"
             true
           else
+            @failure_message = "Can't find first #{class_name}"
             false
           end
         end

data/lib/shoulda/rails.rb

@@ -2,9 +2,10 @@ require 'rubygems'
 require 'active_support'
 require 'shoulda'
 
-require 'shoulda/active_record' if defined? ActiveRecord::Base
-require 'shoulda/controller'    if defined? ActionController::Base
-require 'shoulda/action_mailer' if defined? ActionMailer::Base
+require 'shoulda/active_record'     if defined? ActiveRecord::Base
+require 'shoulda/action_controller' if defined? ActionController::Base
+require 'shoulda/action_view'       if defined? ActionView::Base
+require 'shoulda/action_mailer'     if defined? ActionMailer::Base
 
 if defined?(RAILS_ROOT)
   # load in the 3rd party macros from vendorized plugins and gems

data/lib/shoulda/rspec.rb

@@ -1,9 +1,11 @@
 require 'shoulda/active_record/matchers'
+require 'shoulda/action_controller/matchers'
+require 'active_support/test_case'
 
-module Spec
-  module Rails
-    module Matchers
-      include Shoulda::ActiveRecord::Matchers
-    end
+# :enddoc:
+module ActiveSupport
+  class TestCase
+    include Shoulda::ActiveRecord::Matchers
+    include Shoulda::ActionController::Matchers
   end
 end

data/test/functional/posts_controller_test.rb

@@ -33,44 +33,27 @@ class PostsControllerTest < Test::Unit::TestCase
   should_route :get,    '/users/5/posts/new', :action => :new, :user_id => 5
   should_route :put,    '/users/5/posts/1',   :action => :update, :id => 1, :user_id => 5
 
-  context "The public" do
-    setup do
-      @request.session[:logged_in] = false
-    end
-
-    should_be_restful do |resource|
-      resource.parent = :user
-
-      resource.denied.actions = [:index, :show, :edit, :new, :create, :update, :destroy]
-      resource.denied.flash = /what/i
-      resource.denied.redirect = '"/"'
-    end
-  end
-
   context "Logged in" do
     setup do
       @request.session[:logged_in] = true
     end
 
-    should_be_restful do |resource|
-      resource.parent = :user
-
-      resource.create.params = { :title => "first post", :body => 'blah blah blah'}
-      resource.update.params = { :title => "changed" }
-    end
-
     context "viewing posts for a user" do
       setup do
         get :index, :user_id => users(:first)
       end
       should_respond_with :success
       should_assign_to :user, :class => User, :equals => 'users(:first)'
+      should_assign_to(:user) { users(:first) }
       should_fail do
         should_assign_to :user, :class => Post
       end
       should_fail do
         should_assign_to :user, :equals => 'posts(:first)'
       end
+      should_fail do
+        should_assign_to(:user) { posts(:first) }
+      end
       should_assign_to :posts
       should_not_assign_to :foo, :bar
       should_render_page_with_metadata :description => /Posts/, :title => /index/
@@ -87,7 +70,12 @@ class PostsControllerTest < Test::Unit::TestCase
       should_respond_with_content_type :rss
       should_respond_with_content_type /rss/
       should_return_from_session :special, "'$2 off your next purchase'"
-      should_return_from_session :special_user_id, '@user.id'
+      should_set_session :special, "'$2 off your next purchase'"
+      should_set_session :special_user_id, '@user.id'
+      should_set_session(:special_user_id) { @user.id }
+      should_fail do
+        should_set_session(:special_user_id) { 'value' }
+      end
       should_assign_to :user, :posts
       should_not_assign_to :foo, :bar
     end
@@ -103,6 +91,24 @@ class PostsControllerTest < Test::Unit::TestCase
       setup { get :new, :user_id => users(:first) }
       should_render_without_layout
     end
+
+    context "on POST to #create" do
+      setup do
+        post :create, :user_id => users(:first),
+                      :post    => { :title => "first post",
+                                    :body  => 'blah blah blah' }
+      end
+
+      should_redirect_to 'user_post_url(@post.user, @post)'
+      should_redirect_to('the created post') { user_post_url(users(:first),
+                                                             assigns(:post)) }
+      should_fail do
+        should_redirect_to 'user_posts_url(@post.user)'
+      end
+      should_fail do
+        should_redirect_to('elsewhere') { user_posts_url(users(:first)) }
+      end
+    end
   end
 
 end

data/test/functional/users_controller_test.rb

@@ -16,23 +16,4 @@ class UsersControllerTest < Test::Unit::TestCase
   
   should_filter_params :ssn
 
-  should_be_restful do |resource|
-    resource.identifier = :id
-    resource.klass      = User
-    resource.object     = :user
-    resource.parent     = []
-    resource.actions    = [:index, :show, :new, :edit, :update, :create, :destroy]
-    resource.formats    = [:html, :xml]
-
-    resource.create.params = { :name => "bob", :email => 'bob@bob.com', :age => 13, :ssn => "123456789"}
-    resource.update.params = { :name => "sue" }
-
-    resource.create.redirect  = "user_url(@user)"
-    resource.update.redirect  = "user_url(@user)"
-    resource.destroy.redirect = "users_url"
-
-    resource.create.flash  = /created/i
-    resource.update.flash  = /updated/i
-    resource.destroy.flash = /removed/i
-  end
 end

data/test/matchers/{allow_mass_assignment_of_matcher_test.rb → active_record/allow_mass_assignment_of_matcher_test.rb}

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

data/test/matchers/{allow_value_matcher_test.rb → active_record/allow_value_matcher_test.rb}

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