technicalpickles-shoulda 2.0.1 → 2.0.2

data/lib/shoulda/active_record/macros.rb

@@ -3,7 +3,7 @@ module ThoughtBot # :nodoc:
     module ActiveRecord # :nodoc:
       DEFAULT_ERROR_MESSAGES =
         if Object.const_defined?(:I18n)
-          I18n.translate('active_record.error_messages')
+          I18n.translate('activerecord.errors.messages')
         else
           ::ActiveRecord::Errors.default_error_messages
         end
@@ -28,8 +28,9 @@ module ThoughtBot # :nodoc:
       # For all of these helpers, the last parameter may be a hash of options.
       #
       module Macros
+        # <b>DEPRECATED:</b> Use <tt>fixtures :all</tt> instead
+        #
         # Loads all fixture files (<tt>test/fixtures/*.yml</tt>)
-        # Deprecated: Use <tt>fixtures :all</tt> instead
         def load_all_fixtures
           warn "[DEPRECATION] load_all_fixtures is deprecated.  Use `fixtures :all` instead."
           fixtures :all
@@ -43,7 +44,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:blank]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:blank]</tt>
         #
         # Example:
         #   should_require_attributes :name, :phone_number
@@ -65,7 +66,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:taken]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:taken]</tt>
         # * <tt>:scoped_to</tt> - field(s) to scope the uniqueness to.
         #
         # Examples:
@@ -163,7 +164,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:invalid]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:invalid]</tt>
         #
         # Example:
         #   should_not_allow_values_for :isbn, "bad 1", "bad 2"
@@ -206,9 +207,9 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:short_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:too_short] % range.first</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:too_short] % range.first</tt>
         # * <tt>:long_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:too_long] % range.last</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:too_long] % range.last</tt>
         #
         # Example:
         #   should_ensure_length_in_range :password, (6..20)
@@ -258,7 +259,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:short_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:too_short] % min_length</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:too_short] % min_length</tt>
         #
         # Example:
         #   should_ensure_length_at_least :name, 3
@@ -289,7 +290,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:wrong_length] % length</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:wrong_length] % length</tt>
         #
         # Example:
         #   should_ensure_length_is :ssn, 9
@@ -324,9 +325,9 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:low_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:inclusion]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:inclusion]</tt>
         # * <tt>:high_message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:inclusion]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:inclusion]</tt>
         #
         # Example:
         #   should_ensure_value_in_range :age, (0..100)
@@ -369,7 +370,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:not_a_number]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:not_a_number]</tt>
         #
         # Example:
         #   should_only_allow_numeric_values_for :age
@@ -602,7 +603,7 @@ module ThoughtBot # :nodoc:
         #   should_have_index :age
         #
         def should_have_indices(*columns)
-          table = model_class.name.tableize
+          table = model_class.table_name
           indices = ::ActiveRecord::Base.connection.indexes(table).map(&:columns)
 
           columns.each do |column|
@@ -623,7 +624,7 @@ module ThoughtBot # :nodoc:
         #
         # Options:
         # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-        #   Regexp or string.  Default = <tt>I18n.translate('active_record.error_messages')[:accepted]</tt>
+        #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages')[:accepted]</tt>
         #
         # Example:
         #   should_require_acceptance_of :eula

data/lib/shoulda/context.rb

@@ -1,6 +1,6 @@
 module Thoughtbot # :nodoc:
   module Shoulda
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
 
     class << self
       attr_accessor :contexts
@@ -73,12 +73,12 @@ module Thoughtbot # :nodoc:
 
     # == Before statements
     #
-    # Before statements are simply should statements that run after the current
+    # Before statements are should statements that run before the current
     # context's setup. These are especially useful when setting expectations.
     #
     # === Example:
     #
-    #  class UserControllerTest << Test::Unit::TestCase
+    #  class UserControllerTest < Test::Unit::TestCase
     #    context "the index action" do
     #      setup do
     #        @users = [Factory(:user)]
@@ -86,14 +86,11 @@ module Thoughtbot # :nodoc:
     #      end
     #
     #      context "on GET" do
-    #        setup do
-    #          get :index
-    #        end
+    #        setup { get :index }
     #
-    #        # normal should statement
     #        should_respond_with :success
     #
-    #        # runs before get :index
+    #        # runs before "get :index"
     #        before_should "find all users" do
     #          User.expects(:find).with(:all).returns(@users)
     #        end

data/lib/shoulda/controller/macros.rb

@@ -26,7 +26,10 @@ module ThoughtBot # :nodoc:
       # Furthermore, the should_be_restful helper will create an entire set of tests which will verify that your
       # controller responds restfully to a variety of requested formats.
       module Macros
-        # :section: should_be_restful
+        # <b>DEPRECATED:</b> Please see
+        # http://thoughtbot.lighthouseapp.com/projects/5807/tickets/78 for more
+        # information.
+        #
         # Generates a full suite of tests for a restful controller.
         #
         # The following definition will generate tests for the +index+, +show+, +new+,
@@ -52,6 +55,8 @@ module ThoughtBot # :nodoc:
         # is used to configure the tests for the details of your resources.
         #
         def should_be_restful(&blk) # :yields: resource
+          warn "[DEPRECATION] should_be_restful is deprecated.  Please see http://thoughtbot.lighthouseapp.com/projects/5807/tickets/78 for more information."
+
           resource = ResourceOptions.new
           blk.call(resource)
           resource.normalize!(self)
@@ -95,17 +100,56 @@ module ThoughtBot # :nodoc:
         def should_not_set_the_flash
           should_set_the_flash_to nil
         end
+        
+        # Macro that creates a test asserting that filter_parameter_logging
+        # is set for the specified keys
+        #
+        # Example:
+        #
+        #   should_filter_params :password, :ssn
+        def should_filter_params(*keys)
+          keys.each do |key|
+            should "filter #{key}" do
+              assert @controller.respond_to?(:filter_parameters),
+                "The key #{key} is not filtered"
+              filtered = @controller.send(:filter_parameters, {key.to_s => key.to_s})
+              assert_equal '[FILTERED]', filtered[key.to_s],
+                "The key #{key} is not filtered"
+            end
+          end
+        end
 
         # Macro that creates a test asserting that the controller assigned to
         # each of the named instance variable(s).
         #
+        # Options:
+        # * <tt>:class</tt> - The expected class of the instance variable being checked.
+        # * <tt>:equals</tt> - A string which is evaluated and compared for equality with
+        # the instance variable being checked.
+        #
         # Example:
         #
         #   should_assign_to :user, :posts
+        #   should_assign_to :user, :class => User
+        #   should_assign_to :user, :equals => '@user'
         def should_assign_to(*names)
+          opts = names.extract_options!
           names.each do |name|
-            should "assign @#{name}" do
-              assert assigns(name.to_sym), "The action isn't assigning to @#{name}"
+            test_name = "assign @#{name}"
+            test_name << " as class #{opts[:class]}" if opts[:class]
+            test_name << " which is equal to #{opts[:equals]}" if opts[:equals]
+            should test_name do
+              assigned_value = assigns(name.to_sym)
+              assert assigned_value, "The action isn't assigning to @#{name}"
+              assert_kind_of opts[:class], assigned_value if opts[:class]
+              if opts[:equals]
+                instantiate_variables_from_assigns do
+                  expected_value = eval(opts[:equals], self.send(:binding), __FILE__, __LINE__)
+                  assert_equal expected_value, assigned_value,
+                               "Instance variable @#{name} expected to be #{expected_value}" +
+                               " but was #{assigned_value}"
+                end
+              end
             end
           end
         end
@@ -138,6 +182,8 @@ module ThoughtBot # :nodoc:
         # Example:
         #
         #   should_respond_with_content_type 'application/rss+xml'
+        #   should_respond_with_content_type :rss
+        #   should_respond_with_content_type /rss/
         def should_respond_with_content_type(content_type)
           should "respond with content type of #{content_type}" do
             content_type = Mime::EXTENSION_LOOKUP[content_type.to_s].to_s if content_type.is_a? Symbol
@@ -183,13 +229,13 @@ module ThoughtBot # :nodoc:
           if expected_layout
             should "render with #{expected_layout} layout" do
               response_layout = @response.layout.blank? ? "" : @response.layout.split('/').last
-              assert_equal expected_layout, 
-                           response_layout, 
+              assert_equal expected_layout,
+                           response_layout,
                            "Expected to render with layout #{expected_layout} but was rendered with #{response_layout}"
             end
           else
             should "render without layout" do
-              assert_nil @response.layout, 
+              assert_nil @response.layout,
                          "Expected no layout, but was rendered using #{@response.layout}"
             end
           end
@@ -222,7 +268,7 @@ module ThoughtBot # :nodoc:
             assert_select "form", true, "The template doesn't contain a <form> element"
           end
         end
-        
+
         # 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+.
@@ -234,13 +280,16 @@ module ThoughtBot # :nodoc:
         #
         # Examples:
         #
-        #   should_route :get, '/posts', :action => :index
-        #   should_route :post, '/posts', :controller => :posts, :action => :create
-        #   should_route :get, '/posts/1', :action => :show, :id => 1
-        #   should_route :put, '/posts/1', :action => :update, :id => "1"
-        #   should_route :delete, '/posts/1', :action => :destroy, :id => 1
-        #   should_route :get, '/posts/new', :action => :new
-        # 
+        #   should_route :get, "/posts", :controller => :posts, :action => :index
+        #   should_route :get, "/posts/new", :action => :new
+        #   should_route :post, "/posts", :action => :create
+        #   should_route :get, "/posts/1", :action => :show, :id => 1
+        #   should_route :edit, "/posts/1", :action => :show, :id => 1
+        #   should_route :put, "/posts/1", :action => :update, :id => 1
+        #   should_route :delete, "/posts/1", :action => :destroy, :id => 1
+        #   should_route :get, "/users/1/posts/1", 
+        #     :action => :show, :id => 1, :user_id => 1
+        #
         def should_route(method, path, options)
           unless options[:controller]
             options[:controller] = self.name.gsub(/ControllerTest$/, '').tableize

data/lib/shoulda/macros.rb

@@ -12,10 +12,7 @@ module ThoughtBot # :nodoc:
       # Example:
       #
       #   context "Creating a post"
-      #     setup do
-      #       Post.create
-      #     end
-      #
+      #     setup { Post.create }
       #     should_change "Post.count", :by => 1
       #   end
       #
@@ -57,10 +54,7 @@ module ThoughtBot # :nodoc:
       # Example:
       #
       #   context "Updating a post"
-      #     setup do
-      #       @post.update_attributes(:title => "new")
-      #     end
-      #
+      #     setup { @post.update_attributes(:title => "new") }
       #     should_not_change "Post.count"
       #   end
       def should_not_change(expression)

data/lib/shoulda.rb

@@ -3,6 +3,7 @@ require 'shoulda/proc_extensions'
 require 'shoulda/assertions'
 require 'shoulda/macros'
 require 'shoulda/helpers'
+require 'shoulda/rails' if defined? RAILS_ROOT
 
 module Test # :nodoc: all
   module Unit

data/rails/init.rb

@@ -0,0 +1 @@
+require 'shoulda/rails'

data/test/fail_macros.rb

@@ -0,0 +1,34 @@
+module Thoughtbot
+  module Shoulda
+    class << self
+      attr_accessor :expected_exceptions
+    end
+
+    # Enables the core shoulda test suite to test for failure scenarios.  For
+    # example, to ensure that a set of test macros should fail, do this:
+    #
+    #   should_fail do
+    #     should_require_attributes :comments
+    #     should_protect_attributes :name
+    #   end
+    def should_fail(&block)
+      context "should fail when trying to run:" do
+        Shoulda.expected_exceptions = [Test::Unit::AssertionFailedError]
+        yield block
+        Shoulda.expected_exceptions = nil
+      end
+    end
+
+    class Context
+      # alias_method_chain hack to allow the should_fail macro to work
+      def should_with_failure_scenario(name, options = {}, &block)
+        if Shoulda.expected_exceptions
+          expected_exceptions = Shoulda.expected_exceptions
+          failure_block = lambda { assert_raise(*expected_exceptions, &block.bind(self)) }
+        end
+        should_without_failure_scenario(name, options, &(failure_block || block))
+      end
+      alias_method_chain :should, :failure_scenario
+    end
+  end
+end

data/test/functional/posts_controller_test.rb

@@ -64,7 +64,14 @@ class PostsControllerTest < Test::Unit::TestCase
         get :index, :user_id => users(:first)
       end
       should_respond_with :success
-      should_assign_to :user, :posts
+      should_assign_to :user, :class => User, :equals => 'users(:first)'
+      should_fail do
+        should_assign_to :user, :class => Post
+      end
+      should_fail do
+        should_assign_to :user, :equals => 'posts(:first)'
+      end
+      should_assign_to :posts
       should_not_assign_to :foo, :bar
     end
 

data/test/functional/users_controller_test.rb

@@ -13,6 +13,8 @@ class UsersControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
     @user       = User.find(:first)
   end
+  
+  should_filter_params :ssn
 
   should_be_restful do |resource|
     resource.identifier = :id

data/test/rails_root/app/controllers/users_controller.rb

@@ -1,4 +1,7 @@
 class UsersController < ApplicationController
+  
+  filter_parameter_logging :ssn
+  
   # GET /users
   # GET /users.xml
   def index

data/test/rails_root/app/views/layouts/wide.html.erb

@@ -0,0 +1 @@
+<html><%= yield %></html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 -07:00
+date: 2008-09-20 00:00:00 -07:00
 default_executable: convert_to_should_syntax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,9 +53,6 @@ files:
 - lib/shoulda/controller/helpers.rb
 - lib/shoulda/controller/macros.rb
 - lib/shoulda/controller/resource_options.rb
-- lib/shoulda/controller/routing
-- lib/shoulda/controller/routing/macros.rb
-- lib/shoulda/controller/routing.rb
 - lib/shoulda/controller.rb
 - lib/shoulda/helpers.rb
 - lib/shoulda/macros.rb
@@ -67,6 +64,9 @@ files:
 - lib/shoulda/tasks/yaml_to_shoulda.rake
 - lib/shoulda/tasks.rb
 - lib/shoulda.rb
+- rails
+- rails/init.rb
+- test/fail_macros.rb
 - test/fixtures
 - test/fixtures/addresses.yml
 - test/fixtures/friendships.yml
@@ -108,6 +108,7 @@ files:
 - test/rails_root/app/views/layouts
 - test/rails_root/app/views/layouts/posts.rhtml
 - test/rails_root/app/views/layouts/users.rhtml
+- test/rails_root/app/views/layouts/wide.html.erb
 - test/rails_root/app/views/posts
 - test/rails_root/app/views/posts/edit.rhtml
 - test/rails_root/app/views/posts/index.rhtml