typo 5.1.3 → 5.1.98

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/controller_spec_spec.rb

@@ -5,7 +5,9 @@ require 'controller_spec_controller'
   describe "A controller example running in #{mode} mode", :type => :controller do
     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)
@@ -17,6 +19,12 @@ require 'controller_spec_controller'
       session.should equal(session_before)
     end
   
+    it "should keep the same data in the session before and after the action" do
+      session[:foo] = :bar
+      get 'action_with_template'
+      session[:foo].should == :bar
+    end
+  
     it "should ensure controller.session is NOT nil before the action" do
       controller.session.should_not be_nil
       get 'action_with_template'
@@ -32,27 +40,26 @@ require 'controller_spec_controller'
       response.should render_template("_partial")
     end
     
-    it "should allow specifying a partial with expect_render" do
-      controller.expect_render(:partial => "controller_spec/partial")
+    it "should allow specifying a partial with should_receive(:render)" do
+      controller.should_receive(:render).with(:partial => "controller_spec/partial")
       get 'action_with_partial'
     end
     
-    it "should allow specifying a partial with expect_render with object" do
-      controller.expect_render(:partial => "controller_spec/partial", :object => "something")
+    it "should allow specifying a partial with should_receive(:render) with object" do
+      controller.should_receive(:render).with(:partial => "controller_spec/partial", :object => "something")
       get 'action_with_partial_with_object', :thing => "something"
     end
     
-    it "should allow specifying a partial with expect_render with locals" do
-      controller.expect_render(:partial => "controller_spec/partial", :locals => {:thing => "something"})
+    it "should allow specifying a partial with should_receive(:render) with locals" do
+      controller.should_receive(:render).with(:partial => "controller_spec/partial", :locals => {:thing => "something"})
       get 'action_with_partial_with_locals', :thing => "something"
     end
     
     it "should yield to render :update" do
       template = stub("template")
-      controller.expect_render(:update).and_yield(template)
+      controller.should_receive(:render).with(:update).and_yield(template)
       template.should_receive(:replace).with(:bottom, "replace_me", :partial => "non_existent_partial")
       get 'action_with_render_update'
-      puts response.body
     end
     
     it "should allow a path relative to RAILS_ROOT/app/views/ when specifying a partial" do
@@ -61,7 +68,7 @@ require 'controller_spec_controller'
     end
     
     it "should provide access to flash" do
-      get 'action_with_template'
+      get 'action_which_sets_flash'
       flash[:flash_key].should == "flash value"
     end
     
@@ -76,8 +83,75 @@ require 'controller_spec_controller'
     end
 
     it "should provide access to session" do
-      get 'action_with_template'
-      session[:session_key].should == "session value"
+      session[:session_key] = "session value"
+      lambda do
+        get 'action_which_gets_session', :expected => "session value"
+      end.should_not raise_error
+    end
+
+    describe "handling should_receive(:render)" do
+      it "should warn" do
+        controller.should_receive(:render).with(:template => "controller_spec/action_with_template")
+        get :action_with_template
+      end
+    end
+    
+    describe "handling should_not_receive(:render)" do
+      it "should warn" do
+        controller.should_not_receive(:render).with(:template => "the/wrong/template")
+        get :action_with_template
+      end
+    end
+    
+    describe "handling deprecated expect_render" do
+      it "should warn" do
+        Kernel.should_receive(:warn).with(/expect_render is deprecated/)
+        controller.expect_render(:template => "controller_spec/action_with_template")
+        get :action_with_template
+      end
+    end
+    
+    describe "handling deprecated stub_render" do
+      it "should warn" do
+        Kernel.should_receive(:warn).with(/stub_render is deprecated/)
+        controller.stub_render(:template => "controller_spec/action_with_template")
+        get :action_with_template
+      end
+    end
+    
+    describe "setting cookies in the request" do
+    
+      it "should support a String key" do
+        cookies['cookie_key'] = 'cookie value'
+        get 'action_which_gets_cookie', :expected => "cookie value"
+      end
+
+      it "should support a Symbol key" do
+        cookies[:cookie_key] = 'cookie value'
+        get 'action_which_gets_cookie', :expected => "cookie value"
+      end
+      
+      if Rails::VERSION::STRING >= "2.0.0"
+        it "should support a Hash value" do
+          cookies[:cookie_key] = {'value' => 'cookie value', 'path' => '/not/default'}
+          get 'action_which_gets_cookie', :expected => {'value' => 'cookie value', 'path' => '/not/default'}
+        end
+      end
+      
+    end
+  
+    describe "reading cookies from the response" do
+  
+      it "should support a Symbol key" do
+        get 'action_which_sets_cookie', :value => "cookie value"
+        cookies[:cookie_key].value.should == ["cookie value"]
+      end
+
+      it "should support a String key" do
+        get 'action_which_sets_cookie', :value => "cookie value"
+        cookies['cookie_key'].value.should == ["cookie value"]
+      end
+    
     end
 
     it "should support custom routes" do
@@ -101,21 +175,9 @@ require 'controller_spec_controller'
       assigns[:indirect_assigns_key].should == :indirect_assigns_key_value
     end
     
-    it "should expose the assigns hash directly" do
-      get 'action_setting_the_assigns_hash'
-      assigns[:direct_assigns_key].should == :direct_assigns_key_value
-    end
-    
-    it "should complain when calling should_receive(:render) on the controller" do
-      lambda {
-        controller.should_receive(:render)
-      }.should raise_error(RuntimeError, /should_receive\(:render\) has been disabled/)
-    end
-
-    it "should complain when calling stub!(:render) on the controller" do
-      lambda {
-        controller.stub!(:render)
-      }.should raise_error(RuntimeError, /stub!\(:render\) has been disabled/)
+    it "should expose instance vars through the assigns hash that are set to false" do
+      get 'action_that_assigns_false_to_a_variable'
+      assigns[:a_variable].should be_false
     end
     
     it "should NOT complain when calling should_receive with arguments other than :render" do
@@ -124,6 +186,12 @@ require 'controller_spec_controller'
         controller.rspec_verify
       }.should raise_error(Exception, /expected :anything_besides_render/)
     end
+    
+    it "should not run a skipped before_filter" do
+      lambda {
+        get 'action_with_skipped_before_filter'
+      }.should_not raise_error
+    end
   end
 
   describe "Given a controller spec for RedirectSpecController running in #{mode} mode", :type => :controller do
@@ -164,11 +232,35 @@ require 'controller_spec_controller'
   
 end
 
+['integration', 'isolation'].each do |mode|
+  describe "A controller example running in #{mode} mode", :type => :controller do
+    controller_name :controller_inheriting_from_application_controller
+    integrate_views if mode == 'integration'
+    
+    it "should only have a before filter inherited from ApplicationController run once..." do
+      controller.should_receive(:i_should_only_be_run_once).once
+      get :action_with_inherited_before_filter
+    end
+  end
+end
+
+
 describe ControllerSpecController, :type => :controller do
   it "should not require naming the controller if describe is passed a type" do
   end  
 end
 
+describe "A controller spec with controller_name set", :type => :controller do
+  controller_name :controller_spec
+  
+  describe "nested" do
+    it "should inherit the controller name" do
+      get 'action_with_template'
+      response.should be_success
+    end
+  end
+end
+
 module Spec
   module Rails
     module Example

data/vendor/plugins/rspec-rails/spec/rails/example/cookies_proxy_spec.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+class CookiesProxyExamplesController < ActionController::Base
+  def index
+    cookies[:key] = cookies[:key]
+  end
+end
+
+module Spec
+  module Rails
+    module Example
+      describe CookiesProxy, :type => :controller do
+        controller_name :cookies_proxy_examples
+      
+        describe "with a String key" do
+        
+          it "should accept a String value" do
+            cookies = CookiesProxy.new(self)
+            cookies['key'] = 'value'
+            get :index
+            cookies['key'].should == ['value']
+          end
+          
+          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
+            end
+          end
+            
+        end
+      
+        describe "with a Symbol key" do
+        
+          it "should accept a String value" do
+            example_cookies = CookiesProxy.new(self)
+            example_cookies[:key] = 'value'
+            get :index
+            example_cookies[:key].should == ['value']
+          end
+
+          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
+            end
+          end
+
+        end
+    
+        describe "#delete" do
+          it "should delete from the response cookies" do
+            example_cookies = CookiesProxy.new(self)
+            response_cookies = mock('cookies')
+            response.should_receive(:cookies).and_return(response_cookies)
+            response_cookies.should_receive(:delete).with('key')
+            example_cookies.delete :key
+          end
+        end
+      end
+    
+    end
+  end
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/helper_spec_spec.rb

@@ -2,8 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 Spec::Runner.configuration.global_fixtures = :people
 
 describe ExplicitHelper, :type => :helper do
+  include ExplicitHelper
+  
   it "should not require naming the helper if describe is passed a type" do
     method_in_explicit_helper.should match(/text from a method/)
+    helper.method_in_explicit_helper.should match(/text from a method/)
   end
 end
 
@@ -13,20 +16,51 @@ module Spec
       describe HelperExampleGroup, :type => :helper do
         helper_name :explicit
 
-        it "should have direct access to methods defined in helpers" do
+        it "DEPRECATED should have direct access to methods defined in helpers" do
           method_in_explicit_helper.should =~ /text from a method/
         end
 
+        it "should expose the helper with the #helper method" do
+          helper.method_in_explicit_helper.should =~ /text from a method/
+        end
+
         it "should have access to named routes" do
           rspec_on_rails_specs_url.should == "http://test.host/rspec_on_rails_specs"
           rspec_on_rails_specs_path.should == "/rspec_on_rails_specs"
+
+          helper.named_url.should == "http://test.host/rspec_on_rails_specs"
+          helper.named_path.should == "/rspec_on_rails_specs"
         end
 
         it "should fail if the helper method deson't exist" do
-          lambda { non_existant_helper_method }.should raise_error(NameError)
+          lambda { non_existent_helper_method }.should raise_error(NameError)
+          lambda { helper.non_existent_helper_method }.should raise_error(NameError)
         end
-      end
 
+        it "should have access to session" do
+          session[:foo] = 'bar'
+          session_foo.should == 'bar'
+          helper.session_foo.should == 'bar'
+        end
+        
+        it "should have access to params" do
+          params[:foo] = 'bar'
+          params_foo.should == 'bar'
+          helper.params_foo.should == 'bar'
+        end
+        
+        it "should have access to request" do
+          request.stub!(:thing).and_return('bar')
+          request_thing.should == 'bar'
+          helper.request_thing.should == 'bar'
+        end
+        
+        it "should have access to flash" do
+          flash[:thing] = 'camera'
+          flash_thing.should == 'camera'
+          helper.flash_thing.should == 'camera'
+        end
+      end
 
       describe HelperExampleGroup, "#eval_erb", :type => :helper do
         helper_name :explicit
@@ -50,6 +84,13 @@ module Spec
           lachie.class.should == Person
         end
       end
+      
+      describe "methods from standard helpers", :type => :helper do
+        helper_name :explicit
+        it "should be exposed to the helper" do
+          helper.link_to("Foo","http://bar").should have_tag("a")
+        end
+      end
 
       describe HelperExampleGroup, "included modules", :type => :helper do
         helpers = [
@@ -76,6 +117,7 @@ module Spec
         helpers.each do |helper_module|
           it "should include #{helper_module}" do
             self.class.ancestors.should include(helper_module)
+            helper.class.ancestors.should include(helper_module)
           end
         end
       end
@@ -85,6 +127,20 @@ module Spec
       describe HelperExampleGroup, "#protect_against_forgery?", :type => :helper do
         it "should return false" do
           protect_against_forgery?.should be_false
+          helper.protect_against_forgery?.should be_false
+        end
+      end
+      
+      describe HelperExampleGroup, "#assigns", :type => :helper do
+        helper_name :addition
+        it "should expose variables to helper" do
+          assigns[:addend] = 3
+          helper.plus(4).should == 7
+        end
+
+        it "should make helper ivars available in example" do
+          assigns[:addend] = 3
+          assigns[:addend].should == 3
         end
       end
     end
@@ -115,4 +171,4 @@ module Spec
       end
     end
   end
-end
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/view_spec_spec.rb

@@ -82,14 +82,14 @@ describe "A template that includes a partial", :type => :view do
     response.should have_tag('div', "This is text from a method in the ApplicationHelper")
   end
   
-  it "should pass expect_render with the right partial" do
-    template.expect_render(:partial => 'partial')
+  it "should pass should_receive(:render) with the right partial" do
+    template.should_receive(:render).with(:partial => 'partial')
     render!
     template.verify_rendered
   end
   
-  it "should fail expect_render with the wrong partial" do
-    template.expect_render(:partial => 'non_existent')
+  it "should fail should_receive(:render) with the wrong partial" do
+    template.should_receive(:render).with(:partial => 'non_existent')
     render!
     begin
       template.verify_rendered
@@ -99,14 +99,14 @@ describe "A template that includes a partial", :type => :view do
     end
   end
   
-  it "should pass expect_render when a partial is expected twice and happens twice" do
-    template.expect_render(:partial => 'partial_used_twice').twice
+  it "should pass should_receive(:render) when a partial is expected twice and happens twice" do
+    template.should_receive(:render).with(:partial => 'partial_used_twice').twice
     render!
     template.verify_rendered
   end
   
-  it "should pass expect_render when a partial is expected once and happens twice" do
-    template.expect_render(:partial => 'partial_used_twice')
+  it "should pass should_receive(:render) when a partial is expected once and happens twice" do
+    template.should_receive(:render).with(:partial => 'partial_used_twice')
     render!
     begin
       template.verify_rendered
@@ -116,17 +116,17 @@ describe "A template that includes a partial", :type => :view do
     end
   end
   
-  it "should fail expect_render with the right partial but wrong options" do
-    template.expect_render(:partial => 'partial', :locals => {:thing => Object.new})
+  it "should fail should_receive(:render) with the right partial but wrong options" do
+    template.should_receive(:render).with(:partial => 'partial', :locals => {:thing => Object.new})
     render!
     lambda {template.verify_rendered}.should raise_error(Spec::Mocks::MockExpectationError)
   end
 end
 
 describe "A partial that includes a partial", :type => :view do
-  it "should support expect_render with nested partial" do
+  it "should support should_receive(:render) with nested partial" do
     obj = Object.new
-    template.expect_render(:partial => 'partial', :object => obj)
+    template.should_receive(:render).with(:partial => 'partial', :object => obj)
     render :partial => "view_spec/partial_with_sub_partial", :locals => { :partial => obj }
   end
 end
@@ -141,7 +141,7 @@ describe "A view that includes a partial using :collection and :spacer_template"
   end
 
   it "should render the partial" do
-    template.expect_render(:partial => 'partial',
+    template.should_receive(:render).with(:partial => 'partial',
                :collection => ['Alice', 'Bob'],
                :spacer_template => 'spacer')
     render "view_spec/template_with_partial_using_collection"
@@ -149,37 +149,19 @@ describe "A view that includes a partial using :collection and :spacer_template"
 
 end
 
-describe "A view that includes a partial using an array as partial_path", :type => :view do
-  before(:each) do
-    module ActionView::Partials
-      def render_template_with_partial_with_array_support(partial_path, local_assigns = nil, deprecated_local_assigns = nil)
-        if partial_path.is_a?(Array)
-          "Array Partial"
-        else
-          render_partial_without_array_support(partial_path, local_assigns, deprecated_local_assigns)
-        end
-      end
-
-      alias :render_partial_without_array_support :render_partial
-      alias :render_partial :render_template_with_partial_with_array_support
+if Rails::VERSION::MAJOR >= 2
+  describe "A view that includes a partial using an array as partial_path", :type => :view do
+    before(:each) do
+      renderable_object = Object.new
+      renderable_object.stub!(:name).and_return("Renderable Object")
+      assigns[:array] = [renderable_object]
     end
 
-    @array = ['Alice', 'Bob']
-    assigns[:array] = @array
-  end
-
-  after(:each) do
-    module ActionView::Partials
-      alias :render_template_with_partial_with_array_support :render_partial
-      alias :render_partial :render_partial_without_array_support
-      undef render_template_with_partial_with_array_support
+    it "should render the array passed through to render_partial without modification" do
+      render "view_spec/template_with_partial_with_array" 
+      response.body.should match(/^Renderable Object$/)
     end
   end
-
-  it "should render have the array passed through to render_partial without modification" do
-    render "view_spec/template_with_partial_with_array" 
-    response.body.should match(/^Array Partial$/)
-  end
 end
 
 describe "Different types of renders (not :template)", :type => :view do
@@ -208,6 +190,14 @@ describe "A view", :type => :view do
   it "should have access to flash data" do
     response.should have_tag("div#flash", "flash")
   end
+
+  it "should have a controller param" do
+    response.should have_tag("div#controller", "view_spec")
+  end
+  
+  it "should have an action param" do
+    response.should have_tag("div#action", "accessor")
+  end
 end
 
 describe "A view with a form_tag", :type => :view do
@@ -231,6 +221,34 @@ describe "An instantiated ViewExampleGroupController", :type => :view do
   end
 end
 
+describe "a block helper", :type => :view do
+  it "should not yield when not told to in the example" do
+    template.should_receive(:if_allowed)
+    render "view_spec/block_helper"
+    response.should_not have_tag("div","block helper was rendered")
+  end
+
+  it "should yield when told to in the example" do
+    template.should_receive(:if_allowed).and_yield
+    render "view_spec/block_helper"
+    response.should have_tag("div","block helper was rendered")
+  end
+end
+
+describe "render :inline => ...", :type => :view do
+  it "should render ERB right in the spec" do
+    render :inline => %|<%= text_field_tag('field_name', 'Value') %>|
+    response.should have_tag("input[type=?][name=?][value=?]","text","field_name","Value")
+  end
+end
+
+describe "render 'view_spec/foo/show.rhtml'", :type => :view do
+  it "should derive action name using the first part of the template name" do
+    render 'view_spec/foo/show.rhtml'
+    request.path_parameters[:action].should == 'show'
+  end
+end
+
 module Spec
   module Rails
     module Example
@@ -245,19 +263,25 @@ module Spec
         end
 
         it "should clear ActionView::Base.base_view_path on teardown" do
-          ViewExampleGroup.class_eval do
-            alias_method(:ensure_that_base_view_path_is_not_set_across_example_groups_orig,
-              :ensure_that_base_view_path_is_not_set_across_example_groups)
-            define_method(:ensure_that_base_view_path_is_not_set_across_example_groups){
-              $base_view_path_cleared = true
-              ensure_that_base_view_path_is_not_set_across_example_groups_orig
-            }
-          end
-          describe("base_view_path_cleared flag", :type => :view) do
-            it { $base_view_path_cleared.should be_true }
-          end
+          group = describe("base_view_path_cleared flag", :type => :view) {}
+          example = group.it{}
+          
+          ActionView::Base.should_receive(:base_view_path=).with(nil)
+          group.run_after_each(example)
         end
       end
     end
   end
 end
+
+describe "bug http://rspec.lighthouseapp.com/projects/5645/tickets/510", :type => :view do
+  describe "a view example with should_not_receive" do
+    it "should render the view" do
+      obj = mock('model')
+      obj.should_receive(:render_partial?).and_return false
+      assigns[:obj] = obj
+      template.should_not_receive(:render).with(:partial => 'some_partial')
+      render "view_spec/should_not_receive"
+    end
+  end
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/action_view_base_spec.rb

@@ -3,44 +3,44 @@ require 'spec/mocks/errors'
 
 describe ActionView::Base, "with RSpec extensions:", :type => :view do 
   
-  describe "expect_render" do
+  describe "should_receive(:render)" do
     it "should not raise when render has been received" do
-      template.expect_render(:partial => "name")
+      template.should_receive(:render).with(:partial => "name")
       template.render :partial => "name"
     end
   
     it "should raise when render has NOT been received" do
-      template.expect_render(:partial => "name")
+      template.should_receive(:render).with(:partial => "name")
       lambda {
         template.verify_rendered
       }.should raise_error
     end
     
     it "should return something (like a normal mock)" do
-      template.expect_render(:partial => "name").and_return("Little Johnny")
+      template.should_receive(:render).with(:partial => "name").and_return("Little Johnny")
       result = template.render :partial => "name"
       result.should == "Little Johnny"
     end
   end
   
-  describe "stub_render" do
+  describe "stub!(:render)" do
     it "should not raise when stubbing and render has been received" do
-      template.stub_render(:partial => "name")
+      template.stub!(:render).with(:partial => "name")
       template.render :partial => "name"
     end
   
     it "should not raise when stubbing and render has NOT been received" do
-      template.stub_render(:partial => "name")
+      template.stub!(:render).with(:partial => "name")
     end
   
     it "should not raise when stubbing and render has been received with different options" do
-      template.stub_render(:partial => "name")
+      template.stub!(:render).with(:partial => "name")
       template.render :partial => "view_spec/spacer"
     end
 
     it "should not raise when stubbing and expecting and render has been received" do
-      template.stub_render(:partial => "name")
-      template.expect_render(:partial => "name")
+      template.stub!(:render).with(:partial => "name")
+      template.should_receive(:render).with(:partial => "name")
       template.render(:partial => "name")
     end
   end