rspec-rails 1.2.7.1 → 1.2.9

data/spec/spec/rails/example/cookies_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 class CookiesProxyExamplesController < ActionController::Base
   def index

data/spec/spec/rails/example/error_handling_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'controller_spec_controller'
 
 ['integration', 'isolation'].each do |mode|

data/spec/spec/rails/example/example_group_factory_spec.rb

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

data/spec/spec/rails/example/helper_example_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 Spec::Runner.configuration.global_fixtures = :people
 
 describe ExplicitHelper, :type => :helper do
@@ -148,7 +148,7 @@ module Spec
         helper_name :explicit
         
         before(:each) do
-          if Rails::VERSION::STRING <= "2.1"
+          if ::Rails::VERSION::STRING < "2.2"
             pending("need to get this new feature working against pre 2.2 versions of rails")
           end
         end

data/spec/spec/rails/example/model_example_group_spec.rb

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

data/spec/spec/rails/example/routing_example_group_spec.rb

@@ -1,9 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'controller_spec_controller'
 require File.join(File.dirname(__FILE__), "/shared_routing_example_group_examples.rb")
 
 describe "Routing Examples", :type => :routing do
   
   include RoutingExampleGroupSpec
-
+  include RouteToExampleGroupSpec
+  include BeRoutableExampleGroupSpec
 end

data/spec/spec/rails/example/shared_routing_example_group_examples.rb

@@ -2,43 +2,236 @@ class CustomRouteSpecController < ActionController::Base; end
 class RspecOnRailsSpecsController < ActionController::Base; end
 
 share_as :RoutingExampleGroupSpec do
-  it "support custom routes" do
-    route_for(:controller => "custom_route_spec", :action => "custom_route").
-      should == "/custom_route"
-  end
+  describe "using backward compatible route_for()" do
+    it "translates GET-only paths to be explicit" do
+      self.should_receive(:assert_routing).with(hash_including(:method => :get), anything, {}, anything)
+      route_for(:controller => "controller_spec", :action => "some_action").
+        should == "/controller_spec/some_action"
+    end
 
-  it "support existing routes" do
-    route_for(:controller => "controller_spec", :action => "some_action").
-      should == "/controller_spec/some_action"
-  end
+    it "uses assert_routing to specify that the :controller and :action are involved" do
+      @route = { :controller => "controller_spec", :action => "some_action" }
+      self.should_receive(:assert_routing).with(anything, @route, {}, anything)
+      route_for(@route).
+        should == "/controller_spec/some_action"
+    end
 
-  it "support existing routes with additional parameters" do
-    route_for(:controller => "controller_spec", :action => "some_action", :param => '1').
-      should == "/controller_spec/some_action?param=1"
-  end
-  
-  it "recognize routes with methods besides :get" do
-    route_for(:controller => "rspec_on_rails_specs", :action => "update", :id => "37").
-      should == {:path => "/rspec_on_rails_specs/37", :method => :put}
-  end
+    it "passes extra args through to assert_routing" do
+      @route = { :controller => "controller_spec", :action => "some_action" }
+      self.should_receive(:assert_routing).with(anything, anything, {}, { :a => "1", :b => "2" } )
+      route_for(@route).
+        should == "/controller_spec/some_action?a=1&b=2"
+    end
 
-  it "generate params for custom routes" do
-    params_from(:get, '/custom_route').
-      should == {:controller => "custom_route_spec", :action => "custom_route"}
-  end
+    it "passes with an existing route" do
+      route_for(:controller => "controller_spec", :action => "some_action").
+        should == "/controller_spec/some_action"
+    end
+
+    it "passes with an existing route with additional parameters" do
+      route_for(:controller => "controller_spec", :action => "some_action", :param => '1').
+        should == "/controller_spec/some_action?param=1"
+    end
+
+    it "recognizes routes with methods besides :get" do
+      should_receive(:assert_routing).with(hash_including(:method => :put), anything, {},  anything)
+
+      route_for(:controller => "rspec_on_rails_specs", :action => "update", :id => "37").
+        should == {:path => "/rspec_on_rails_specs/37", :method => :put}
+    end
+    
+    describe "failing due to bad path:" do
+      it "raises routing error and suggests should_not be_routeable()" do
+        lambda {
+          route_for(:controller => "rspec_on_rails_specs", :action => "nonexistent", :id => "37") ==
+            {:path => "/rspec_on_rails_specs/bad_route/37", :method => :put}
+        }.should raise_error( ActionController::RoutingError, /suggest.*should_not be_routable/ )
+      end
+    end
+
+    describe "failing due to params mismatch:" do
+      it "re-raises assertion and suggests should_not be_routeable()" do
+        lambda {
+          route_for(:controller => "rspec_on_rails_specs", :action => "nonexistent", :id => "37") ==
+            {:path => "/rspec_on_rails_specs/37", :method => :put}
+        }.should raise_error( ::Test::Unit::AssertionFailedError, /suggest.*should_not be_routable/ )
+      end
+    end
+
+    describe "failing due to wrong HTTP method" do
+      it "raises method error and suggest should_not be_routable()" do
+        lambda {
+          route_for(:controller => "rspec_on_rails_specs", :action => "update", :id => "37").
+            should == {:path => "/rspec_on_rails_specs/37", :method => :post}
+        }.should raise_error(ActionController::MethodNotAllowed) { |error| error.should_not =~ /should_not be_routable/ }
+      end
+    end
+
+    it "generates params for custom routes" do
+      # redundant, deprecated
+      params_from(:get, '/custom_route').
+        should == {:controller => "custom_route_spec", :action => "custom_route"}
+    end
+
+    it "generates params for existing routes" do
+      # redundant, deprecated
+      params_from(:get, '/controller_spec/some_action').
+        should == {:controller => "controller_spec", :action => "some_action"}
+    end
 
-  it "generate params for existing routes" do
-    params_from(:get, '/controller_spec/some_action').
-      should == {:controller => "controller_spec", :action => "some_action"}
+    it "generates params for existing routes with a query parameters" do
+      # redundant, deprecated
+      params_from(:get, '/controller_spec/some_action?param=1').
+        should == {:controller => "controller_spec", :action => "some_action", :param => '1'}
+    end
+
+    it "generates params for existing routes with multiple query parameters" do
+      # redundant, deprecated
+      params_from(:get, '/controller_spec/some_action?param1=1&param2=2').
+        should == {:controller => "controller_spec", :action => "some_action", :param1 => '1', :param2 => '2' }
+    end
   end
+end
+
+share_as :BeRoutableExampleGroupSpec do
+  describe "using should_not be_routable()" do
+    it "passes for a bad route" do
+      { :put => "/rspec_on_rails_specs/bad_route/37" }.
+        should_not be_routable
+    end
+    it "passes for a bad route having an arg" do
+      { :put => "/rspec_on_rails_specs/bad_route/37?some_arg=1" }.
+        should_not be_routable
+    end
+    describe "when assert_recognizes throws exceptions:" do
+      [ ActionController::RoutingError, ActionController::MethodNotAllowed ].each do |e|
+        it "passes on #{e}" do
+          self.stub!( :assert_recognizes ).and_return { raise e, "stubbed exception" }
+          { :get => "/rspec_on_rails_spec/bad_route/37" }.should_not be_routable
+        end
+        it "should be_routable on usual Test::Unit::AssertionFailedError" do
+          # <{}> is predictable because of the way we call assert_recognizes during be_routable().
+          self.stub!( :assert_recognizes ).and_return { raise ::Test::Unit::AssertionFailedError, "<{a}> did not match <{}>" }
+          { :get => "/rspec_on_rails_spec/arguably_bad_route" }.should be_routable
+        end
+        it "should re-raise on unusual Test::Unit::AssertionFailedError" do
+          self.stub!( :assert_recognizes ).and_return { raise ::Test::Unit::AssertionFailedError, "some other message" }
+          expect { { :get => "/rspec_on_rails_spec/weird_case_route/" }.should be_routable }.
+            to raise_error
+        end
+      end
+    end
+    it "test should be_routable" do
+      { :get => "/custom_route" }.
+        should be_routable
+    end
+
+    it "recommends route_to() on failure with should()" do
+      lambda {
+        { :get => "/nonexisting_route" }.
+          should be_routable
+      }.should raise_error( /route_to\(/)
+    end
 
-  it "generate params for an existing route with a query parameter" do
-    params_from(:get, '/controller_spec/some_action?param=1').
-      should == {:controller => "controller_spec", :action => "some_action", :param => '1'}
+    it "shows actual route that was generated on failure with should_not()" do
+      begin
+        { :get => "/custom_route" }.should_not be_routable
+      rescue Exception => e
+      ensure
+        # Different versions of ruby order these differently
+        e.message.should =~ /"action"=>"custom_route"/
+        e.message.should =~ /"controller"=>"custom_route_spec"/
+      end
+    end
+
+    it "works with routeable (alternate spelling)" do
+      { :put => "/nonexisting_route" }.
+        should_not be_routeable
+    end
   end
+end
+
+share_as :RouteToExampleGroupSpec do
+  describe "using should[_not] route_to()" do
+    it "supports existing routes" do
+      { :get => "/controller_spec/some_action" }.
+        should route_to( :controller => "controller_spec", :action => "some_action" )
+    end
+
+    it "translates GET-only paths to be explicit, when matching against a string (for parity with route_for().should == '/path')" do
+      self.should_receive(:assert_routing).with(hash_including(:method => :get), anything, {}, anything)
+      "/controller_spec/some_action".
+        should route_to({})
+    end
+
+    it "asserts, using assert_routing, that the :controller and :action are involved" do
+      @route = { :controller => "controller_spec", :action => "some_action" }
+      self.should_receive(:assert_routing).with(anything, @route, {}, anything)
+      "/controller_spec/some_action".
+        should route_to(@route)
+    end
+    
+    it "sends extra args through" do
+      @route = { :controller => "controller_spec", :action => "some_action" }
+      self.should_receive(:assert_routing).with(anything, anything, {}, { :a => "1", :b => "2" } )
+      "/controller_spec/some_action?a=1&b=2".
+        should route_to( @route )
+    end
+
+    it "supports routes with additional parameters" do
+      { :get => "/controller_spec/some_action?param=1" }.
+        should route_to( :controller => "controller_spec", :action => "some_action", :param => '1' )
+    end
+
+    it "recognizes routes with methods besides :get" do
+      self.should_receive(:assert_routing).with(hash_including(:method => :put), anything, {}, anything)
+      { :put => "/rspec_on_rails_specs/37" }.
+        should route_to(:controller => "rspec_on_rails_specs", :action => "update", :id => "37")
+    end
+
+    it "allows only one key/value in the path - :method => path" do
+      lambda {
+        { :a => "b" ,:c => "d" }.
+          should route_to("anything")
+      }.should raise_error( ArgumentError, /usage/ )
+    end
+
+    describe "failing due to bad path" do
+      it "raises routing error, and suggests should_not be_routeable()" do
+        lambda {
+          { :put => "/rspec_on_rails_specs/nonexistent/37" }.
+            should route_to(:controller => "rspec_on_rails_specs", :action => "nonexistent", :id => "37")
+        }.should raise_error( ActionController::RoutingError, /suggest.*nonexistent.*should_not be_routable/ )
+      end
+    end
+    
+    describe "failing due to params mismatch" do
+      it "raises assertion, and suggests should_not be_routeable()" do
+        lambda {
+          { :put => "/rspec_on_rails_specs/37" }.
+            should route_to(:controller => "rspec_on_rails_specs", :action => "nonexistent", :id => "37")
+        }.should raise_error( ::Test::Unit::AssertionFailedError, /suggest.*rspec_on_rails_specs\/37.*should_not be_routable/ )
+      end
+    end
+    
+    describe "passing when expected failure" do
+      it "suggests should_not be_routable()" do
+        self.stub!(:assert_routing).and_return true
+        lambda {
+          { :put => "/rspec_on_rails_specs/37" }.
+            should_not route_to(:controller => "rspec_on_rails_specs", :action => "update", :id => "37")
+        }.should raise_error( /expected a routing error.*be_routable/im )
+      end
+    end
 
-  it "generate params for an existing route with multiple query parameters" do
-    params_from(:get, '/controller_spec/some_action?param1=1&param2=2').
-      should == {:controller => "controller_spec", :action => "some_action", :param1 => '1', :param2 => '2' }
+    describe "failing due to wrong HTTP method" do
+      it "raises method error and suggests should_not be_routable()" do
+        self.stub!(:assert_routing) { raise ActionController::MethodNotAllowed }
+        lambda {
+          { :post => "/rspec_on_rails_specs/37" }.
+            should route_to(:controller => "rspec_on_rails_specs", :action => "update", :id => "37" )
+        }.should raise_error(ActionController::MethodNotAllowed, /rspec_on_rails_specs\/37.*should_not be_routable/ )
+      end
+    end
   end
-end
+end

data/spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe "assert_equal", :shared => true do
   it "like assert_equal" do

data/spec/spec/rails/example/view_example_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe "A template with an implicit helper", :type => :view do
   before(:each) do

data/spec/spec/rails/extensions/action_view_base_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'spec/mocks/errors'
 
 describe ActionView::Base, "with RSpec extensions:", :type => :view do 

data/spec/spec/rails/extensions/active_record_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe "A model" do
   fixtures :things

data/spec/spec/rails/interop/testcase_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 
 if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(ActiveSupport::Callbacks)

data/spec/spec/rails/matchers/ar_be_valid_spec.rb

@@ -1,45 +1,19 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe "be_valid" do
-  class CanBeValid
-    def initialize(valid)
-      @valid = valid
+  context "with valid attributes" do
+    it "returns true" do
+      be_valid.matches?(Thing.new(:name => 'thing')).should == true
     end
-    def valid?; @valid end
   end
-
-  it "should behave like normal be_valid matcher" do
-    CanBeValid.new(true).should be_valid
-    CanBeValid.new(false).should_not be_valid
-  end
-
-  describe CanBeValid do
-    subject { CanBeValid.new(true) }
-    it { subject.should be_valid }
-  end
-
-  describe CanBeValid do
-    subject { CanBeValid.new(false) }
-    it { subject.should_not be_valid }
-  end
-
-  class CanHaveErrors
-    def initialize(errors)
-      @valid = !errors
-      @errors = ActiveRecord::Errors.new self
-      @errors.add :name, "is too short"
+  
+  context "with invalid attributes" do
+    it "returns false" do
+      be_valid.matches?(Thing.new).should == false
     end
-    attr_reader :errors
-    def valid?; @valid end
-
-    def self.human_attribute_name(ignore)
-      "Name"
+    
+    it "adds errors to the errors " do
+      expect { Thing.new.should be_valid }.to raise_error(/can't be blank/)
     end
   end
-
-  it "should show errors in the output if they're available" do
-    lambda { 
-      CanHaveErrors.new(true).should be_valid
-    }.should fail_with(/Name is too short/)
-  end
 end

data/spec/spec/rails/matchers/assert_select_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 # assert_select plugins for Rails
 #

data/spec/spec/rails/matchers/errors_on_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe "error_on" do
   it "should provide a description including the name of what the error is on" do

data/spec/spec/rails/matchers/have_text_spec.rb

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

data/spec/spec/rails/matchers/include_text_spec.rb

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

data/spec/spec/rails/matchers/redirect_to_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 [:response, :controller].each do |subject_method|
   ['isolation','integration'].each do |mode|