mjankowski-shoulda 2.0.4 → 2.0.5

data/README.rdoc

@@ -90,19 +90,6 @@ Macros to test the most common controller patterns...
     end
   end
 
-Test entire controllers in a few lines...
-
-  class PostsControllerTest < Test::Unit::TestCase
-    should_be_restful do |resource|
-      resource.parent = :user
-
-      resource.create.params = { :title => "first post", :body => 'blah blah blah'}
-      resource.update.params = { :title => "changed" }
-    end
-  end
-
-should_be_restful generates 40 tests on the fly, for both html and xml requests.
-
 === Helpful Assertions (ThoughtBot::Shoulda::Assertions)
 
 More to come here, but have fun with what's there.

data/lib/shoulda/active_record/assertions.rb

@@ -66,7 +66,10 @@ module ThoughtBot # :nodoc:
         end
 
         def pretty_error_messages(obj)
-          obj.errors.map { |a, m| "#{a} #{m} (#{obj.send(a).inspect})" }
+          obj.errors.map do |a, m| 
+            msg = "#{a} #{m}" 
+            msg << " (#{obj.send(a).inspect})" unless a.to_sym == :base
+          end
         end
 
         private

data/lib/shoulda/active_record/macros.rb

@@ -516,7 +516,7 @@ module ThoughtBot # :nodoc:
               assert reflection, "#{klass.name} does not have any relationship to #{association}"
               assert_equal :has_and_belongs_to_many, reflection.macro
               table = reflection.options[:join_table]
-              assert ::ActiveRecord::Base.connection.tables.include?(table), "table #{table} doesn't exist"
+              assert ::ActiveRecord::Base.connection.tables.include?(table.to_s), "table #{table} doesn't exist"
             end
           end
         end

data/lib/shoulda/assertions.rb

@@ -25,8 +25,10 @@ module ThoughtBot # :nodoc:
         collection = [collection] unless collection.is_a?(Array)
         msg = "#{x.inspect} not found in #{collection.to_a.inspect} #{extra_msg}"
         case x
-        when Regexp: assert(collection.detect { |e| e =~ x }, msg)
-        else         assert(collection.include?(x), msg)
+        when Regexp
+          assert(collection.detect { |e| e =~ x }, msg)
+        else         
+          assert(collection.include?(x), msg)
         end
       end
 
@@ -36,8 +38,10 @@ module ThoughtBot # :nodoc:
         collection = [collection] unless collection.is_a?(Array)
         msg = "#{x.inspect} found in #{collection.to_a.inspect} " + extra_msg
         case x
-        when Regexp: assert(!collection.detect { |e| e =~ x }, msg)
-        else         assert(!collection.include?(x), msg)
+        when Regexp
+          assert(!collection.detect { |e| e =~ x }, msg)
+        else         
+          assert(!collection.include?(x), msg)
         end
       end
     end

data/lib/shoulda/context.rb

@@ -1,6 +1,6 @@
 module Thoughtbot # :nodoc:
   module Shoulda
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
 
     class << self
       attr_accessor :contexts

data/lib/shoulda/controller/macros.rb

@@ -100,7 +100,7 @@ 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
         #
@@ -227,9 +227,9 @@ module ThoughtBot # :nodoc:
         #   should_render_with_layout 'special'
         def should_render_with_layout(expected_layout = 'application')
           if expected_layout
-            should "render with #{expected_layout} layout" do
+            should "render with #{expected_layout.inspect} layout" do
               response_layout = @response.layout.blank? ? "" : @response.layout.split('/').last
-              assert_equal expected_layout,
+              assert_equal expected_layout.to_s,
                            response_layout,
                            "Expected to render with layout #{expected_layout} but was rendered with #{response_layout}"
             end
@@ -288,7 +288,7 @@ module ThoughtBot # :nodoc:
         #   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", 
+        #   should_route :get, "/users/1/posts/1",
         #     :action => :show, :id => 1, :user_id => 1
         #
         def should_route(method, path, options)

data/lib/shoulda/macros.rb

@@ -11,7 +11,7 @@ module ThoughtBot # :nodoc:
       #
       # Example:
       #
-      #   context "Creating a post"
+      #   context "Creating a post" do
       #     setup { Post.create }
       #     should_change "Post.count", :by => 1
       #   end
@@ -26,8 +26,8 @@ module ThoughtBot # :nodoc:
       # Combinations of <tt>:by</tt>, <tt>:from</tt>, and <tt>:to</tt> are allowed:
       #
       #   should_change "@post.title"                # => assert the value changed in some way
-      #   should_change "@post.title" :from => "old" # => assert the value changed to anything other than "old"
-      #   should_change "@post.title" :to   => "new" # => assert the value changed from anything other than "new"
+      #   should_change "@post.title", :from => "old" # => assert the value changed to anything other than "old"
+      #   should_change "@post.title", :to   => "new" # => assert the value changed from anything other than "new"
       def should_change(expression, options = {})
         by, from, to = get_options!([options], :by, :from, :to)
         stmt = "change #{expression.inspect}"
@@ -53,7 +53,7 @@ module ThoughtBot # :nodoc:
       #
       # Example:
       #
-      #   context "Updating a post"
+      #   context "Updating a post" do
       #     setup { @post.update_attributes(:title => "new") }
       #     should_not_change "Post.count"
       #   end

data/test/functional/posts_controller_test.rb

@@ -93,6 +93,7 @@ class PostsControllerTest < Test::Unit::TestCase
     context "viewing a post on GET to #show" do
       setup { get :show, :user_id => users(:first), :id => posts(:first) }
       should_render_with_layout 'wide'
+      should_render_with_layout :wide
     end
 
     context "on GET to #new" do

data/test/rails_root/app/models/dog.rb

@@ -1,5 +1,5 @@
 class Dog < ActiveRecord::Base
   belongs_to :user, :foreign_key => :owner_id
   belongs_to :address
-  has_and_belongs_to_many :fleas
+  has_and_belongs_to_many :fleas, :join_table => :fleas
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mjankowski-shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-07 00:00:00 -07:00
+date: 2008-10-15 00:00:00 -07:00
 default_executable: convert_to_should_syntax
 dependencies: 
 - !ruby/object:Gem::Dependency