rspec-rails 1.1.11 → 1.1.12

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

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

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "A shared view example_group", :shared => true do
   it "should have some tag with some text" do

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

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

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "A template with an implicit helper", :type => :view do
   before(:each) do
@@ -249,6 +249,27 @@ describe "render 'view_spec/foo/show.rhtml'", :type => :view do
   end
 end
 
+describe "setting path parameters", :type => :view do
+  describe "(controller)" do
+    it "should supercede the default path parameters" do
+      render "view_spec/entry_form", :path_parameters => {:controller => 'foo'}
+      request.path_parameters[:controller].should == 'foo'
+    end
+  end
+  describe "(action)" do
+    it "should supercede the default path parameters" do
+      render "view_spec/entry_form", :path_parameters => {:action => 'foo'}
+      request.path_parameters[:action].should == 'foo'
+    end
+  end
+  describe "(something arbitrary)" do
+    it "should supercede the default path parameters" do
+      render "view_spec/entry_form", :path_parameters => {:foo => 'bar'}
+      request.path_parameters[:foo].should == 'bar'
+    end
+  end
+end
+
 module Spec
   module Rails
     module Example

data/spec/{rails → spec/rails}/extensions/action_controller_rescue_action_spec.rb

@@ -1,10 +1,13 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module ActionController
   describe "Rescue", "#rescue_action in default mode" do
     before(:each) do
       @fixture = Object.new
       @fixture.extend ActionController::Rescue
+      def @fixture.rescue_with_handler(exception)
+        false
+      end
       class << @fixture
         public :rescue_action
       end

data/spec/{rails → spec/rails}/extensions/action_view_base_spec.rb

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

data/spec/{rails → spec/rails}/extensions/active_record_spec.rb

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

data/spec/{rails → spec/rails}/interop/testcase_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 
 if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(ActiveSupport::Callbacks)
@@ -17,6 +17,10 @@ if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(Act
     def self.run?
       @@has_been_run
     end
+
+    def self.run(options=Spec::Runner.options)
+      super options
+    end
     
     def do_some_setup
       @@setup_callback_count += 1
@@ -63,4 +67,4 @@ if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(Act
     end
   end
   
-end
+end

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

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe "be_valid" do
+  class CanBeValid
+    def initialize(valid)
+      @valid = valid
+    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
+
+  class CanHaveErrors
+    def initialize(errors)
+      @valid = !errors
+      @errors = ActiveRecord::Errors.new self
+      @errors.add :name, "is too short"
+    end
+    attr_reader :errors
+    def valid?; @valid end
+
+    def self.human_attribute_name(ignore)
+      "Name"
+    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/{rails → spec/rails}/matchers/assert_select_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 # assert_select plugins for Rails
 #
@@ -35,10 +35,6 @@ class AssertSelectController < ActionController::Base
     @content = nil
   end
 
-  def rescue_action(e)
-    raise e
-  end
-
 end
 
 class AssertSelectMailer < ActionMailer::Base

data/spec/{rails → spec/rails}/matchers/errors_on_spec.rb

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

data/spec/{rails → spec/rails}/matchers/have_text_spec.rb

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

data/spec/{rails → spec/rails}/matchers/include_text_spec.rb

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

data/spec/{rails → spec/rails}/matchers/redirect_to_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 ['isolation','integration'].each do |mode|
   describe "redirect_to behaviour", :type => :controller do
@@ -202,7 +202,16 @@ require File.dirname(__FILE__) + '/../../spec_helper'
       route = {:controller => "nonexistant", :action => "none"}
       lambda {
         response.should redirect_to(route)
-      }.should raise_error(ActionController::RoutingError, /(no route found to match|No route matches) \"\/nonexistant\/none\" with \{\}/)
+      }.should raise_error(ActionController::RoutingError, /(no route found to match|No route matches) \"\/nonexistant\/none\" with \{.*\}/)
+    end
+    
+    it "provides a description" do
+      redirect_to("foo/bar").description.should == %q|redirect to "foo/bar"|
+    end
+
+    it "redirects to action with http method restriction" do
+      post 'action_to_redirect_to_action_with_method_restriction'
+      response.should redirect_to(:action => 'action_with_method_restriction')
     end
 
   end

data/spec/{rails → spec/rails}/matchers/render_template_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 ['isolation','integration'].each do |mode|
   describe "response.should render_template (in #{mode} mode)",
@@ -51,14 +51,14 @@ require File.dirname(__FILE__) + '/../../spec_helper'
       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(.rhtml)?\"/)
+      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.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
@@ -72,7 +72,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
       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(\.rhtml)?\"/)
+      }.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
@@ -88,6 +88,10 @@ require File.dirname(__FILE__) + '/../../spec_helper'
         response.should render_template('action_with_alternate_layout')
       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)",

data/spec/{rails → spec/rails}/matchers/should_change_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "should change" do
   describe "handling association proxies" do

data/spec/{rails → spec/rails}/mocks/mock_model_spec.rb

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

data/spec/{rails → spec/rails}/mocks/stub_model_spec.rb

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

data/spec/{rails → spec/rails}/sample_modified_fixture.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "A sample spec", :type => :model do
   fixtures :animals

data/spec/{rails → spec/rails}/sample_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "A sample spec", :type => :model do
   fixtures :animals

data/spec/spec/rails/spec_server_spec.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "script/spec_server file", :shared => true do
+  attr_accessor :tmbundle_install_directory
+  attr_reader :animals_yml_path, :original_animals_content
+
+  before do
+    @animals_yml_path = File.expand_path("#{RAILS_ROOT}/spec/fixtures/animals.yml")
+    @original_animals_content = File.read(animals_yml_path)
+  end
+
+  after do
+    File.open(animals_yml_path, "w") do |f|
+      f.write original_animals_content
+    end
+  end
+
+  after(:each) do
+    system "lsof -i tcp:8989 | sed /COMMAND/d | awk '{print $2}' | xargs kill"
+  end
+
+  it "runs a spec" do
+    dir = File.expand_path(File.dirname(__FILE__))
+    output = ""
+    Timeout.timeout(10) do
+      loop do
+        output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
+        break unless output.include?("No server is running")
+      end
+    end
+
+    if $?.exitstatus != 0 || output !~ /0 failures/
+      flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
+    end
+
+    fixtures = YAML.load(@original_animals_content)
+    fixtures['pig']['name'] = "Piggy"
+
+    File.open(animals_yml_path, "w") do |f|
+      f.write YAML.dump(fixtures)
+    end
+
+    Timeout.timeout(10) do
+      loop do
+        output = `#{RAILS_ROOT}/script/spec #{dir}/sample_modified_fixture.rb --drb 2>&1`
+        break unless output.include?("No server is running")
+      end
+    end
+
+    if $?.exitstatus != 0 || output !~ /0 failures/
+      flunk "command 'script/spec spec/sample_modified_fixture' failed\n#{output}"
+    end
+  end
+
+  def start_spec_server
+    dir = File.dirname(__FILE__)
+    Thread.start do
+      system "cd #{RAILS_ROOT}; script/spec_server"
+    end
+
+    file_content = ""
+  end
+end
+
+describe "script/spec_server file without TextMate bundle" do
+  it_should_behave_like "script/spec_server file"
+  before(:each) do
+    start_spec_server
+  end
+end
+
+describe "script/spec_server file with TextMate bundle" do
+  it_should_behave_like "script/spec_server file"
+  before(:each) do
+    dir = File.dirname(__FILE__)
+    @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
+    @bundle_name = "RSpec.tmbundle"
+    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}"|)
+      raise "Creating link to Textmate Bundle"
+    end
+    start_spec_server
+  end
+
+  after(:each) do
+    bundle_file_to_remove = "#{tmbundle_install_directory}/#{@bundle_name}"
+    if bundle_file_to_remove == "/"
+      raise "bundle file path resolved to '/' - could not call rm"
+    end
+    unless system(%Q|rm "#{bundle_file_to_remove}"|)
+      raise "Removing Textmate bundle link failed"
+    end
+  end
+end

data/spec/{rails → spec/rails}/spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "script/spec file" do
   it "should run a spec" do

data/spec/spec_helper.rb

@@ -1,19 +1,24 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.expand_path("#{dir}/../rspec/lib"))
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/controllers"))
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/helpers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/controllers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/helpers"))
 require File.expand_path("#{dir}/../../../../spec/spec_helper")
-require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/helpers/addition_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper")
-
-extra_controller_paths = File.expand_path("#{dir}/../spec_resources/controllers")
+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/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")
+require File.expand_path("#{dir}/resources/helpers/addition_helper")
+require File.expand_path("#{dir}/resources/helpers/explicit_helper")
+require File.expand_path("#{dir}/resources/helpers/more_explicit_helper")
+require File.expand_path("#{dir}/resources/helpers/view_spec_helper")
+require File.expand_path("#{dir}/resources/helpers/plugin_application_helper")
+
+require File.expand_path("#{dir}/resources/models/animal")
+require File.expand_path("#{dir}/resources/models/person")
+require File.expand_path("#{dir}/resources/models/thing")
+
+extra_controller_paths = File.expand_path("#{dir}/resources/controllers")
 
 unless ActionController::Routing.controller_paths.include?(extra_controller_paths)
   ActionController::Routing.instance_eval {@possible_controllers = nil}
@@ -24,7 +29,7 @@ module Spec
   module Rails
     module Example
       class ViewExampleGroupController
-        set_view_path File.join(File.dirname(__FILE__), "..", "spec_resources", "views")
+        set_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views")
       end
     end
   end
@@ -50,7 +55,11 @@ Spec::Runner.configure do |config|
 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.connect ":controller/:action/:id"