rspec-rails 1.1.11 → 1.1.12

data/{spec_resources → spec/resources}/helpers/explicit_helper.rb

@@ -35,4 +35,12 @@ module ExplicitHelper
   def flash_thing
     flash[:thing]
   end
+  
+  def method_using_output_buffer
+    concat("the_text_from_concat")
+  end
+  
+  def method_using_template
+    update_page { |p| p["#some_id"].replace_html "" }
+  end
 end

data/spec/resources/models/animal.rb

@@ -0,0 +1,4 @@
+class Animal < ActiveRecord::Base
+  belongs_to :person
+  validates_uniqueness_of :name
+end

data/spec/resources/models/person.rb

@@ -0,0 +1,18 @@
+class Person < ActiveRecord::Base
+  has_many :animals do
+    def pups
+      find(:all, :conditions => 'age < 1')
+    end
+    def adults
+      find(:all, :conditions => 'age >= 1')
+    end
+  end
+  validates_presence_of :name
+  
+  def add_animal animal
+    animal.person = self
+    animals << animal
+    animal.save
+  end
+    
+end

data/spec/resources/models/thing.rb

@@ -0,0 +1,3 @@
+class Thing < ActiveRecord::Base
+  validates_presence_of :name
+end

data/spec/resources/views/view_spec/path_params.html.erb

@@ -0,0 +1 @@
+<%= params[:controller] %>

data/spec/{rails → spec/rails}/example/assigns_hash_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "AssignsHashProxy" do
   def orig_assigns

data/spec/spec/rails/example/configuration_spec.rb

@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+module Spec
+  module Runner
+    describe Configuration do
+
+      def config
+        @config ||= Configuration.new
+      end
+
+      describe "#use_transactional_fixtures" do
+        it "should return #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures" do
+          config.use_transactional_fixtures.should == Spec::Runner::Configuration::TEST_CASE.use_transactional_fixtures
+        end
+
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures to false" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:use_transactional_fixtures=).with(false)
+          end
+          config.use_transactional_fixtures = false
+        end
+
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures to true" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:use_transactional_fixtures=).with(true)
+          end
+          config.use_transactional_fixtures = true
+        end
+      end
+
+      describe "#use_instantiated_fixtures" do
+        it "should return #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures" do
+          config.use_instantiated_fixtures.should == Spec::Runner::Configuration::TEST_CASE.use_instantiated_fixtures
+        end
+
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_instantiated_fixtures to false" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:use_instantiated_fixtures=).with(false)
+          end
+          config.use_instantiated_fixtures = false
+        end
+
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_instantiated_fixtures to true" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:use_instantiated_fixtures=).with(true)
+          end
+          config.use_instantiated_fixtures = true
+        end
+      end
+
+      describe "#fixture_path" do
+        it "should default to RAILS_ROOT + '/spec/fixtures'" do
+          config.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+          end
+        end
+
+        it "should set fixture_path" do
+          config.fixture_path = "/new/path"
+          config.fixture_path.should == "/new/path"
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.fixture_path.should == "/new/path"
+          end
+        end
+      end
+
+      describe "#global_fixtures" do
+        it "should set fixtures on TestCase" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:fixtures).with(:blah)
+          end
+          config.global_fixtures = [:blah]
+        end
+      end
+      
+    end
+  end
+end

data/spec/{rails → spec/rails}/example/controller_isolation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'controller_spec_controller'
 
 describe "a controller spec running in isolation mode", :type => :controller do
@@ -21,10 +21,6 @@ describe "a controller spec running in integration mode", :type => :controller d
   controller_name :controller_spec
   integrate_views
   
-  before(:each) do
-    controller.class.send(:define_method, :rescue_action) { |e| raise e }
-  end
-
   it "should render a template" do
     get 'action_with_template'
     response.should be_success
@@ -34,12 +30,10 @@ describe "a controller spec running in integration mode", :type => :controller d
   it "should choke if the template doesn't exist" do
     error = defined?(ActionController::MissingTemplate) ? ActionController::MissingTemplate : ActionView::MissingTemplate    
     lambda { get 'some_action' }.should raise_error(error)
-    response.should_not be_success
   end
 
   it "should choke if the template has errors" do
     lambda { get 'action_with_errors_in_template' }.should raise_error(ActionView::TemplateError)
-    response.should_not be_success
   end
   
   describe "nested" do

data/spec/{rails → spec/rails}/example/controller_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'controller_spec_controller'
 
 ['integration', 'isolation'].each do |mode|
@@ -6,8 +6,6 @@ require 'controller_spec_controller'
     controller_name :controller_spec
     integrate_views if mode == 'integration'
     
-    specify "this example should be pending, not an error"
-    
     it "should provide controller.session as session" do
       get 'action_with_template'
       session.should equal(controller.session)
@@ -144,15 +142,74 @@ require 'controller_spec_controller'
   
       it "should support a Symbol key" do
         get 'action_which_sets_cookie', :value => "cookie value"
-        cookies[:cookie_key].value.should == ["cookie value"]
+        if Rails::VERSION::STRING >= "2.3"
+          cookies[:cookie_key].should == "cookie+value"
+        else
+          cookies[:cookie_key].should == ["cookie value"]
+        end
       end
 
       it "should support a String key" do
         get 'action_which_sets_cookie', :value => "cookie value"
-        cookies['cookie_key'].value.should == ["cookie value"]
+        if Rails::VERSION::STRING >= "2.3"
+          cookies['cookie_key'].should == "cookie+value"
+        else
+          cookies['cookie_key'].should == ["cookie value"]
+        end
       end
     
     end
+    
+    describe "with an error that is not rescued in the controller" do
+      context "without rails' error handling" do
+        it "raises the error" do
+          lambda do
+            get 'other_error_action'
+          end.should raise_error(ControllerSpecController::UnRescuedError)
+        end
+      end
+      context "with rails' error handling" do
+        it "does not raise the error" do
+          controller.use_rails_error_handling!
+          lambda do
+            get 'other_error_action'
+          end.should_not raise_error
+        end
+      end
+    end
+    
+    if Rails::VERSION::MAJOR >= 2
+      describe "with an error that is rescued in the controller" do
+        context "without rails' error handling" do
+          it "does not raise error" do
+            lambda do
+              get 'rescued_error_action'
+            end.should_not raise_error
+          end
+
+          it "executes rescue_from" do
+            get 'rescued_error_action'
+            response.body.should == 'Rescued!'
+          end
+        end
+
+        context "with rails' error handling" do
+          before(:each) do
+            controller.use_rails_error_handling!
+          end
+          it "does not raise error" do
+            lambda do
+              get 'rescued_error_action'
+            end.should_not raise_error
+          end
+
+          it "executes rescue_from" do
+            get 'rescued_error_action'
+            response.body.should == 'Rescued!'
+          end
+        end
+      end
+    end
 
     it "should support custom routes" do
       route_for(:controller => "custom_route_spec", :action => "custom_route").should == "/custom_route"
@@ -276,4 +333,4 @@ module Spec
       end
     end
   end
-end
+end

data/spec/{rails → spec/rails}/example/cookies_proxy_spec.rb

@@ -1,8 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 class CookiesProxyExamplesController < ActionController::Base
   def index
     cookies[:key] = cookies[:key]
+    render :text => ""
   end
 end
 
@@ -18,18 +19,26 @@ module Spec
             cookies = CookiesProxy.new(self)
             cookies['key'] = 'value'
             get :index
-            cookies['key'].should == ['value']
+            if ::Rails::VERSION::STRING >= "2.3"
+              cookies['key'].should == 'value'
+            else
+              cookies['key'].should == ['value']
+            end
           end
           
-          if Rails::VERSION::STRING >= "2.0.0"
+          if ::Rails::VERSION::STRING >= "2.0.0"
             it "should accept a Hash value" do
               cookies = CookiesProxy.new(self)
               cookies['key'] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' }
               get :index
-              cookies['key'].should == ['value']
-              cookies['key'].value.should == ['value']
-              cookies['key'].expires.should == expiration
-              cookies['key'].path.should == path
+              if ::Rails::VERSION::STRING >= "2.3"
+                cookies['key'].should == 'value'
+              else
+                cookies['key'].should == ['value']
+                cookies['key'].value.should == ['value']
+                cookies['key'].expires.should == expiration
+                cookies['key'].path.should == path
+              end
             end
           end
             
@@ -41,18 +50,26 @@ module Spec
             example_cookies = CookiesProxy.new(self)
             example_cookies[:key] = 'value'
             get :index
-            example_cookies[:key].should == ['value']
+            if ::Rails::VERSION::STRING >= "2.3"
+              example_cookies[:key].should == 'value'
+            else
+              example_cookies[:key].should == ['value']
+            end
           end
 
-          if Rails::VERSION::STRING >= "2.0.0"
+          if ::Rails::VERSION::STRING >= "2.0.0"
             it "should accept a Hash value" do
               example_cookies = CookiesProxy.new(self)
               example_cookies[:key] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' }
               get :index
-              example_cookies[:key].should == ['value']
-              example_cookies[:key].value.should == ['value']
-              example_cookies[:key].expires.should == expiration
-              example_cookies[:key].path.should == path
+              if ::Rails::VERSION::STRING >= "2.3"
+                example_cookies[:key].should == 'value'
+              else
+                example_cookies[:key].should == ['value']
+                example_cookies[:key].value.should == ['value']
+                example_cookies[:key].expires.should == expiration
+                example_cookies[:key].path.should == path
+              end
             end
           end
 

data/spec/{rails → spec/rails}/example/example_group_factory_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module Spec
   module Example

data/spec/{rails → spec/rails}/example/helper_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 Spec::Runner.configuration.global_fixtures = :people
 
 describe ExplicitHelper, :type => :helper do
@@ -143,6 +143,33 @@ module Spec
           assigns[:addend].should == 3
         end
       end
+      
+      if Rails::VERSION::MAJOR >= 2
+        describe HelperExampleGroup, "using a helper that uses output_buffer inside helper", :type => :helper do
+          helper_name :explicit
+
+          it "should not raise an error" do
+            lambda { method_using_output_buffer }.should_not raise_error
+          end
+
+          it "should put the output in the output_buffer" do
+            method_using_output_buffer
+            output_buffer.should == "the_text_from_concat"
+          end
+        end
+      end
+      
+      describe HelperExampleGroup, "using a helper that tries to access @template", :type => :helper do
+        helper_name :explicit
+
+        it "should not raise an error" do
+          lambda { method_using_template }.should_not raise_error
+        end
+
+        it "should have the correct output" do
+          method_using_template.should have_text(/#some_id/)
+        end
+      end
     end
   end
 end