rspec-rails 1.1.12 → 1.2.0

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -13,8 +13,8 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
     )
   end
 
-  it "should render edit form" do
-    render "/<%= table_name %>/edit.<%= default_file_extension %>"
+  it "renders the edit <%= file_name %> form" do
+    render
     
     response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
 <% for attribute in output_attributes -%>

data/generators/rspec_scaffold/templates/helper_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 describe <%= controller_class_name %>Helper do
   
   #Delete this example and add some real ones or delete this file
-  it "should be included in the object returned by #helper" do
+  it "is included in the helper object" do
     included_modules = (class << helper; self; end).send :included_modules
     included_modules.should include(<%= controller_class_name %>Helper)
   end

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -18,8 +18,8 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
     ]
   end
 
-  it "should render list of <%= table_name %>" do
-    render "/<%= table_name %>/index.<%= default_file_extension %>"
+  it "renders a list of <%= table_name %>" do
+    render
 <% for attribute in output_attributes -%>
     response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2)
 <% end -%>

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -13,8 +13,8 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
     )
   end
 
-  it "should render new form" do
-    render "/<%= table_name %>/new.<%= default_file_extension %>"
+  it "renders new <%= file_name %> form" do
+    render
     
     response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
 <% for attribute in output_attributes -%>

data/generators/rspec_scaffold/templates/routing_spec.rb

@@ -2,57 +2,61 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 
 describe <%= controller_class_name %>Controller do
   describe "route generation" do
-    it "should map #index" do
+    it "maps #index" do
       route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>"
     end
   
-    it "should map #new" do
+    it "maps #new" do
       route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
     end
   
-    it "should map #show" do
-      route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1"
+    it "maps #show" do
+      route_for(:controller => "<%= table_name %>", :action => "show", :id => "1").should == "/<%= table_name %>/1"
     end
   
-    it "should map #edit" do
-      route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>"
-    end
-  
-    it "should map #update" do
-      route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1"
+    it "maps #edit" do
+      route_for(:controller => "<%= table_name %>", :action => "edit", :id => "1").should == "/<%= table_name %>/1/edit"
     end
+
+  it "maps #create" do
+    route_for(:controller => "<%= table_name %>", :action => "create").should == {:path => "/<%= table_name %>", :method => :post}
+  end
+
+  it "maps #update" do
+    route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :put}
+  end
   
-    it "should map #destroy" do
-      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1"
+    it "maps #destroy" do
+      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :delete}
     end
   end
 
   describe "route recognition" do
-    it "should generate params for #index" do
+    it "generates params for #index" do
       params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"}
     end
   
-    it "should generate params for #new" do
+    it "generates params for #new" do
       params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"}
     end
   
-    it "should generate params for #create" do
+    it "generates params for #create" do
       params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"}
     end
   
-    it "should generate params for #show" do
+    it "generates params for #show" do
       params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"}
     end
   
-    it "should generate params for #edit" do
-      params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
+    it "generates params for #edit" do
+      params_from(:get, "/<%= table_name %>/1/edit").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
     end
   
-    it "should generate params for #update" do
+    it "generates params for #update" do
       params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"}
     end
   
-    it "should generate params for #destroy" do
+    it "generates params for #destroy" do
       params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"}
     end
   end

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -13,8 +13,8 @@ describe "/<%= table_name %>/show.<%= default_file_extension %>" do
 <% end -%>
   end
 
-  it "should render attributes in <p>" do
-    render "/<%= table_name %>/show.<%= default_file_extension %>"
+  it "renders attributes in <p>" do
+    render
 <% for attribute in output_attributes -%>
     response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/)
 <% end -%>

data/lib/spec/rails.rb

@@ -1,17 +1,18 @@
-silence_warnings { RAILS_ENV = "test" }
+RAILS_ENV ||= "test"
 
 begin
   require_dependency 'application_controller'
 rescue MissingSourceFile
   require_dependency 'application'
 end
+require 'rack/utils'
 
 require 'action_controller/test_process'
 require 'action_controller/integration'
+require 'active_support/test_case'
 require 'active_record/fixtures' if defined?(ActiveRecord::Base)
-require 'test/unit'
 
-require 'spec'
+require 'spec/test/unit'
 
 require 'spec/rails/matchers'
 require 'spec/rails/mocks'
@@ -19,9 +20,9 @@ require 'spec/rails/example'
 require 'spec/rails/extensions'
 require 'spec/rails/interop/testcase'
 
-if Rails::VERSION::STRING >= "2.0"
-  # This is a temporary hack to get rspec's auto-runner functionality to not consider
-  # ActionMailer::TestCase to be a spec waiting to run.
-  require 'action_mailer/test_case'
-  Spec::Example::ExampleGroupFactory.register(:ignore_for_now, ActionMailer::TestCase)
-end
+Spec::Example::ExampleGroupFactory.default(ActiveSupport::TestCase)
+
+if ActionView::Base.respond_to?(:cache_template_extension)
+  ActionView::Base.cache_template_extensions = false
+end
+

data/lib/spec/rails/example.rb

@@ -1,14 +1,14 @@
 dir = File.dirname(__FILE__)
 
+require 'spec/rails/example/routing_helpers'
 require 'spec/rails/example/assigns_hash_proxy'
-
 require "spec/rails/example/render_observer"
-require "spec/rails/example/rails_example_group"
 require "spec/rails/example/model_example_group"
 require "spec/rails/example/functional_example_group"
 require "spec/rails/example/controller_example_group"
 require "spec/rails/example/helper_example_group"
 require "spec/rails/example/view_example_group"
+require "spec/rails/example/routing_example_group"
 require "spec/rails/example/cookies_proxy"
 
 module Spec

data/lib/spec/rails/example/assigns_hash_proxy.rb

@@ -8,8 +8,7 @@ module Spec
         end
 
         def [](key)
-          return false if assigns[key] == false
-          return false if assigns[key.to_s] == false
+          return false if false == assigns[key] || false == assigns[key.to_s]
           assigns[key] || assigns[key.to_s] || @target.instance_variable_get("@#{key}")
         end
 

data/lib/spec/rails/example/controller_example_group.rb

@@ -3,21 +3,22 @@ module Spec
     module Example
       # Controller Examples live in $RAILS_ROOT/spec/controllers/.
       #
-      # Controller Examples use Spec::Rails::Example::ControllerExampleGroup, which supports running specs for
-      # Controllers in two modes, which represent the tension between the more granular
-      # testing common in TDD and the more high level testing built into
-      # rails. BDD sits somewhere in between: we want to a balance between
-      # specs that are close enough to the code to enable quick fault
-      # isolation and far enough away from the code to enable refactoring
-      # with minimal changes to the existing specs.
+      # Controller Examples use Spec::Rails::Example::ControllerExampleGroup,
+      # which supports running specs for Controllers in two modes, which
+      # represent the tension between the more granular testing common in TDD
+      # and the more high level testing built into rails. BDD sits somewhere
+      # in between: we want to a balance between specs that are close enough
+      # to the code to enable quick fault isolation and far enough away from
+      # the code to enable refactoring with minimal changes to the existing
+      # specs.
       #
       # == Isolation mode (default)
       #
-      # No dependencies on views because none are ever rendered. The
-      # benefit of this mode is that can spec the controller completely
-      # independent of the view, allowing that responsibility to be
-      # handled later, or by somebody else. Combined w/ separate view
-      # specs, this also provides better fault isolation.
+      # No dependencies on views because none are ever rendered. The benefit
+      # of this mode is that can spec the controller completely independent of
+      # the view, allowing that responsibility to be handled later, or by
+      # somebody else. Combined w/ separate view specs, this also provides
+      # better fault isolation.
       #
       # == Integration mode
       #
@@ -28,13 +29,12 @@ module Spec
       #     integrate_views
       #     ...
       #
-      # In this mode, controller specs are run in the same way that
-      # rails functional tests run - one set of tests for both the
-      # controllers and the views. The benefit of this approach is that
-      # you get wider coverage from each spec. Experienced rails
-      # developers may find this an easier approach to begin with, however
-      # we encourage you to explore using the isolation mode and revel
-      # in its benefits.
+      # In this mode, controller specs are run in the same way that rails
+      # functional tests run - one set of tests for both the controllers and
+      # the views. The benefit of this approach is that you get wider coverage
+      # from each spec. Experienced rails developers may find this an easier
+      # approach to begin with, however we encourage you to explore using the
+      # isolation mode and revel in its benefits.
       #
       # == Expecting Errors
       #
@@ -44,14 +44,15 @@ module Spec
       class ControllerExampleGroup < FunctionalExampleGroup
         class << self
                     
-          # Use this to instruct RSpec to render views in your controller examples (Integration Mode).
+          # Use integrate_views to instruct RSpec to render views in
+          # your controller examples in Integration mode.
           #
           #   describe ThingController do
           #     integrate_views
           #     ...
           #
-          # See Spec::Rails::Example::ControllerExampleGroup for more information about
-          # Integration and Isolation modes.
+          # See Spec::Rails::Example::ControllerExampleGroup for more
+          # information about Integration and Isolation modes.
           def integrate_views(integrate_views = true)
             @integrate_views = integrate_views
           end
@@ -61,23 +62,33 @@ module Spec
           end
           
           def inherited(klass) # :nodoc:
-            klass.controller_class_name = controller_class_name
             klass.integrate_views(integrate_views?)
+            klass.subject { controller }
             super
           end
+          
+          def set_description(*args) # :nodoc:
+            super
+            if described_class && described_class.ancestors.include?(ActionController::Base)
+              tests described_class
+            end
+          end
 
-          # You MUST provide a controller_name within the context of
+          # When you don't pass a controller to describe, like this:
+          #
+          #   describe ThingsController do
+          #
+          # ... then you must provide a controller_name within the context of
           # your controller specs:
           #
           #   describe "ThingController" do
           #     controller_name :thing
           #     ...
           def controller_name(name)
-            @controller_class_name = "#{name}_controller".camelize
+            tests "#{name}_controller".camelize.constantize
           end
-          attr_accessor :controller_class_name # :nodoc:
         end
-
+        
         before(:each) do
           # Some Rails apps explicitly disable ActionMailer in environment.rb
           if defined?(ActionMailer)
@@ -86,19 +97,20 @@ module Spec
           end
 
           unless @controller.class.ancestors.include?(ActionController::Base)
-            Spec::Expectations.fail_with <<-EOE
-            You have to declare the controller name in controller specs. For example:
-            describe "The ExampleController" do
-            controller_name "example" #invokes the ExampleController
-            end
-            EOE
-          end
-          (class << @controller; self; end).class_eval do
-            def controller_path #:nodoc:
-              self.class.name.underscore.gsub('_controller', '')
-            end
-            include ControllerInstanceMethods
+            Spec::Expectations.fail_with <<-MESSAGE
+Controller specs need to know what controller is being specified. You can
+indicate this by passing the controller to describe():
+
+  describe MyController do
+    
+or by declaring the controller's name
+
+  describe "a MyController" do
+    controller_name :my #invokes the MyController
+end
+MESSAGE
           end
+          @controller.extend ControllerInstanceMethods
           @controller.integrate_views! if @integrate_views
           @controller.session = session
         end
@@ -107,92 +119,81 @@ module Spec
 
         def initialize(defined_description, options={}, &implementation) #:nodoc:
           super
-          controller_class_name = self.class.controller_class_name
-          if controller_class_name
-            @controller_class_name = controller_class_name.to_s
-          else
-            @controller_class_name = self.class.described_type.to_s
-          end
           @integrate_views = self.class.integrate_views?
         end
-
-        # Uses ActionController::Routing::Routes to generate
-        # the correct route for a given set of options.
-        # == Example
-        #   route_for(:controller => 'registrations', :action => 'edit', :id => 1)
-        #     => '/registrations/1;edit'
-        def route_for(options)
-          ensure_that_routes_are_loaded
-          ActionController::Routing::Routes.generate(options)
-        end
-
-        # Uses ActionController::Routing::Routes to parse
-        # an incoming path so the parameters it generates can be checked
-        # == Example
-        #   params_from(:get, '/registrations/1;edit')
-        #     => :controller => 'registrations', :action => 'edit', :id => 1
-        def params_from(method, path)
-          ensure_that_routes_are_loaded
-          ActionController::Routing::Routes.recognize_path(path, :method => method)
+        
+        # Bypasses any error rescues defined with rescue_from. Useful
+        # in cases in which you want to specify errors coming out of
+        # actions that might be caught by a rescue_from clause that is
+        # specified separately.
+        #
+        # Note that this will override the effect of rescue_action_in_public
+        def bypass_rescue
+          if ::Rails::VERSION::STRING >= '2.2'
+            def controller.rescue_action(exception)
+              raise exception
+            end
+          else
+            def controller.rescue_action_with_handler(exception)
+              raise exception
+            end
+          end
         end
+        
+      protected
 
-        protected
         def _assigns_hash_proxy
-          @_assigns_hash_proxy ||= AssignsHashProxy.new self do
-            @response.template
-          end
+          @_assigns_hash_proxy ||= AssignsHashProxy.new(self) {@response.template}
         end
 
+      private
+        
+        module TemplateIsolationExtensions
+          def file_exists?(ignore); true; end
+          
+          def render_file(*args)
+            @first_render ||= args[0] unless args[0] =~ /^layouts/
+          end
+          
+          # Rails 2.2
+          def _pick_template(*args)
+            @_first_render ||= args[0] unless args[0] =~ /^layouts/
+            PickedTemplate.new
+          end
+          
+          def render(*args)
+            return super if Hash === args.last && args.last[:inline]
+            @_rendered ? record_render(args[0]) : super
+          end
+        
         private
-        def ensure_that_routes_are_loaded
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
+        
+          def record_render(opts)
+            (@_rendered[:template] ||= opts[:file]) if opts[:file]
+            (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+          end
+          
+          # Returned by _pick_template when running controller examples in isolation mode.
+          class PickedTemplate 
+            # Do nothing when running controller examples in isolation mode.
+            def render_template(*ignore_args); end
+            # Do nothing when running controller examples in isolation mode.
+            def render_partial(*ignore_args);  end
+          end
         end
-
-        module ControllerInstanceMethods #:nodoc:
+        
+        module ControllerInstanceMethods # :nodoc:
           include Spec::Rails::Example::RenderObserver
 
-          # === render(options = nil, deprecated_status_or_extra_options = nil, &block)
+          # === render(options = nil, extra_options={}, &block)
           #
           # This gets added to the controller's singleton meta class,
           # allowing Controller Examples to run in two modes, freely switching
-          # from context to context.
-          def render(options=nil, deprecated_status_or_extra_options=nil, &block)
-            if ::Rails::VERSION::STRING >= '2.0.0' && deprecated_status_or_extra_options.nil?
-              deprecated_status_or_extra_options = {}
-            end
-              
+          # from example group to example group.
+          def render(options=nil, extra_options={}, &block)
             unless block_given?
               unless integrate_views?
-                if @template.respond_to?(:finder)
-                  (class << @template.finder; self; end).class_eval do
-                    define_method :file_exists? do; true; end
-                  end
-                else
-                  (class << @template; self; end).class_eval do
-                    define_method :file_exists? do; true; end
-                  end
-                end
-                (class << @template; self; end).class_eval do
-                  define_method :render_file do |*args|
-                    @first_render ||= args[0] unless args[0] =~ /^layouts/
-                    @_first_render ||= args[0] unless args[0] =~ /^layouts/
-                  end
-                  
-                  define_method :_pick_template do |*args|
-                    @_first_render ||= args[0] unless args[0] =~ /^layouts/
-                    PickedTemplate.new
-                  end
-                  
-                  define_method :render do |*args|
-                    if @_rendered
-                      opts = args[0]
-                      (@_rendered[:template] ||= opts[:file]) if opts[:file]
-                      (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
-                    else
-                      super
-                    end
-                  end
-                end
+                @template.extend TemplateIsolationExtensions
               end
             end
 
@@ -203,7 +204,7 @@ module Spec
               if matching_stub_exists(options)
                 @performed_render = true
               else
-                super(options, deprecated_status_or_extra_options, &block)
+                super
               end
             end
           end
@@ -211,38 +212,31 @@ module Spec
           def response(&block)
             # NOTE - we're setting @update for the assert_select_spec - kinda weird, huh?
             @update = block
-            @_response || @response
+            super
           end
 
           def integrate_views!
             @integrate_views = true
           end
 
-          private
-
+        private
+        
           def integrate_views?
             @integrate_views
           end
 
           def matching_message_expectation_exists(options)
-            render_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+            render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
           end
         
           def matching_stub_exists(options)
-            render_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
+            render_proxy.__send__(:__mock_proxy).__send__(:find_matching_method_stub, :render, options)
           end
         
         end
 
         Spec::Example::ExampleGroupFactory.register(:controller, self)
-      end
-      
-      # Returned by _pick_template when running controller examples in isolation mode.
-      class PickedTemplate 
-        # Do nothing when running controller examples in isolation mode.
-        def render_template(*ignore_args); end
-        # Do nothing when running controller examples in isolation mode.
-        def render_partial(*ignore_args);  end
+        
       end
     end
   end