rspec-rails 1.1.12 → 1.2.0

data/spec/spec/rails/matchers/render_template_spec.rb

@@ -1,180 +1,191 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-['isolation','integration'].each do |mode|
-  describe "response.should render_template (in #{mode} mode)",
-    :type => :controller do
-    controller_name :render_spec
-    if mode == 'integration'
-      integrate_views
-    end
+[:response, :controller].each do |subject_method|
+  ['isolation','integration'].each do |mode|
+    describe "#{subject_method}.should render_template (in #{mode} mode)",
+      :type => :controller do
+      controller_name :render_spec
+      if mode == 'integration'
+        integrate_views
+      end
 
-    it "should match a simple path" do
-      post 'some_action'
-      response.should render_template('some_action')
-    end
+      subject { send(subject_method) }
 
-    it "should match a less simple path" do
-      post 'some_action'
-      response.should render_template('render_spec/some_action')
-    end
-  
-    it "should match a less simple path to another controller" do
-      post 'action_which_renders_template_from_other_controller'
-      response.should render_template('controller_spec/action_with_template')
-    end
-  
-    it "should match a symbol" do
-      post 'some_action'
-      response.should render_template(:some_action)
-    end
-  
-    it "should match an rjs template" do
-      xhr :post, 'some_action'
-      if Rails::VERSION::STRING < "2.0.0"
-        response.should render_template('render_spec/some_action.rjs')
-      else
-        response.should render_template('render_spec/some_action')
+      it "matches an action (using a string)" do
+        post 'some_action'
+        should render_template('some_action')
       end
-    end
-  
-    it "should match a partial template (simple path)" do
-      get 'action_with_partial'
-      response.should render_template("_a_partial")
-    end
-  
-    it "should match a partial template (complex path)" do
-      get 'action_with_partial'
-      response.should render_template("render_spec/_a_partial")
-    end
-  
-    it "should fail when the wrong template is rendered" do
-      post 'some_action'
-      lambda do
-        response.should render_template('non_existent_template')
-      end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(\.html\.erb)?\"/)
-    end
-  
-    it "should fail without full path when template is associated with a different controller" do
-      post 'action_which_renders_template_from_other_controller'
-      lambda do
-        response.should render_template('action_with_template')
-      end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/)
-    end
-  
-    it "should fail with incorrect full path when template is associated with a different controller" do
-      post 'action_which_renders_template_from_other_controller'
-      lambda do
-        response.should render_template('render_spec/action_with_template')
-      end.should fail_with(/expected \"render_spec\/action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/)
-    end
-  
-    it "should fail on the wrong extension (given rhtml)" do
-      get 'some_action'
-      lambda {
-        response.should render_template('render_spec/some_action.rjs')
-      }.should fail_with(/expected \"render_spec\/some_action\.rjs\", got \"render_spec\/some_action(\.html\.erb)?\"/)
-    end
-  
-    it "should fail when TEXT is rendered" do
-      post 'text_action'
-      lambda do
-        response.should render_template('some_action')
-      end.should fail_with(/expected \"some_action\", got (nil|\"\")/)
-    end
-  
-    describe "with an alternate layout" do
-      it "should say it rendered the action's template" do
-        get 'action_with_alternate_layout'
-        response.should render_template('action_with_alternate_layout')
+
+      if ::Rails::VERSION::STRING >= '2.3'
+        it "matches an action with specified extenstions" do
+          post 'some_action'
+          should render_template('some_action.html.erb')
+        end
+      end
+
+      it "matches an action (using a symbol)" do
+        post 'some_action'
+        should render_template(:some_action)
       end
-    end
-    
-    it "provides a description" do
-      render_template("foo/bar").description.should == %q|render template "foo/bar"|
-    end
-  end
-  
-  describe "response.should_not render_template (in #{mode} mode)",
-    :type => :controller do
-    controller_name :render_spec
-    if mode == 'integration'
-      integrate_views
-    end
-    
-    it "should pass when the action renders nothing" do
-      post 'action_that_renders_nothing'
-      response.should_not render_template('action_that_renders_nothing')
-    end
     
-    it "should pass when the action renders nothing (symbol)" do
-      post 'action_that_renders_nothing'
-      response.should_not render_template(:action_that_renders_nothing)
-    end
+      it "matches an action on a specific controller" do
+        post 'some_action'
+        should render_template('render_spec/some_action')
+      end
     
-    it "should pass when the action does not render the template" do
-      post 'some_action'
-      response.should_not render_template('some_other_template')
-    end
+      it "matches an action on a non-default specific controller" do
+        post 'action_which_renders_template_from_other_controller'
+        should render_template('controller_spec/action_with_template')
+      end
     
-    it "should pass when the action does not render the template (symbol)" do
-      post 'some_action'
-      response.should_not render_template(:some_other_template)
-    end
+      it "matches an rjs template" do
+        xhr :post, 'some_action'
+        should render_template('render_spec/some_action')
+      end
     
-    it "should pass when the action does not render the template (named with controller)" do
-      post 'some_action'
-      response.should_not render_template('render_spec/some_other_template')
-    end
+      it "matches a partial template (simple path)" do
+        get 'action_with_partial'
+        should render_template("_a_partial")
+      end
     
-    it "should pass when the action renders the template with a different controller" do
-      post 'action_which_renders_template_from_other_controller'
-      response.should_not render_template('action_with_template')
-    end
+      it "matches a partial template (complex path)" do
+        get 'action_with_partial'
+        should render_template("render_spec/_a_partial")
+      end
     
-    it "should pass when the action renders the template (named with controller) with a different controller" do
-      post 'action_which_renders_template_from_other_controller'
-      response.should_not render_template('render_spec/action_with_template')
-    end
+      it "fails when the wrong template is rendered" do
+        post 'some_action'
+        lambda do
+          should render_template('non_existent_template')
+        end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(\.html\.erb)?\"/)
+      end
     
-    it "should pass when TEXT is rendered" do
-      post 'text_action'
-      response.should_not render_template('some_action')
-    end
+      it "fails when template is associated with a different controller but controller is not specified" do
+        post 'action_which_renders_template_from_other_controller'
+        lambda do
+          should render_template('action_with_template')
+        end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(\.html\.erb)?\"/)
+      end
     
-    it "should fail when the action renders the template" do
-      post 'some_action'
-      lambda do
-        response.should_not render_template('some_action')
-      end.should fail_with("expected not to render \"some_action\", but did")
-    end
+      it "fails with incorrect full path when template is associated with a different controller" do
+        post 'action_which_renders_template_from_other_controller'
+        lambda do
+          should render_template('render_spec/action_with_template')
+        end.should fail_with(/expected \"render_spec\/action_with_template\", got \"controller_spec\/action_with_template(\.html\.erb)?\"/)
+      end
     
-    it "should fail when the action renders the template (symbol)" do
-      post 'some_action'
-      lambda do
-        response.should_not render_template(:some_action)
-      end.should fail_with("expected not to render \"some_action\", but did")
-    end
+      it "fails on the wrong extension" do
+        get 'some_action'
+        lambda {
+          should render_template('render_spec/some_action.js.rjs')
+        }.should fail_with(/expected \"render_spec\/some_action\.js\.rjs\", got \"render_spec\/some_action(\.html\.erb)?\"/)
+      end
     
-    it "should fail when the action renders the template (named with controller)" do
-      post 'some_action'
-      lambda do
-        response.should_not render_template('render_spec/some_action')
-      end.should fail_with("expected not to render \"render_spec/some_action\", but did")
-    end
+      it "faild when TEXT is rendered" do
+        post 'text_action'
+        lambda do
+          should render_template('some_action')
+        end.should fail_with(/expected \"some_action\", got (nil|\"\")/)
+      end
     
-    it "should fail when the action renders the partial" do
-      post 'action_with_partial'
-      lambda do
-        response.should_not render_template('_a_partial')
-      end.should fail_with("expected not to render \"_a_partial\", but did")
+      describe "with an alternate layout" do
+        it "says it rendered the action's layout" do
+          pending("record rendering of layouts") do
+            get 'action_with_alternate_layout'
+            should render_template('layouts/simple')
+          end
+        end
+      end
+      
+      it "provides a description" do
+        render_template("foo/bar").description.should == %q|render template "foo/bar"|
+      end
     end
     
-    it "should fail when the action renders the partial (named with controller)" do
-      post 'action_with_partial'
-      lambda do
-        response.should_not render_template('render_spec/_a_partial')
-      end.should fail_with("expected not to render \"render_spec/_a_partial\", but did")
+    describe "#{subject_method}.should_not render_template (in #{mode} mode)",
+      :type => :controller do
+      controller_name :render_spec
+      if mode == 'integration'
+        integrate_views
+      end
+      
+      subject { send(subject_method) }
+
+      it "passes when the action renders nothing" do
+        post 'action_that_renders_nothing'
+        should_not render_template('action_that_renders_nothing')
+      end
+      
+      it "passes when the action renders nothing (symbol)" do
+        post 'action_that_renders_nothing'
+        should_not render_template(:action_that_renders_nothing)
+      end
+      
+      it "passes when the action does not render the template" do
+        post 'some_action'
+        should_not render_template('some_other_template')
+      end
+      
+      it "passes when the action does not render the template (symbol)" do
+        post 'some_action'
+        should_not render_template(:some_other_template)
+      end
+      
+      it "passes when the action does not render the template (named with controller)" do
+        post 'some_action'
+        should_not render_template('render_spec/some_other_template')
+      end
+      
+      it "passes when the action renders the template with a different controller" do
+        post 'action_which_renders_template_from_other_controller'
+        should_not render_template('action_with_template')
+      end
+      
+      it "passes when the action renders the template (named with controller) with a different controller" do
+        post 'action_which_renders_template_from_other_controller'
+        should_not render_template('render_spec/action_with_template')
+      end
+      
+      it "passes when TEXT is rendered" do
+        post 'text_action'
+        should_not render_template('some_action')
+      end
+      
+      it "fails when the action renders the template" do
+        post 'some_action'
+        lambda do
+          should_not render_template('some_action')
+        end.should fail_with("expected not to render \"some_action\", but did")
+      end
+      
+      it "fails when the action renders the template (symbol)" do
+        post 'some_action'
+        lambda do
+          should_not render_template(:some_action)
+        end.should fail_with("expected not to render \"some_action\", but did")
+      end
+      
+      it "fails when the action renders the template (named with controller)" do
+        post 'some_action'
+        lambda do
+          should_not render_template('render_spec/some_action')
+        end.should fail_with("expected not to render \"render_spec/some_action\", but did")
+      end
+      
+      it "fails when the action renders the partial" do
+        post 'action_with_partial'
+        lambda do
+          should_not render_template('_a_partial')
+        end.should fail_with("expected not to render \"_a_partial\", but did")
+      end
+      
+      it "fails when the action renders the partial (named with controller)" do
+        post 'action_with_partial'
+        lambda do
+          should_not render_template('render_spec/_a_partial')
+        end.should fail_with("expected not to render \"render_spec/_a_partial\", but did")
+      end
+          
     end
-        
   end
 end

data/spec/spec/rails/spec_server_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "script/spec_server file", :shared => true do
-  attr_accessor :tmbundle_install_directory
+  attr_accessor :tmbundle_install_directory, :tmbundle_source_directory
   attr_reader :animals_yml_path, :original_animals_content
 
   before do
@@ -22,7 +22,7 @@ describe "script/spec_server file", :shared => true do
   it "runs a spec" do
     dir = File.expand_path(File.dirname(__FILE__))
     output = ""
-    Timeout.timeout(10) do
+    Timeout.timeout(20) do
       loop do
         output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
         break unless output.include?("No server is running")
@@ -40,7 +40,7 @@ describe "script/spec_server file", :shared => true do
       f.write YAML.dump(fixtures)
     end
 
-    Timeout.timeout(10) do
+    Timeout.timeout(20) do
       loop do
         output = `#{RAILS_ROOT}/script/spec #{dir}/sample_modified_fixture.rb --drb 2>&1`
         break unless output.include?("No server is running")
@@ -71,14 +71,25 @@ end
 
 describe "script/spec_server file with TextMate bundle" do
   it_should_behave_like "script/spec_server file"
+  def tmbundle_directory
+    current_directory = File.expand_path("#{File.dirname(__FILE__)}/../../../../../../")
+    directories = current_directory.split('/')
+    while directories.any?
+      current_directory = File.join(*directories)
+      bundle_directory = File.join(current_directory, @bundle_name)
+      return bundle_directory if File.directory?(bundle_directory)
+      directories.pop
+    end
+  end
+
   before(:each) do
-    dir = File.dirname(__FILE__)
     @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
     @bundle_name = "RSpec.tmbundle"
+    @tmbundle_source_directory = tmbundle_directory
+
     FileUtils.mkdir_p(tmbundle_install_directory)
-    bundle_dir = File.expand_path("#{dir}/../../../../../../#{@bundle_name}")
-    File.directory?(bundle_dir).should be_true
-    unless system(%Q|ln -s #{bundle_dir} "#{tmbundle_install_directory}"|)
+    File.directory?(tmbundle_source_directory).should be_true
+    unless system(%Q|ln -s #{tmbundle_source_directory} "#{tmbundle_install_directory}"|)
       raise "Creating link to Textmate Bundle"
     end
     start_spec_server

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(File.expand_path("#{dir}/resources/helpers"))
 require File.expand_path("#{dir}/../../../../spec/spec_helper")
 require File.expand_path("#{dir}/resources/controllers/application")
 require File.expand_path("#{dir}/resources/controllers/render_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/controller_spec_controller")
 require File.expand_path("#{dir}/resources/controllers/rjs_spec_controller")
 require File.expand_path("#{dir}/resources/controllers/redirect_spec_controller")
 require File.expand_path("#{dir}/resources/controllers/action_view_base_spec_controller")
@@ -29,7 +30,7 @@ module Spec
   module Rails
     module Example
       class ViewExampleGroupController
-        set_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views")
+        prepend_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views")
       end
     end
   end
@@ -49,19 +50,30 @@ class Proc
   end
 end
 
-Spec::Runner.configure do |config|
-  config.before(:each, :type => :controller) do
-  end
-end
-
-
-ActionController::Routing::Routes.clear! # only since we're drawing routes here
 ActionController::Routing::Routes.draw do |map|
   map.connect 'action_with_method_restriction', :controller => 'redirect_spec', :action => 'action_with_method_restriction', :conditions => { :method => :get }
   map.connect 'action_to_redirect_to_action_with_method_restriction', :controller => 'redirect_spec', :action => 'action_to_redirect_to_action_with_method_restriction'
 
   map.resources :rspec_on_rails_specs
-  map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
+  map.custom_route 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
   map.connect ":controller/:action/:id"
 end
 
+module HelperMethods
+  def method_in_module_included_in_configuration
+  end
+end
+
+module HelperMacros
+  def accesses_configured_helper_methods
+    it "has access to methods in modules included in configuration" do
+      method_in_module_included_in_configuration
+    end
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include HelperMethods
+  config.extend HelperMacros
+end
+