rspec-rails 1.2.0 → 1.2.1

data/.document

@@ -1,7 +1,7 @@
 lib/**/*.rb
-History.txt
+History.rdoc
 License.txt
-README.txt
-Upgrade.markdown
+README.rdoc
+Upgrade.rdoc
 features/**/*.feature
 

data/{History.txt → History.rdoc}

@@ -1,10 +1,33 @@
-=== Version 1.1.99.x (in git)
+=== Version 1.2.1 / 2009-03-22
 
-IMPORTANT: See Upgrade.markdown for information about upgrading to rspec-rails-1.1.99.4
+IMPORTANT: See Upgrade.rdoc for information about upgrading to rspec-rails-1.2.1
+
+* enhancements
+
+  * more cleanup of internals (reducing dependency on rspec-core)
+  * don't require config/environments more than once
+  * autotest includes spec/routing directory (Matt Peterson). Closes #739.
+  * display helpful messages when installing rspec-rails running script/generate rspec
+    * thanks for Dr Nic for the pointers
+  * restored require 'rubygems' where needed
+    * export NO_RUBYGEMS=true if you don't use rubygems
+    
+* bug fixes
+
+  * fix scoping issues in rspec-rails' own suite for ruby 1.9.1 (Matthias
+    Hennemeyer). Closes #717.
+  * rake stats no longer hides test directories. Closes #748.
+  * fixed regression that was introduced in 1.2 in which controller_name
+    failed to override the controller class passed to describe() (patches from
+    Aaron Gibralter and Zach Dennis). Closes #732.
+
+=== Version 1.2.0 / 2009-03-15
+
+IMPORTANT: See Upgrade.rdoc for information about upgrading to rspec-rails-1.2.0
 
 IMPORTANT: This release includes the following backwards-compatibility-breaking changes.
 
-* rspec-rails supports rails 2.0.2, 2.1.2 and 2.2.2.
+* rspec-rails supports rails 2.0.2, 2.1.2, 2.2.2 and 2.3.2
   
   * We are no longer supporting 1.x versions of rails.
 

data/Manifest.txt

@@ -1,11 +1,11 @@
 .document
-History.txt
+History.rdoc
 License.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO.txt
-Upgrade.markdown
+Upgrade.rdoc
 features/step_definitions/people.rb
 features/support/env.rb
 features/transactions/transactions_should_rollback.feature

data/Rakefile

@@ -1,4 +1,5 @@
-require 'rubygems'
+# -*- ruby -*-
+gem 'hoe', '>=1.9.0'
 require 'hoe'
 require './lib/spec/rails/version'
 require 'cucumber/rake/task'
@@ -7,22 +8,32 @@ $:.unshift(File.join(File.dirname(__FILE__), "/../rspec/lib"))
 
 require 'spec/rake/spectask'
 
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
 Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.summary = Spec::Rails::VERSION::SUMMARY
   p.url = 'http://rspec.info/'
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.2.0"],["rack",">=0.4.0"]]
-  p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
+  p.extra_deps = [["rspec","1.2.1"],["rack",">=0.4.0"]]
+  p.extra_dev_deps = [["cucumber",">= 0.1.16"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
+  p.history_file = 'History.rdoc'
+  p.readme_file  = 'README.rdoc'
+  p.post_install_message = <<-POST_INSTALL_MESSAGE
+#{'*'*50}
+
+  Thank you for installing rspec-rails-#{Spec::Rails::VERSION::STRING}
+  
+  If you are upgrading, do this in each of your rails apps
+  that you want to upgrade:
+
+    $ ruby script/generate rspec
+
+  Please be sure to read History.rdoc and Upgrade.rdoc
+  for useful information about this release.
+
+#{'*'*50}
+POST_INSTALL_MESSAGE
 end
 
 ['audit','test','test_deps','default','post_blog', 'release'].each do |task|

data/{Upgrade.markdown → Upgrade.rdoc}

@@ -1,8 +1,8 @@
-# Upgrade to rspec-rails-1.1.99.x (pre rspec-rails-1.2)
+= Upgrade to 1.2.0
 
-## What's changed
+== What's changed
 
-### Supported Rails Versions
+=== Supported Rails Versions
 
 This release supports the following versions of rails:
 
@@ -11,7 +11,7 @@ This release supports the following versions of rails:
 * 2.2.2
 * 2.3.1
 
-### update generated files
+=== update generated files
 
 Be sure to run "script/generate rspec" and allow the following files to be overwritten:
 
@@ -19,20 +19,20 @@ Be sure to run "script/generate rspec" and allow the following files to be overw
 * script/spec
 * script/spec_server
 
-### ``controller.use_rails_error_handling!`` is deprecated
+=== controller.use_rails_error_handling! is deprecated
 
-Use ``rescue_action_in_public!`` instead. It comes directly from rails and does
+Use <tt>rescue_action_in_public!</tt> instead. It comes directly from rails and does
 exactly the same thing
 
-### route_for
+=== route_for
 
-After a change to edge rails broke our monkey-patched ``route_for`` method, I
-decided to just delegate to rails' ``assert_generates`` method. For most cases,
+After a change to edge rails broke our monkey-patched <tt>route_for</tt> method, I
+decided to just delegate to rails' <tt>assert_generates</tt> method. For most cases,
 this will not present a problem, but for some it might. You'll know if you
 upgrade and see any newly failing, route-related examples. Here are the things
 that you might need to change.
 
-#### Make sure IDs are strings
+==== Make sure IDs are strings
 
 If you had :id => 1 before, you need to change that to :id => "1"
 
@@ -42,7 +42,7 @@ If you had :id => 1 before, you need to change that to :id => "1"
     #new
     route_for(:controller => 'things', :action => 'show', :id => "1").should == "/things/1"
   
-#### Convert paths for non-get methods to hashes
+==== Convert paths for non-get methods to hashes
 
 If you had an example with a route that requires post, put, or delete, you'll
 need to declare that explicitly.
@@ -53,23 +53,23 @@ need to declare that explicitly.
     #new
     route_for(:controller => 'things', :action => 'create').should == {:path => "/things", :method => :post}
   
-### Controller/template isolation
+=== Controller/template isolation
 
 Even though controller specs do not render views by default (use
-``integrate_views`` to get them to render views), the way this works has
+<tt>integrate_views</tt> to get them to render views), the way this works has
 changed in this version.
 
 It used to be that the view template need not even exist, but due to changes
 in rails it became much more difficult to manage that for all the different
 versions of rails that rspec-rails supports. So now the template must exist,
-but it still won't be rendered unless you declare ``integrate_views``.
+but it still won't be rendered unless you declare <tt>integrate_views</tt>.
 
-## What's new
+== What's new
 
-### render no longer requires a path
+=== render no longer requires a path
 
-The ``render()`` method in view specs will infer the path from the
-first argument passed to ``describe()``.
+The <tt>render()</tt> method in view specs will infer the path from the
+first argument passed to <tt>describe()</tt>.
 
     describe "players/show" do
       it "does something" do
@@ -78,16 +78,16 @@ first argument passed to ``describe()``.
       end
     end
     
-### routing specs live in spec/routing
+=== routing specs live in spec/routing
 
-``script/generate rspec_scaffold`` now generates its routing spec in
-``spec/routing/``.
+<tt>script/generate rspec_scaffold</tt> now generates its routing spec in
+<tt>spec/routing/</tt>.
 
-### bypass_rescue
+=== bypass_rescue
 
-Added a new ``bypass_rescue()`` declaration for controller specs. Use this
+Added a new <tt>bypass_rescue()</tt> declaration for controller specs. Use this
 when you want to specify that an error is raised by an action, even if that
-error is later captured by a ``rescue_from()`` declaration.
+error is later captured by a <tt>rescue_from()</tt> declaration.
 
     describe AccountController do
       describe "GET @account" do

data/generators/rspec/rspec_generator.rb

@@ -6,6 +6,23 @@ class RspecGenerator < Rails::Generator::Base
                               Config::CONFIG['ruby_install_name'])
 
   def initialize(runtime_args, runtime_options = {})
+    if test ?f, 'spec/spec_helper.rb'
+      
+      puts <<-HELPFUL_INSTRUCTIONS
+
+It looks like you are upgrading rspec-rails in this application. Please let
+this script overwrite everything it wants to with the following exceptions,
+*if* you have customized any of these files:
+
+  * spec/spec.opts
+  * spec/rcov.opts
+  * spec/spec_helper.rb
+  
+If you have customized spec/spec_helper.rb, please set aside a copy of that
+file so that it can be updated and you can manually restore your changes.
+
+HELPFUL_INSTRUCTIONS
+    end
     Dir.mkdir('lib/tasks') unless File.directory?('lib/tasks')
     super
   end

data/generators/rspec/templates/rspec.rake

@@ -1,19 +1,4 @@
 gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-rspec_gem_dir = nil
-Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
-  rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
-end
-rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
-
-if rspec_gem_dir && (test ?d, rspec_plugin_dir)
-  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
-end
-
-if rspec_gem_dir
-  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
-elsif File.exist?(rspec_plugin_dir)
-  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
-end
 
 # Don't load rspec if running "rake gems:*"
 unless ARGV.any? {|a| a =~ /^gems/}
@@ -120,7 +105,6 @@ namespace :spec do
     ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
     ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
     ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
   end
 
   namespace :db do

data/generators/rspec/templates/script/spec

@@ -1,22 +1,10 @@
 #!/usr/bin/env ruby
-gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-rails_root = File.expand_path(File.dirname(__FILE__) + "/..")
-rspec_gem_dir = nil
-Dir["#{rails_root}/vendor/gems/*"].each do |subdir|
-  rspec_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
+if ARGV.any? {|arg| %w[--drb -X --generate-options -G --help -h --version -v].include?(arg)}
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+else
+  gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+  ENV["RAILS_ENV"] ||= 'test'
+  require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 end
-rspec_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec")
-
-if rspec_gem_dir && (test ?d, rspec_plugin_dir)
-  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
-end
-
-if rspec_gem_dir
-  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
-elsif File.exist?(rspec_plugin_dir)
-  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
-end
-
-
 require 'spec/autorun'
 exit ::Spec::Runner::CommandLine.run

data/generators/rspec/templates/script/spec_server

@@ -1,52 +1,9 @@
 #!/usr/bin/env ruby
 gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-rails_root = File.expand_path(File.dirname(__FILE__) + "/..")
-rspec_rails_gem_dir = nil
-Dir["#{rails_root}/vendor/gems/*"].each do |subdir|
-  rspec_rails_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-rails-(\d+)/
-end
-rspec_rails_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec-rails")
 
-if rspec_rails_gem_dir && (test ?d, rspec_rails_plugin_dir)
-  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
-end
-
-if rspec_rails_gem_dir
-  $LOAD_PATH.unshift("#{rspec_rails_gem_dir}/lib") 
-elsif File.exist?(rspec_rails_plugin_dir)
-  $LOAD_PATH.unshift("#{rspec_rails_plugin_dir}/lib")
-end
+puts "Loading Rails environment"
+ENV["RAILS_ENV"] ||= 'test'
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
 require 'optparse'
 require 'spec/rails/spec_server'
-
-puts "Loading Rails environment"
-
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-
-if Rails::VERSION::STRING >= '2.2' && Rails.configuration.cache_classes
-  warn <<-MESSAGE
-
-#{'*'*50}
-
-spec_server won't reload your classes if config.cache_classes
-is set to true. Please modify environment/test.rb:
-
-    config.cache_classes = false
-
-#{'*'*50}
-MESSAGE
-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/generators/rspec/templates/spec_helper.rb

@@ -1,7 +1,7 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+ENV["RAILS_ENV"] ||= 'test'
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 require 'spec/autorun'
 require 'spec/rails'
 

data/lib/autotest/rails_rspec.rb

@@ -35,7 +35,7 @@ Autotest.add_hook :initialize do |at|
   at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
     ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
   }
-  at.add_mapping(%r%^spec/(models|controllers|views|helpers|lib)/.*rb$%) { |filename, _|
+  at.add_mapping(%r%^spec/(models|controllers|routing|views|helpers|lib)/.*rb$%) { |filename, _|
     filename
   }
   at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
@@ -59,13 +59,13 @@ Autotest.add_hook :initialize do |at|
     end
   }
   at.add_mapping(%r%^config/routes\.rb$%) {
-    at.files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
+    at.files_matching %r%^spec/(controllers|routing|views|helpers)/.*_spec\.rb$%
   }
   at.add_mapping(%r%^config/database\.yml$%) { |_, m|
     at.files_matching %r%^spec/models/.*_spec\.rb$%
   }
   at.add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
-    at.files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
+    at.files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
   }
   at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
     ["spec/lib/#{m[1]}_spec.rb"]

data/lib/spec/rails.rb

@@ -22,7 +22,7 @@ require 'spec/rails/interop/testcase'
 
 Spec::Example::ExampleGroupFactory.default(ActiveSupport::TestCase)
 
-if ActionView::Base.respond_to?(:cache_template_extension)
+if ActionView::Base.respond_to?(:cache_template_extensions)
   ActionView::Base.cache_template_extensions = false
 end
 

data/lib/spec/rails/example/controller_example_group.rb

@@ -66,11 +66,16 @@ module Spec
             klass.subject { controller }
             super
           end
-          
+
           def set_description(*args) # :nodoc:
             super
             if described_class && described_class.ancestors.include?(ActionController::Base)
-              tests described_class
+              controller_klass = if superclass.controller_class.ancestors.include?(ActionController::Base)
+                superclass.controller_class
+              else
+                described_class
+              end
+              tests controller_klass
             end
           end
 
@@ -111,17 +116,16 @@ end
 MESSAGE
           end
           @controller.extend ControllerInstanceMethods
-          @controller.integrate_views! if @integrate_views
+          @controller.integrate_views! if integrate_views?
           @controller.session = session
         end
 
         attr_reader :response, :request, :controller
-
-        def initialize(defined_description, options={}, &implementation) #:nodoc:
-          super
-          @integrate_views = self.class.integrate_views?
-        end
         
+        def integrate_views?
+          @integrate_views || self.class.integrate_views?
+        end
+
         # Bypasses any error rescues defined with rescue_from. Useful
         # in cases in which you want to specify errors coming out of
         # actions that might be caught by a rescue_from clause that is

data/lib/spec/rails/extensions/spec/matchers/have.rb

@@ -5,8 +5,8 @@ module Spec #:nodoc:
     class Have #:nodoc:
 
       def failure_message_for_should_with_errors_on_extensions
-        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@given}" if @collection_name == :errors_on
-        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@given}" if @collection_name == :error_on
+        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
+        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}" if @collection_name == :error_on
         return failure_message_without_errors_on_extensions
       end
       alias_method_chain :failure_message_for_should, :errors_on_extensions

data/lib/spec/rails/spec_server.rb

@@ -1,3 +1,21 @@
+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'
 
@@ -95,3 +113,15 @@ module Spec
     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/lib/spec/rails/version.rb

@@ -1,16 +1,15 @@
-module Spec
-  module Rails
-    module VERSION #:nodoc:
+module Spec # :nodoc:
+  module Rails # :nodoc:
+    module VERSION # :nodoc:
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 2
-        TINY   = 0
-        MINESCULE = nil
+        TINY   = 1
 
-        STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
+        STRING = [MAJOR, MINOR, TINY].compact.join('.')
 
         SUMMARY = "rspec-rails #{STRING}"
       end
     end
   end
-end
+end

data/spec/autotest/mappings_spec.rb

@@ -33,4 +33,54 @@ describe Autotest::RailsRspec, "file mapping" do
                             to('app/views/things/index.html.erb')
   end
   
+  describe "between routes.rb and things which depend on routes" do
+    it "should map routes.rb to controllers" do
+      @autotest.should map_specs(['spec/controllers/things_controller_spec.rb']).
+                              to('config/routes.rb')
+    end
+    
+    it "should map routes.rb to views" do
+      @autotest.should map_specs(['spec/views/things/action.html.erb_spec.rb']).
+                              to('config/routes.rb')
+    end
+    
+    it "should map routes.rb to helpers" do
+      @autotest.should map_specs(['spec/helpers/things_helper_spec.rb']).
+                              to('config/routes.rb')
+    end
+    
+    it "should map routing example to routes" do
+      @autotest.should map_specs(['spec/routing/thing_spec.rb']).
+                              to('config/routes.rb')
+    end
+  end  
+  
+  describe "between the config and specs" do
+    ['spec/controllers/things_controller_spec.rb', 
+     'spec/views/things/action.html.erb_spec.rb', 
+     'spec/helpers/things_helper_spec.rb', 
+     'spec/routing/thing_spec.rb', 
+     'spec/models/thing_spec.rb'].each do |file_path|
+    
+      it "should map environment.rb to #{file_path}" do
+        @autotest.should map_specs([file_path]).
+                                to('config/environment.rb')
+      end
+      
+      it "should map environments/test.rb to #{file_path}" do
+        @autotest.should map_specs([file_path]).
+                                to('config/environments/test.rb')
+      end
+      
+      it "should map boot.rb to #{file_path}" do
+        @autotest.should map_specs([file_path]).
+                                to('config/boot.rb')
+      end
+      
+      it "should map spec_helper.rb to #{file_path}" do
+        @autotest.should map_specs([file_path]).
+                                to('spec/spec_helper.rb')
+      end
+    end
+  end
 end

data/spec/spec/rails/example/controller_example_group_spec.rb

@@ -265,6 +265,25 @@ end
 module Spec
   module Rails
     module Example
+      describe ApplicationController, :type => :controller do
+        describe "controller_name" do
+          controller_name :controller_spec
+          it "overrides the controller class submitted to the outermost group" do
+            subject.should be_an_instance_of(ControllerSpecController)
+          end
+          describe "in a nested group" do
+            it "overrides the controller class submitted to the outermost group" do
+              subject.should be_an_instance_of(ControllerSpecController)
+            end
+            describe "(doubly nested)" do
+              it "overrides the controller class submitted to the outermost group" do
+                subject.should be_an_instance_of(ControllerSpecController)
+              end
+            end
+          end
+        end
+      end
+      
       describe ControllerExampleGroup do
         it "should clear its name from the description" do
           group = describe("foo", :type => :controller) do

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

@@ -10,30 +10,30 @@ module Spec
         example_group.superclass.should == Spec::Rails::Example::ModelExampleGroup
       end
 
-      it "should return a ModelExampleGroup when given :spec_path => '/blah/spec/models/'" do
+      it "should return a ModelExampleGroup when given :location => '/blah/spec/models/'" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/models/blah.rb'
+          "name", :location => '/blah/spec/models/blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ModelExampleGroup
       end
 
-      it "should return a ModelExampleGroup when given :spec_path => '\\blah\\spec\\models\\' (windows format)" do
+      it "should return a ModelExampleGroup when given :location => '\\blah\\spec\\models\\' (windows format)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '\\blah\\spec\\models\\blah.rb'
+          "name", :location => '\\blah\\spec\\models\\blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ModelExampleGroup
       end
 
-      it "should return an ActiveSupport::TestCase when given :spec_path => '/blah/spec/foo/' (anything other than controllers, views and helpers)" do
+      it "should return an ActiveSupport::TestCase when given :location => '/blah/spec/foo/' (anything other than controllers, views and helpers)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/foo/blah.rb'
+          "name", :location => '/blah/spec/foo/blah.rb'
         ) {}
         example_group.superclass.should == ActiveSupport::TestCase
       end
 
-      it "should return an ActiveSupport::TestCase when given :spec_path => '\\blah\\spec\\foo\\' (windows format)  (anything other than controllers, views and helpers)" do
+      it "should return an ActiveSupport::TestCase when given :location => '\\blah\\spec\\foo\\' (windows format)  (anything other than controllers, views and helpers)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '\\blah\\spec\\foo\\blah.rb'
+          "name", :location => '\\blah\\spec\\foo\\blah.rb'
         ) {}
         example_group.superclass.should == ActiveSupport::TestCase
       end
@@ -45,16 +45,16 @@ module Spec
         example_group.superclass.should == Spec::Rails::Example::ViewExampleGroup
       end
 
-      it "should return a ViewExampleGroup when given :spec_path => '/blah/spec/views/'" do
+      it "should return a ViewExampleGroup when given :location => '/blah/spec/views/'" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/views/blah.rb'
+          "name", :location => '/blah/spec/views/blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ViewExampleGroup
       end
 
-      it "should return a ModelExampleGroup when given :spec_path => '\\blah\\spec\\views\\' (windows format)" do
+      it "should return a ModelExampleGroup when given :location => '\\blah\\spec\\views\\' (windows format)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '\\blah\\spec\\views\\blah.rb'
+          "name", :location => '\\blah\\spec\\views\\blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ViewExampleGroup
       end
@@ -66,16 +66,16 @@ module Spec
         example_group.superclass.should == Spec::Rails::Example::HelperExampleGroup
       end
 
-      it "should return a HelperExampleGroup when given :spec_path => '/blah/spec/helpers/'" do
+      it "should return a HelperExampleGroup when given :location => '/blah/spec/helpers/'" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/helpers/blah.rb'
+          "name", :location => '/blah/spec/helpers/blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::HelperExampleGroup
       end
 
-      it "should return a ModelExampleGroup when given :spec_path => '\\blah\\spec\\helpers\\' (windows format)" do
+      it "should return a ModelExampleGroup when given :location => '\\blah\\spec\\helpers\\' (windows format)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '\\blah\\spec\\helpers\\blah.rb'
+          "name", :location => '\\blah\\spec\\helpers\\blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::HelperExampleGroup
       end
@@ -87,23 +87,23 @@ module Spec
         example_group.superclass.should == Spec::Rails::Example::ControllerExampleGroup
       end
 
-      it "should return a ControllerExampleGroup when given :spec_path => '/blah/spec/controllers/'" do
+      it "should return a ControllerExampleGroup when given :location => '/blah/spec/controllers/'" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/controllers/blah.rb'
+          "name", :location => '/blah/spec/controllers/blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ControllerExampleGroup
       end
 
-      it "should return a ModelExampleGroup when given :spec_path => '\\blah\\spec\\controllers\\' (windows format)" do
+      it "should return a ModelExampleGroup when given :location => '\\blah\\spec\\controllers\\' (windows format)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '\\blah\\spec\\controllers\\blah.rb'
+          "name", :location => '\\blah\\spec\\controllers\\blah.rb'
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ControllerExampleGroup
       end
 
-      it "should favor the :type over the :spec_path" do
+      it "should favor the :type over the :location" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/models/blah.rb', :type => :controller
+          "name", :location => '/blah/spec/models/blah.rb', :type => :controller
         ) {}
         example_group.superclass.should == Spec::Rails::Example::ControllerExampleGroup
       end

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

@@ -1,8 +1,7 @@
-share_as :RoutingExampleGroupSpec do
-
-  class CustomRouteSpecController < ActionController::Base; end
-  class RspecOnRailsSpecsController < ActionController::Base; end
+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"

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

@@ -312,7 +312,7 @@ module Spec
 
         it "should clear ActionView::Base.base_view_path on teardown" do
           group = describe("base_view_path_cleared flag", :type => :view) {}
-          example = group.new("example",{}) {}
+          example = group.new(Spec::Example::ExampleProxy.new) {}
           
           ActionView::Base.should_receive(:base_view_path=).with(nil)
           example.run_after_each

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

@@ -61,9 +61,9 @@ module AssertSelectSpecHelpers
   end
   
   def first_non_rspec_line_in_backtrace_of(error)
-    rspec_path = File.join('rspec', 'lib', 'spec')
+    rlocation = File.join('rspec', 'lib', 'spec')
     error.backtrace.reject { |line|
-      line =~ /#{rspec_path}/
+      line =~ /#{rlocation}/
     }.first
   end
 

data/spec/spec/rails/spec_server_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "script/spec_server file", :shared => true do
+shared_examples_for "script/spec_server file" do
   attr_accessor :tmbundle_install_directory, :tmbundle_source_directory
   attr_reader :animals_yml_path, :original_animals_content
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -05:00
+date: 2009-03-22 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.0
+        version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.13
+        version: 0.1.16
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.10.0
+        version: 1.11.0
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -60,21 +60,19 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
 - License.txt
 - Manifest.txt
-- README.txt
 - TODO.txt
 - generators/rspec/templates/previous_failures.txt
 files: 
 - .document
-- History.txt
+- History.rdoc
 - License.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO.txt
-- Upgrade.markdown
+- Upgrade.rdoc
 - features/step_definitions/people.rb
 - features/support/env.rb
 - features/transactions/transactions_should_rollback.feature
@@ -235,10 +233,24 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rspec.info/
-post_install_message: 
+post_install_message: |
+  **************************************************
+  
+    Thank you for installing rspec-rails-1.2.1
+    
+    If you are upgrading, do this in each of your rails apps
+    that you want to upgrade:
+  
+      $ ruby script/generate rspec
+  
+    Please be sure to read History.rdoc and Upgrade.rdoc
+    for useful information about this release.
+  
+  **************************************************
+
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -259,6 +271,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.2.0
+summary: rspec-rails 1.2.1
 test_files: []