rspec-rails 1.2.7.1 → 1.2.9

data/spec/spec/rails/matchers/render_template_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|
@@ -69,6 +69,13 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
           should render_template('non_existent_template')
         end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(\.html\.erb)?\"/)
       end
+
+      it "fails when redirected" do
+        post :action_with_redirect
+        lambda do
+          should render_template(:some_action)
+        end.should fail_with(/expected \"some_action\", got redirected to \"http:\/\/test.host\/render_spec\/some_action\"/)
+      end
     
       it "fails when template is associated with a different controller but controller is not specified" do
         post 'action_which_renders_template_from_other_controller'

data/spec/spec/rails/matchers/should_change_spec.rb

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

data/spec/spec/rails/mocks/mock_model_spec.rb

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

data/spec/spec/rails/mocks/stub_model_spec.rb

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

data/spec/spec/rails/sample_modified_fixture.rb

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

data/spec/spec/rails/sample_spec.rb

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

data/spec/spec/rails/spec_spec.rb

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

data/spec/spec_helper.rb

@@ -1,36 +1,35 @@
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../rspec/lib"))
-$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}/resources/controllers/application")
-require File.expand_path("#{dir}/resources/controllers/render_spec_controller")
-require File.expand_path("#{dir}/resources/controllers/controller_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")
+$LOAD_PATH.unshift '../rspec/lib'
+$LOAD_PATH.unshift '../../../'
+$LOAD_PATH.unshift 'spec/resources/controllers'
+$LOAD_PATH.unshift 'spec/resources/helpers'
 
-require File.expand_path("#{dir}/resources/models/animal")
-require File.expand_path("#{dir}/resources/models/person")
-require File.expand_path("#{dir}/resources/models/thing")
+require '../../../spec/spec_helper'
 
-extra_controller_paths = File.expand_path("#{dir}/resources/controllers")
+require 'spec/resources/controllers/application'
+require 'spec/resources/controllers/render_spec_controller'
+require 'spec/resources/controllers/controller_spec_controller'
+require 'spec/resources/controllers/rjs_spec_controller'
+require 'spec/resources/controllers/redirect_spec_controller'
+require 'spec/resources/controllers/action_view_base_spec_controller'
+require 'spec/resources/helpers/addition_helper'
+require 'spec/resources/helpers/explicit_helper'
+require 'spec/resources/helpers/more_explicit_helper'
+require 'spec/resources/helpers/view_spec_helper'
+require 'spec/resources/helpers/plugin_application_helper'
+require 'spec/resources/models/animal'
+require 'spec/resources/models/person'
+require 'spec/resources/models/thing'
 
-unless ActionController::Routing.controller_paths.include?(extra_controller_paths)
+unless ActionController::Routing.controller_paths.include?('spec/resources/controllers')
   ActionController::Routing.instance_eval {@possible_controllers = nil}
-  ActionController::Routing.controller_paths << extra_controller_paths
+  ActionController::Routing.controller_paths << 'spec/resources/controllers'
 end
 
 module Spec
   module Rails
     module Example
       class ViewExampleGroupController
-        prepend_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views")
+        prepend_view_path 'spec/resources/views'
       end
     end
   end
@@ -56,7 +55,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resources :rspec_on_rails_specs
   map.custom_route 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
-  map.connect ":controller/:action/:id"
+  map.connect ':controller/:action/:id'
 end
 
 module HelperMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.7.1
+  version: 1.2.9
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -05:00
+date: 2009-10-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.7
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.11
+        version: 0.3.99
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.3.3
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -66,6 +66,7 @@ extra_rdoc_files:
 - generators/rspec/templates/previous_failures.txt
 files: 
 - .document
+- Contribute.rdoc
 - History.rdoc
 - License.txt
 - Manifest.txt
@@ -82,7 +83,6 @@ files:
 - generators/rspec/templates/rspec.rake
 - generators/rspec/templates/script/autospec
 - generators/rspec/templates/script/spec
-- generators/rspec/templates/script/spec_server
 - generators/rspec/templates/spec.opts
 - generators/rspec/templates/spec_helper.rb
 - generators/rspec_controller/USAGE
@@ -136,8 +136,8 @@ files:
 - lib/spec/rails/matchers/include_text.rb
 - lib/spec/rails/matchers/redirect_to.rb
 - lib/spec/rails/matchers/render_template.rb
+- lib/spec/rails/matchers/route_to.rb
 - lib/spec/rails/mocks.rb
-- lib/spec/rails/spec_server.rb
 - lib/spec/rails/version.rb
 - spec/autotest/mappings_spec.rb
 - spec/rails_suite.rb
@@ -228,7 +228,6 @@ files:
 - spec/spec/rails/mocks/stub_model_spec.rb
 - spec/spec/rails/sample_modified_fixture.rb
 - spec/spec/rails/sample_spec.rb
-- spec/spec/rails/spec_server_spec.rb
 - spec/spec/rails/spec_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -238,7 +237,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-1.2.7.1
+    Thank you for installing rspec-rails-1.2.9
     
     If you are upgrading, do this in each of your rails apps
     that you want to upgrade:
@@ -270,9 +269,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec-rails 1.2.7.1
+summary: rspec-rails 1.2.9
 test_files: []
 

data/generators/rspec/templates/script/spec_server

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-
-puts "Loading Rails environment"
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
-
-require 'optparse'
-require 'spec/rails/spec_server'

data/lib/spec/rails/spec_server.rb

@@ -1,135 +0,0 @@
-require 'spec/deprecation'
-Spec.deprecate('spec_server', 'spork (gem install spork)')
-
-if Rails::VERSION::STRING >= '2.2' && Rails.configuration.cache_classes
-  raise <<-MESSAGE
-
-#{'*'*65}
-
-  Rails.configuration.cache_classes == true
-  
-  This means that spec_server won't reload your classes when
-  you change them, which defeats the purpose of spec_server.
-  
-  Please set 'config.cache_classes = false' (it's probably
-  set to true in config/environments/test.rb) and give it
-  another try.
-
-#{'*'*65}
-MESSAGE
-end
-
-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
-          )
-        )
-
-        if ::ActionController::Dispatcher.respond_to?(:cleanup_application)
-          ::ActionController::Dispatcher.cleanup_application
-        else
-          dispatcher.cleanup_application
-        end
-        
-      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
-
-options = Hash.new
-parser = OptionParser.new
-parser.on("-d", "--daemon")     {|ignore| options[:daemon] = true }
-parser.on("-p", "--pid PIDFILE"){|pid|    options[:pid]    = pid  }
-parser.parse!(ARGV)
-
-if options[:daemon]
-  ::Spec::Rails::SpecServer.daemonize(options[:pid])
-else
-  ::Spec::Rails::SpecServer.run
-end

data/spec/spec/rails/spec_server_spec.rb

@@ -1,108 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-shared_examples_for "script/spec_server file" do
-  attr_accessor :tmbundle_install_directory, :tmbundle_source_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(20) 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(20) 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}; CACHE_CLASSES=#{(Rails::VERSION::STRING < '2.2')} 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"
-  def tmbundle_directory
-    current_directory = File.expand_path("#{File.dirname(__FILE__)}/../../../../../../")
-    directories = current_directory.split('/')
-    while directories.any?
-      current_directory = File.join(*directories)
-      bundle_directory = File.join(current_directory, @bundle_name)
-      return bundle_directory if File.directory?(bundle_directory)
-      directories.pop
-    end
-  end
-
-  before(:each) do
-    @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
-    @bundle_name = "RSpec.tmbundle"
-    @tmbundle_source_directory = tmbundle_directory
-
-    FileUtils.mkdir_p(tmbundle_install_directory)
-    File.directory?(tmbundle_source_directory).should be_true
-    unless system(%Q|ln -s #{tmbundle_source_directory} "#{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