rspec-rails 1.1.12 → 1.2.0

data/lib/spec/rails/matchers/redirect_to.rb

@@ -4,21 +4,35 @@ module Spec
 
       class RedirectTo  #:nodoc:
 
+        include ActionController::StatusCodes
+
         def initialize(request, expected)
           @expected = expected
           @request = request
         end
 
-        def matches?(response)
+        def matches?(response_or_controller)
+          response  = response_or_controller.respond_to?(:response) ?
+                      response_or_controller.response :
+                      response_or_controller
+
           @redirected = response.redirect?
           @actual = response.redirect_url
           return false unless @redirected
+
+          if @expected_status
+            @actual_status = interpret_status(response.code.to_i)
+            @status_matched = @expected_status == @actual_status
+          else
+            @status_matched = true
+          end
+
           if @expected.instance_of? Hash
             return false unless @actual =~ %r{^\w+://#{@request.host}}
             return false unless actual_redirect_to_valid_route
-            return actual_hash == expected_hash
+            return actual_hash == expected_hash && @status_matched
           else
-            return @actual == expected_url
+            return @actual == expected_url && @status_matched
           end
         end
 
@@ -45,9 +59,14 @@ module Spec
 
         def query_hash(url)
           query = url.split("?", 2)[1] || ""
-          QueryParameterParser.parse_query_parameters(query, @request)
+          Rack::Utils.parse_query(query)
         end
 
+        def with(options)
+          @expected_status = interpret_status(options[:status])
+          self
+        end
+        
        def expected_url
           case @expected
             when Hash
@@ -61,33 +80,25 @@ module Spec
           end
         end
 
-        def failure_message
+        def failure_message_for_should
           if @redirected
-            return %Q{expected redirect to #{@expected.inspect}, got redirect to #{@actual.inspect}}
+            if @status_matched
+              return %Q{expected redirect to #{@expected.inspect}, got redirect to #{@actual.inspect}}
+            else
+              return %Q{expected redirect to #{@expected.inspect} with status #{@expected_status}, got #{@actual_status}}
+            end
           else
             return %Q{expected redirect to #{@expected.inspect}, got no redirect}
           end
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
             return %Q{expected not to be redirected to #{@expected.inspect}, but was} if @redirected
         end
 
         def description
           "redirect to #{@expected.inspect}"
         end
-
-        class QueryParameterParser
-          def self.parse_query_parameters(query, request)
-            if defined?(CGIMethods)
-              CGIMethods.parse_query_parameters(query)
-            elsif defined?(ActionController::RequestParser)
-              ActionController::RequestParser.parse_query_parameters(query)
-            else
-              request.class.parse_query_parameters(query)
-            end
-          end
-        end
       end
 
       # :call-seq:

data/lib/spec/rails/matchers/render_template.rb

@@ -9,7 +9,11 @@ module Spec
           @expected = expected
         end
       
-        def matches?(response)
+        def matches?(response_or_controller)
+          response  = response_or_controller.respond_to?(:response) ?
+                      response_or_controller.response :
+                      response_or_controller
+
           if response.respond_to?(:rendered_file)
             @actual = response.rendered_file
           elsif response.respond_to?(:rendered)
@@ -32,11 +36,11 @@ module Spec
           given_controller_path == expected_controller_path && given_file.match(expected_file)
         end
         
-        def failure_message
+        def failure_message_for_should
           "expected #{@expected.inspect}, got #{@actual.inspect}"
         end
         
-        def negative_failure_message
+        def failure_message_for_should_not
           "expected not to render #{@expected.inspect}, but did"
         end
         

data/lib/spec/rails/mocks.rb

@@ -17,7 +17,7 @@ module Spec
           :errors => stub("errors", :count => 0)
         })
         m = mock("#{model_class.name}_#{id}", options_and_stubs)
-        m.send(:__mock_proxy).instance_eval <<-CODE
+        m.__send__(:__mock_proxy).instance_eval <<-CODE
           def @target.as_new_record
             self.stub!(:id).and_return nil
             self.stub!(:to_param).and_return nil

data/lib/spec/rails/spec_server.rb

@@ -0,0 +1,97 @@
+require 'drb/drb'
+require 'rbconfig'
+
+# This is based on Florian Weber's TDDMate
+module Spec
+  module Rails
+    class SpecServer
+      class << self
+        def restart_test_server
+          puts "restarting"
+          config       = ::Config::CONFIG
+          ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+          command_line = [ruby, $0, ARGV].flatten.join(' ')
+          exec(command_line)
+        end
+
+        def daemonize(pid_file = nil)
+          return yield if $DEBUG
+          pid = Process.fork{
+            Process.setsid
+            Dir.chdir(RAILS_ROOT)
+            trap("SIGINT"){ exit! 0 }
+            trap("SIGTERM"){ exit! 0 }
+            trap("SIGHUP"){ restart_test_server }
+            File.open("/dev/null"){|f|
+              STDERR.reopen f
+              STDIN.reopen  f
+              STDOUT.reopen f
+            }
+            run
+          }
+          puts "spec_server launched (PID: %d)" % pid
+          File.open(pid_file,"w"){|f| f.puts pid } if pid_file
+          exit! 0
+        end
+
+        def run
+          trap("USR2") { ::Spec::Rails::SpecServer.restart_test_server } if Signal.list.has_key?("USR2")
+          DRb.start_service("druby://127.0.0.1:8989", ::Spec::Rails::SpecServer.new)
+          DRb.thread.join
+        end
+      end
+      
+      def run(argv, stderr, stdout)
+        $stdout = stdout
+        $stderr = stderr
+        
+        ::Rails::Configuration.extend Module.new {def cache_classes; false; end}
+
+        ::ActiveSupport.const_defined?(:Dependencies) ?
+          ::ActiveSupport::Dependencies.mechanism = :load :
+          ::Dependencies.mechanism = :load
+        
+        require 'action_controller/dispatcher'
+        dispatcher = ::ActionController::Dispatcher.new($stdout)
+
+        if ::ActionController::Dispatcher.respond_to?(:reload_application)
+          ::ActionController::Dispatcher.reload_application
+        else
+          dispatcher.reload_application
+        end
+        
+        if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
+          Fixtures.reset_cache
+        end
+
+        unless Object.const_defined?(:ApplicationController)
+          %w(application_controller.rb application.rb).each do |name|
+            require_dependency(name) if File.exists?("#{RAILS_ROOT}/app/controllers/#{name}")
+          end
+        end
+        load "#{RAILS_ROOT}/spec/spec_helper.rb"
+
+        if in_memory_database?
+          load "#{RAILS_ROOT}/db/schema.rb"
+          ActiveRecord::Migrator.up('db/migrate')
+        end
+        
+        ::Spec::Runner::CommandLine.run(
+          ::Spec::Runner::OptionParser.parse(
+            argv,
+            $stderr,
+            $stdout
+          )
+        )
+
+        dispatcher.cleanup_application if dispatcher.respond_to?(:cleanup_application)
+      end
+
+      def in_memory_database?
+        ENV["RAILS_ENV"] == "test" and
+        ::ActiveRecord::Base.connection.class.to_s == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" and
+        ::Rails::Configuration.new.database_configuration['test']['database'] == ':memory:'
+      end
+    end
+  end
+end

data/lib/spec/rails/story_adapter.rb

@@ -14,8 +14,8 @@ require 'spec/rails'
 
 Test::Unit.run = true
 
-ActionController::Integration::Session.send(:include, Spec::Matchers)
-ActionController::Integration::Session.send(:include, Spec::Rails::Matchers)
+ActionController::Integration::Session.__send__ :include, Spec::Matchers
+ActionController::Integration::Session.__send__ :include, Spec::Rails::Matchers
 
 class RailsStory < ActionController::IntegrationTest
   if defined?(ActiveRecord::Base)
@@ -43,7 +43,7 @@ class ActiveRecordSafetyListener
       if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
         ActiveRecord::Base.connection.increment_open_transactions
       else
-        ActiveRecord::Base.send :increment_open_transactions
+        ActiveRecord::Base.__send__ :increment_open_transactions
       end
     end
     ActiveRecord::Base.connection.begin_db_transaction
@@ -55,7 +55,7 @@ class ActiveRecordSafetyListener
       if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
         ActiveRecord::Base.connection.decrement_open_transactions
       else
-        ActiveRecord::Base.send :decrement_open_transactions
+        ActiveRecord::Base.__send__ :decrement_open_transactions
       end
     end
   end

data/lib/spec/rails/version.rb

@@ -3,8 +3,8 @@ module Spec
     module VERSION #:nodoc:
       unless defined? MAJOR
         MAJOR  = 1
-        MINOR  = 1
-        TINY   = 12
+        MINOR  = 2
+        TINY   = 0
         MINESCULE = nil
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')

data/spec/resources/controllers/controller_spec_controller.rb

@@ -7,7 +7,7 @@ class ControllerSpecController < ActionController::Base
   
   skip_before_filter :raise_error
 
-  set_view_path File.join(File.dirname(__FILE__), "..", "views")
+  prepend_view_path File.join(File.dirname(__FILE__), "..", "views")
   
   def some_action
     render :template => "template/that/does/not/actually/exist"
@@ -82,25 +82,33 @@ class ControllerSpecController < ActionController::Base
     render :text => ""
   end
   
+  def action_that_renders_inline
+    render :inline => "<%= 'inline code' %>"
+  end
+  
   def action_that_assigns_false_to_a_variable
     @a_variable = false
     render :text => ""
   end
   
+  def action_with_two_arg_render
+    render :update, :status => 404 do |page|
+      page.visual_effect :highlight, 'user_list'
+    end
+  end
+  
   class RescuedError < Exception; end
   class UnRescuedError < Exception; end
   
-  if Rails::VERSION::MAJOR >= 2
-    rescue_from RescuedError do |e|
-      render :text => 'Rescued!'
-    end
+  rescue_from RescuedError do |e|
+    render :text => 'Rescued!'
   end
 
   def rescued_error_action
     raise RescuedError
   end
 
-  def other_error_action
+  def un_rescued_error_action
     raise UnRescuedError
   end
 end

data/spec/resources/controllers/example.txt

@@ -0,0 +1 @@
+This is an example file to download.

data/spec/resources/controllers/redirect_spec_controller.rb

@@ -62,5 +62,9 @@ class RedirectSpecController < ApplicationController
   def action_to_redirect_to_action_with_method_restriction
     redirect_to :action => 'action_with_method_restriction'
   end
+
+  def action_with_redirect_to_somewhere_with_status
+    redirect_to :action => 'somewhere', :status => 301
+  end
 end
 

data/spec/resources/controllers/render_spec_controller.rb

@@ -1,5 +1,5 @@
 class RenderSpecController < ApplicationController
-  set_view_path File.join(File.dirname(__FILE__), "..", "views")
+  prepend_view_path File.join(File.dirname(__FILE__), "..", "views")
   
   def some_action
     respond_to do |format|

data/spec/resources/controllers/rjs_spec_controller.rb

@@ -1,5 +1,5 @@
 class RjsSpecController < ApplicationController
-  set_view_path File.join(File.dirname(__FILE__), "..", "views")
+  prepend_view_path File.join(File.dirname(__FILE__), "..", "views")
   
   def replace_html
   end

data/spec/resources/helpers/explicit_helper.rb

@@ -35,7 +35,7 @@ module ExplicitHelper
   def flash_thing
     flash[:thing]
   end
-  
+
   def method_using_output_buffer
     concat("the_text_from_concat")
   end

data/spec/spec/rails/example/assigns_hash_proxy_spec.rb

@@ -5,14 +5,27 @@ describe "AssignsHashProxy" do
     @object.assigns
   end
   
+  class Foo
+    def initialize(bar)
+      @bar = bar
+    end
+    attr_reader :bar
+
+    def ==(other)
+      self.bar == other.bar
+    end
+  end
+
   before(:each) do
     @object = Class.new do
-      attr_accessor :assigns
+      def assigns; @assigns ||= Hash.new; end
     end.new
-    @object.assigns = Hash.new
-    @proxy = Spec::Rails::Example::AssignsHashProxy.new self do
-      @object
-    end
+    @proxy = Spec::Rails::Example::AssignsHashProxy.new(self) {@object}
+  end
+  
+  it "doesn't wig out on objects that define their own == method" do
+    @object.assigns['foo'] = Foo.new(1)
+    @proxy['foo'].should == Foo.new(1)
   end
   
   it "should set ivars on object using string" do