shoulda 2.0.6 → 2.9.0

data/lib/shoulda/controller.rb

@@ -6,10 +6,10 @@ require 'shoulda/controller/macros'
 module Test # :nodoc: all
   module Unit
     class TestCase
-      extend ThoughtBot::Shoulda::Controller::Macros
-      include ThoughtBot::Shoulda::Controller::Helpers
-      ThoughtBot::Shoulda::Controller::VALID_FORMATS.each do |format|
-        include "ThoughtBot::Shoulda::Controller::#{format.to_s.upcase}".constantize
+      extend Shoulda::Controller::Macros
+      include Shoulda::Controller::Helpers
+      Shoulda::Controller::VALID_FORMATS.each do |format|
+        include "Shoulda::Controller::#{format.to_s.upcase}".constantize
       end
     end
   end
@@ -21,10 +21,10 @@ require 'shoulda/action_mailer/assertions'
 module ActionController #:nodoc: all
   module Integration
     class Session
-      include ThoughtBot::Shoulda::Assertions
-      include ThoughtBot::Shoulda::Helpers
-      include ThoughtBot::Shoulda::ActiveRecord::Assertions
-      include ThoughtBot::Shoulda::ActionMailer::Assertions
+      include Shoulda::Assertions
+      include Shoulda::Helpers
+      include Shoulda::ActiveRecord::Assertions
+      include Shoulda::ActionMailer::Assertions
     end
   end
 end

data/lib/shoulda/controller/formats/html.rb

@@ -1,196 +1,194 @@
-module ThoughtBot # :nodoc: 
-  module Shoulda # :nodoc: 
-    module Controller # :nodoc:
-      module HTML # :nodoc: all
-        def self.included(other)
-          other.class_eval do
-            extend ThoughtBot::Shoulda::Controller::HTML::ClassMethods
-          end
+module Shoulda # :nodoc: 
+  module Controller # :nodoc:
+    module HTML # :nodoc: all
+      def self.included(other)
+        other.class_eval do
+          extend Shoulda::Controller::HTML::ClassMethods
         end
-  
-        module ClassMethods 
-          def controller_name_from_class
-            self.name.gsub(/Test/, '')
-          end
+      end
 
-          def make_show_html_tests(res)
-            context "on GET to #{controller_name_from_class}#show" do
-              setup do
-                record = get_existing_record(res)
-                parent_params = make_parent_params(res, record)
-                get :show, parent_params.merge({ res.identifier => record.to_param })          
-              end
+      module ClassMethods 
+        def controller_name_from_class
+          self.name.gsub(/Test/, '')
+        end
 
-              if res.denied.actions.include?(:show)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_assign_to res.object          
-                should_respond_with :success
-                should_render_template :show
-                should_not_set_the_flash
-              end
+        def make_show_html_tests(res)
+          context "on GET to #{controller_name_from_class}#show" do
+            setup do
+              record = get_existing_record(res)
+              parent_params = make_parent_params(res, record)
+              get :show, parent_params.merge({ res.identifier => record.to_param })          
+            end
+
+            if res.denied.actions.include?(:show)
+              should_not_assign_to res.object
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash
+            else
+              should_assign_to res.object          
+              should_respond_with :success
+              should_render_template :show
+              should_not_set_the_flash
             end
           end
+        end
 
-          def make_edit_html_tests(res)
-            context "on GET to #{controller_name_from_class}#edit" do
-              setup do
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                get :edit, parent_params.merge({ res.identifier => @record.to_param })          
-              end
-        
-              if res.denied.actions.include?(:edit)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_assign_to res.object                    
-                should_respond_with :success
-                should_render_template :edit
-                should_not_set_the_flash
-                should_render_a_form
-                should "set @#{res.object} to requested instance" do
-                  assert_equal @record, assigns(res.object)
-                end
+        def make_edit_html_tests(res)
+          context "on GET to #{controller_name_from_class}#edit" do
+            setup do
+              @record = get_existing_record(res)
+              parent_params = make_parent_params(res, @record)
+              get :edit, parent_params.merge({ res.identifier => @record.to_param })          
+            end
+      
+            if res.denied.actions.include?(:edit)
+              should_not_assign_to res.object
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash
+            else
+              should_assign_to res.object                    
+              should_respond_with :success
+              should_render_template :edit
+              should_not_set_the_flash
+              should_render_a_form
+              should "set @#{res.object} to requested instance" do
+                assert_equal @record, assigns(res.object)
               end
             end
           end
+        end
 
-          def make_index_html_tests(res)
-            context "on GET to #{controller_name_from_class}#index" do
-              setup do
-                record = get_existing_record(res) rescue nil
-                parent_params = make_parent_params(res, record)
-                get(:index, parent_params)          
-              end
+        def make_index_html_tests(res)
+          context "on GET to #{controller_name_from_class}#index" do
+            setup do
+              record = get_existing_record(res) rescue nil
+              parent_params = make_parent_params(res, record)
+              get(:index, parent_params)          
+            end
 
-              if res.denied.actions.include?(:index)
-                should_not_assign_to res.object.to_s.pluralize
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash          
-              else
-                should_respond_with :success
-                should_assign_to res.object.to_s.pluralize
-                should_render_template :index
-                should_not_set_the_flash
-              end
+            if res.denied.actions.include?(:index)
+              should_not_assign_to res.object.to_s.pluralize
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash          
+            else
+              should_respond_with :success
+              should_assign_to res.object.to_s.pluralize
+              should_render_template :index
+              should_not_set_the_flash
             end
           end
+        end
 
-          def make_new_html_tests(res)
-            context "on GET to #{controller_name_from_class}#new" do
-              setup do
-                record = get_existing_record(res) rescue nil
-                parent_params = make_parent_params(res, record)
-                get(:new, parent_params)          
-              end
+        def make_new_html_tests(res)
+          context "on GET to #{controller_name_from_class}#new" do
+            setup do
+              record = get_existing_record(res) rescue nil
+              parent_params = make_parent_params(res, record)
+              get(:new, parent_params)          
+            end
 
-              if res.denied.actions.include?(:new)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_respond_with :success
-                should_assign_to res.object
-                should_not_set_the_flash
-                should_render_template :new
-                should_render_a_form
-              end
+            if res.denied.actions.include?(:new)
+              should_not_assign_to res.object
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash
+            else
+              should_respond_with :success
+              should_assign_to res.object
+              should_not_set_the_flash
+              should_render_template :new
+              should_render_a_form
             end
           end
+        end
 
-          def make_destroy_html_tests(res)
-            context "on DELETE to #{controller_name_from_class}#destroy" do
-              setup do
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                delete :destroy, parent_params.merge({ res.identifier => @record.to_param })
-              end
+        def make_destroy_html_tests(res)
+          context "on DELETE to #{controller_name_from_class}#destroy" do
+            setup do
+              @record = get_existing_record(res)
+              parent_params = make_parent_params(res, @record)
+              delete :destroy, parent_params.merge({ res.identifier => @record.to_param })
+            end
+      
+            if res.denied.actions.include?(:destroy)
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash
         
-              if res.denied.actions.include?(:destroy)
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-          
-                should "not destroy record" do
-                  assert_nothing_raised { assert @record.reload }
-                end
+              should "not destroy record" do
+                assert_nothing_raised { assert @record.reload }
+              end
+            else
+              should_set_the_flash_to res.destroy.flash
+              if res.destroy.redirect.is_a? Symbol
+                should_respond_with res.destroy.redirect
               else
-                should_set_the_flash_to res.destroy.flash
-                if res.destroy.redirect.is_a? Symbol
-                  should_respond_with res.destroy.redirect
-                else
-                  should_redirect_to res.destroy.redirect
-                end
+                should_redirect_to res.destroy.redirect
+              end
 
-                should "destroy record" do
-                  assert_raises(::ActiveRecord::RecordNotFound, "@#{res.object} was not destroyed.") do
-                    @record.reload
-                  end
+              should "destroy record" do
+                assert_raises(::ActiveRecord::RecordNotFound, "@#{res.object} was not destroyed.") do
+                  @record.reload
                 end
               end
             end
           end
+        end
 
-          def make_create_html_tests(res)
-            context "on POST to #{controller_name_from_class}#create with #{res.create.params.inspect}" do
-              setup do
-                record = get_existing_record(res) rescue nil
-                parent_params = make_parent_params(res, record)
-                @count = res.klass.count
-                post :create, parent_params.merge(res.object => res.create.params)
-              end
+        def make_create_html_tests(res)
+          context "on POST to #{controller_name_from_class}#create with #{res.create.params.inspect}" do
+            setup do
+              record = get_existing_record(res) rescue nil
+              parent_params = make_parent_params(res, record)
+              @count = res.klass.count
+              post :create, parent_params.merge(res.object => res.create.params)
+            end
+      
+            if res.denied.actions.include?(:create)
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash
+              should_not_assign_to res.object
         
-              if res.denied.actions.include?(:create)
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-                should_not_assign_to res.object
-          
-                should "not create new record" do
-                  assert_equal @count, res.klass.count
-                end          
+              should "not create new record" do
+                assert_equal @count, res.klass.count
+              end          
+            else
+              should_assign_to res.object
+              should_set_the_flash_to res.create.flash
+              if res.create.redirect.is_a? Symbol
+                should_respond_with res.create.redirect
               else
-                should_assign_to res.object
-                should_set_the_flash_to res.create.flash
-                if res.create.redirect.is_a? Symbol
-                  should_respond_with res.create.redirect
-                else
-                  should_redirect_to res.create.redirect
-                end
+                should_redirect_to res.create.redirect
+              end
 
-                should "not have errors on @#{res.object}" do
-                  assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"            
-                end
-              end      
-            end
+              should "not have errors on @#{res.object}" do
+                assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"            
+              end
+            end      
           end
+        end
 
-          def make_update_html_tests(res)
-            context "on PUT to #{controller_name_from_class}#update with #{res.create.params.inspect}" do
-              setup do
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                put :update, parent_params.merge(res.identifier => @record.to_param, res.object => res.update.params)
-              end
+        def make_update_html_tests(res)
+          context "on PUT to #{controller_name_from_class}#update with #{res.create.params.inspect}" do
+            setup do
+              @record = get_existing_record(res)
+              parent_params = make_parent_params(res, @record)
+              put :update, parent_params.merge(res.identifier => @record.to_param, res.object => res.update.params)
+            end
 
-              if res.denied.actions.include?(:update)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
+            if res.denied.actions.include?(:update)
+              should_not_assign_to res.object
+              should_redirect_to res.denied.redirect
+              should_set_the_flash_to res.denied.flash
+            else
+              should_assign_to res.object
+              should_set_the_flash_to(res.update.flash)
+              if res.update.redirect.is_a? Symbol
+                should_respond_with res.update.redirect
               else
-                should_assign_to res.object
-                should_set_the_flash_to(res.update.flash)
-                if res.update.redirect.is_a? Symbol
-                  should_respond_with res.update.redirect
-                else
-                  should_redirect_to res.update.redirect
-                end
-                
-                should "not have errors on @#{res.object}" do
-                  assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"
-                end
+                should_redirect_to res.update.redirect
+              end
+              
+              should "not have errors on @#{res.object}" do
+                assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"
               end
             end
           end

data/lib/shoulda/controller/formats/xml.rb

@@ -1,170 +1,168 @@
-module ThoughtBot # :nodoc: 
-  module Shoulda # :nodoc: 
-    module Controller # :nodoc:
-      module XML 
-        def self.included(other) #:nodoc:
-          other.class_eval do
-            extend ThoughtBot::Shoulda::Controller::XML::ClassMethods
-          end
+module Shoulda # :nodoc: 
+  module Controller # :nodoc:
+    module XML 
+      def self.included(other) #:nodoc:
+        other.class_eval do
+          extend Shoulda::Controller::XML::ClassMethods
         end
-  
-        module ClassMethods
-          # Macro that creates a test asserting that the controller responded with an XML content-type
-          # and that the XML contains +<name/>+ as the root element.
-          def should_respond_with_xml_for(name = nil)
-            should "have ContentType set to 'application/xml'" do
-              assert_xml_response
-            end
-            
-            if name
-              should "return <#{name}/> as the root element" do
-                body = @response.body.first(100).map {|l| "  #{l}"}
-                assert_select name.to_s.dasherize, 1, "Body:\n#{body}...\nDoes not have <#{name}/> as the root element."
-              end
-            end
+      end
+
+      module ClassMethods
+        # Macro that creates a test asserting that the controller responded with an XML content-type
+        # and that the XML contains +<name/>+ as the root element.
+        def should_respond_with_xml_for(name = nil)
+          should "have ContentType set to 'application/xml'" do
+            assert_xml_response
           end
-          alias should_respond_with_xml should_respond_with_xml_for
           
-          protected
-                    
-          def make_show_xml_tests(res) # :nodoc:
-            context "on GET to #{controller_name_from_class}#show as xml" do
-              setup do
-                request_xml
-                record = get_existing_record(res)
-                parent_params = make_parent_params(res, record)
-                get :show, parent_params.merge({ res.identifier => record.to_param })          
-              end
-
-              if res.denied.actions.include?(:show)
-                should_not_assign_to res.object
-                should_respond_with 401
-              else
-                should_assign_to res.object          
-                should_respond_with :success
-                should_respond_with_xml_for res.object
-              end
+          if name
+            should "return <#{name}/> as the root element" do
+              body = @response.body.first(100).map {|l| "  #{l}"}
+              assert_select name.to_s.dasherize, 1, "Body:\n#{body}...\nDoes not have <#{name}/> as the root element."
             end
           end
+        end
+        alias should_respond_with_xml should_respond_with_xml_for
+        
+        protected
+                  
+        def make_show_xml_tests(res) # :nodoc:
+          context "on GET to #{controller_name_from_class}#show as xml" do
+            setup do
+              request_xml
+              record = get_existing_record(res)
+              parent_params = make_parent_params(res, record)
+              get :show, parent_params.merge({ res.identifier => record.to_param })          
+            end
 
-          def make_edit_xml_tests(res) # :nodoc:
-            # XML doesn't need an :edit action
+            if res.denied.actions.include?(:show)
+              should_not_assign_to res.object
+              should_respond_with 401
+            else
+              should_assign_to res.object          
+              should_respond_with :success
+              should_respond_with_xml_for res.object
+            end
           end
+        end
 
-          def make_new_xml_tests(res) # :nodoc:
-            # XML doesn't need a :new action
-          end
+        def make_edit_xml_tests(res) # :nodoc:
+          # XML doesn't need an :edit action
+        end
 
-          def make_index_xml_tests(res) # :nodoc:
-            context "on GET to #{controller_name_from_class}#index as xml" do
-              setup do
-                request_xml
-                parent_params = make_parent_params(res)
-                get(:index, parent_params)          
-              end
+        def make_new_xml_tests(res) # :nodoc:
+          # XML doesn't need a :new action
+        end
 
-              if res.denied.actions.include?(:index)
-                should_not_assign_to res.object.to_s.pluralize
-                should_respond_with 401          
-              else
-                should_respond_with :success
-                should_respond_with_xml_for res.object.to_s.pluralize
-                should_assign_to res.object.to_s.pluralize
-              end
+        def make_index_xml_tests(res) # :nodoc:
+          context "on GET to #{controller_name_from_class}#index as xml" do
+            setup do
+              request_xml
+              parent_params = make_parent_params(res)
+              get(:index, parent_params)          
+            end
+
+            if res.denied.actions.include?(:index)
+              should_not_assign_to res.object.to_s.pluralize
+              should_respond_with 401          
+            else
+              should_respond_with :success
+              should_respond_with_xml_for res.object.to_s.pluralize
+              should_assign_to res.object.to_s.pluralize
             end
           end
+        end
 
-          def make_destroy_xml_tests(res) # :nodoc:
-            context "on DELETE to #{controller_name_from_class}#destroy as xml" do
-              setup do
-                request_xml
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                delete :destroy, parent_params.merge({ res.identifier => @record.to_param })
-              end
+        def make_destroy_xml_tests(res) # :nodoc:
+          context "on DELETE to #{controller_name_from_class}#destroy as xml" do
+            setup do
+              request_xml
+              @record = get_existing_record(res)
+              parent_params = make_parent_params(res, @record)
+              delete :destroy, parent_params.merge({ res.identifier => @record.to_param })
+            end
+      
+            if res.denied.actions.include?(:destroy)
+              should_respond_with 401
         
-              if res.denied.actions.include?(:destroy)
-                should_respond_with 401
-          
-                should "not destroy record" do
-                  assert @record.reload
-                end
-              else
-                should "destroy record" do
-                  assert_raises(::ActiveRecord::RecordNotFound, "@#{res.object} was not destroyed.") do
-                    @record.reload
-                  end
+              should "not destroy record" do
+                assert @record.reload
+              end
+            else
+              should "destroy record" do
+                assert_raises(::ActiveRecord::RecordNotFound, "@#{res.object} was not destroyed.") do
+                  @record.reload
                 end
               end
             end
           end
+        end
 
-          def make_create_xml_tests(res) # :nodoc:
-            context "on POST to #{controller_name_from_class}#create as xml" do
-              setup do
-                request_xml
-                parent_params = make_parent_params(res)
-                @count = res.klass.count
-                post :create, parent_params.merge(res.object => res.create.params)
-              end
+        def make_create_xml_tests(res) # :nodoc:
+          context "on POST to #{controller_name_from_class}#create as xml" do
+            setup do
+              request_xml
+              parent_params = make_parent_params(res)
+              @count = res.klass.count
+              post :create, parent_params.merge(res.object => res.create.params)
+            end
+      
+            if res.denied.actions.include?(:create)
+              should_respond_with 401
+              should_not_assign_to res.object
         
-              if res.denied.actions.include?(:create)
-                should_respond_with 401
-                should_not_assign_to res.object
-          
-                should "not create new record" do
-                  assert_equal @count, res.klass.count
-                end          
-              else
-                should_assign_to res.object
+              should "not create new record" do
+                assert_equal @count, res.klass.count
+              end          
+            else
+              should_assign_to res.object
 
-                should "not have errors on @#{res.object}" do
-                  assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"            
-                end
-              end      
-            end
+              should "not have errors on @#{res.object}" do
+                assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"            
+              end
+            end      
           end
+        end
 
-          def make_update_xml_tests(res) # :nodoc:
-            context "on PUT to #{controller_name_from_class}#update as xml" do
-              setup do
-                request_xml
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                put :update, parent_params.merge(res.identifier => @record.to_param, res.object => res.update.params)
-              end
+        def make_update_xml_tests(res) # :nodoc:
+          context "on PUT to #{controller_name_from_class}#update as xml" do
+            setup do
+              request_xml
+              @record = get_existing_record(res)
+              parent_params = make_parent_params(res, @record)
+              put :update, parent_params.merge(res.identifier => @record.to_param, res.object => res.update.params)
+            end
 
-              if res.denied.actions.include?(:update)
-                should_not_assign_to res.object
-                should_respond_with 401
-              else
-                should_assign_to res.object
+            if res.denied.actions.include?(:update)
+              should_not_assign_to res.object
+              should_respond_with 401
+            else
+              should_assign_to res.object
 
-                should "not have errors on @#{res.object}" do
-                  assert_equal [], assigns(res.object).errors.full_messages, "@#{res.object} has errors:"
-                end
+              should "not have errors on @#{res.object}" do
+                assert_equal [], assigns(res.object).errors.full_messages, "@#{res.object} has errors:"
               end
             end
           end
         end
+      end
 
-        # Sets the next request's format to 'application/xml'
-        def request_xml
-          @request.accept = "application/xml"
-        end
-        
-        # Asserts that the controller's response was 'application/xml'
-        def assert_xml_response
-          content_type = (@response.headers["Content-Type"] || @response.headers["type"]).to_s
-          regex = %r{\bapplication/xml\b}
+      # Sets the next request's format to 'application/xml'
+      def request_xml
+        @request.accept = "application/xml"
+      end
+      
+      # Asserts that the controller's response was 'application/xml'
+      def assert_xml_response
+        content_type = (@response.headers["Content-Type"] || @response.headers["type"]).to_s
+        regex = %r{\bapplication/xml\b}
 
-          msg = "Content Type '#{content_type.inspect}' doesn't match '#{regex.inspect}'\n"
-          msg += "Body: #{@response.body.first(100).chomp} ..." 
+        msg = "Content Type '#{content_type.inspect}' doesn't match '#{regex.inspect}'\n"
+        msg += "Body: #{@response.body.first(100).chomp} ..." 
 
-          assert_match regex, content_type, msg
-        end
-        
+        assert_match regex, content_type, msg
       end
+      
     end
   end
 end