rspec-rails 1.1.12 → 1.2.0

data/.document

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

data/History.txt

@@ -1,3 +1,58 @@
+=== Version 1.1.99.x (in git)
+
+IMPORTANT: See Upgrade.markdown for information about upgrading to rspec-rails-1.1.99.4
+
+IMPORTANT: This release includes the following backwards-compatibility-breaking changes.
+
+* rspec-rails supports rails 2.0.2, 2.1.2 and 2.2.2.
+  
+  * We are no longer supporting 1.x versions of rails.
+
+* expect_render and stub_render have been removed.
+
+  * Both of these methods were deprecated in rspec-rails-1.1.5, released in Sept, 2008.
+  
+* { route_for(args).should == "/path" } now delegates to assert_generates (in rails)
+
+  * see Upgrade.txt for more information
+  
+* deprecations
+
+  * controller.use_rails_error_handling! is deprecated
+    * use rescue_action_in_public! (from rails) instead
+  
+* enhancements
+
+  * Adding status codes to redirect_to matcher (Damian Janowski). Closes #570.
+  * Initialize current URL before executing any examples in a ViewExampleGroup (Wilson Bilkovich). Closes #654.
+  * Support query strings in params_from (Wilson Bilkovich). Closes #652.
+  * delegate route_for to assert_recognizes (less brittle)
+  * it { should be_valid } (Kakutani). Closes #665.
+  * controller is implicit subject in controller specs (Joe Ferris). #686.
+  * template is implicit subject in view specs (Joe Ferris). #686.
+  * redirect_to and render_template matchers can accept controller or response (Joe Ferris). Closes #686. 
+  * generated specs use declarative docstrings
+  * rspec_scaffold generator generates layout and stylesheet (per Rails-2.3)
+  * add bypass_rescue for controller specs
+  * infer template path from the first arg passed to describe in view specs
+  * separate routing specs (in spec/routing)
+  
+* bug fixes
+
+  * you no longer *have* to load ActionMailer to get specs to run. Closes #650.
+  * query_params are now parsed by Rack::Utils.parse_query in redirect_to matcher. Closes #684.
+  * cleaned up spec_server (there was a bunch of pre-rails 2.0 material). Closes #685.
+  * rspec's rake tasks are not loaded when running "rake gems" or any of its subtasks
+  * only warn when rspec is not installed when trying to invoke an rspec rake task
+  * support 2 arg version of ActionController::Base#render (reported by Nathan Wilmes)
+  * rake spec:server:start doesn't choke if there is no tmp directory
+  * force cache_classes = false when running with spec_server. Closes #287.
+  * keep spec_server working against edge rails (Jonathan Tron). Closes #685.
+  * create lib/tasks if not present when running script/generate rspec. Closes #687.
+  * fixed regression (and added spec so it won't regress again) where
+    render => :inline didn't render unless integrate_views was set
+  * fixed nil.with_output_buffer bug in helper specs. Closes #719.
+
 === Version 1.1.12 / 2009-01-11
 
 * 2 deprecations

data/License.txt

@@ -2,7 +2,7 @@
 
 ====================================================================
 ==== RSpec, RSpec-Rails
-Copyright (c) 2005-2008 The RSpec Development Team
+Copyright (c) 2005-2009 The RSpec Development Team
 ====================================================================
 ==== ARTS
 Copyright (c) 2006 Kevin Clark, Jake Howerton

data/Manifest.txt

@@ -1,9 +1,11 @@
+.document
 History.txt
 License.txt
 Manifest.txt
 README.txt
 Rakefile
 TODO.txt
+Upgrade.markdown
 features/step_definitions/people.rb
 features/support/env.rb
 features/transactions/transactions_should_rollback.feature
@@ -45,15 +47,17 @@ lib/spec/rails/example/cookies_proxy.rb
 lib/spec/rails/example/functional_example_group.rb
 lib/spec/rails/example/helper_example_group.rb
 lib/spec/rails/example/model_example_group.rb
-lib/spec/rails/example/rails_example_group.rb
 lib/spec/rails/example/render_observer.rb
+lib/spec/rails/example/routing_example_group.rb
+lib/spec/rails/example/routing_helpers.rb
 lib/spec/rails/example/view_example_group.rb
 lib/spec/rails/extensions.rb
-lib/spec/rails/extensions/action_controller/base.rb
 lib/spec/rails/extensions/action_controller/rescue.rb
+lib/spec/rails/extensions/action_controller/test_case.rb
 lib/spec/rails/extensions/action_controller/test_response.rb
 lib/spec/rails/extensions/action_view/base.rb
 lib/spec/rails/extensions/active_record/base.rb
+lib/spec/rails/extensions/active_support/test_case.rb
 lib/spec/rails/extensions/spec/matchers/have.rb
 lib/spec/rails/extensions/spec/runner/configuration.rb
 lib/spec/rails/interop/testcase.rb
@@ -66,14 +70,15 @@ lib/spec/rails/matchers/include_text.rb
 lib/spec/rails/matchers/redirect_to.rb
 lib/spec/rails/matchers/render_template.rb
 lib/spec/rails/mocks.rb
+lib/spec/rails/spec_server.rb
 lib/spec/rails/story_adapter.rb
 lib/spec/rails/version.rb
-rspec-rails.gemspec
 spec/autotest/mappings_spec.rb
 spec/rails_suite.rb
 spec/resources/controllers/action_view_base_spec_controller.rb
 spec/resources/controllers/application.rb
 spec/resources/controllers/controller_spec_controller.rb
+spec/resources/controllers/example.txt
 spec/resources/controllers/redirect_spec_controller.rb
 spec/resources/controllers/render_spec_controller.rb
 spec/resources/controllers/rjs_spec_controller.rb
@@ -85,61 +90,61 @@ spec/resources/helpers/view_spec_helper.rb
 spec/resources/models/animal.rb
 spec/resources/models/person.rb
 spec/resources/models/thing.rb
-spec/resources/views/controller_spec/_partial.rhtml
-spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
-spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
-spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml
-spec/resources/views/controller_spec/action_with_errors_in_template.rhtml
-spec/resources/views/controller_spec/action_with_template.rhtml
-spec/resources/views/layouts/application.rhtml
-spec/resources/views/layouts/simple.rhtml
+spec/resources/views/controller_spec/_partial.html.erb
+spec/resources/views/controller_spec/action_setting_flash_after_session_reset.html.erb
+spec/resources/views/controller_spec/action_setting_flash_before_session_reset.html.erb
+spec/resources/views/controller_spec/action_setting_the_assigns_hash.html.erb
+spec/resources/views/controller_spec/action_with_errors_in_template.html.erb
+spec/resources/views/controller_spec/action_with_template.html.erb
+spec/resources/views/layouts/application.html.erb
+spec/resources/views/layouts/simple.html.erb
 spec/resources/views/objects/_object.html.erb
-spec/resources/views/render_spec/_a_partial.rhtml
-spec/resources/views/render_spec/action_with_alternate_layout.rhtml
+spec/resources/views/render_spec/_a_partial.html.erb
+spec/resources/views/render_spec/action_with_alternate_layout.html.erb
 spec/resources/views/render_spec/some_action.html.erb
 spec/resources/views/render_spec/some_action.js.rjs
-spec/resources/views/render_spec/some_action.rjs
-spec/resources/views/rjs_spec/_replacement_partial.rhtml
-spec/resources/views/rjs_spec/hide_div.rjs
-spec/resources/views/rjs_spec/hide_page_element.rjs
-spec/resources/views/rjs_spec/insert_html.rjs
-spec/resources/views/rjs_spec/replace.rjs
-spec/resources/views/rjs_spec/replace_html.rjs
-spec/resources/views/rjs_spec/replace_html_with_partial.rjs
-spec/resources/views/rjs_spec/visual_effect.rjs
-spec/resources/views/rjs_spec/visual_toggle_effect.rjs
-spec/resources/views/tag_spec/no_tags.rhtml
-spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml
-spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml
-spec/resources/views/view_spec/_partial.rhtml
-spec/resources/views/view_spec/_partial_used_twice.rhtml
-spec/resources/views/view_spec/_partial_with_local_variable.rhtml
-spec/resources/views/view_spec/_partial_with_sub_partial.rhtml
-spec/resources/views/view_spec/_spacer.rhtml
-spec/resources/views/view_spec/accessor.rhtml
-spec/resources/views/view_spec/block_helper.rhtml
-spec/resources/views/view_spec/entry_form.rhtml
-spec/resources/views/view_spec/explicit_helper.rhtml
-spec/resources/views/view_spec/foo/show.rhtml
-spec/resources/views/view_spec/implicit_helper.rhtml
-spec/resources/views/view_spec/multiple_helpers.rhtml
+spec/resources/views/rjs_spec/_replacement_partial.html.erb
+spec/resources/views/rjs_spec/hide_div.js.rjs
+spec/resources/views/rjs_spec/hide_page_element.js.rjs
+spec/resources/views/rjs_spec/insert_html.js.rjs
+spec/resources/views/rjs_spec/replace.js.rjs
+spec/resources/views/rjs_spec/replace_html.js.rjs
+spec/resources/views/rjs_spec/replace_html_with_partial.js.rjs
+spec/resources/views/rjs_spec/visual_effect.js.rjs
+spec/resources/views/rjs_spec/visual_toggle_effect.js.rjs
+spec/resources/views/tag_spec/no_tags.html.erb
+spec/resources/views/tag_spec/single_div_with_no_attributes.html.erb
+spec/resources/views/tag_spec/single_div_with_one_attribute.html.erb
+spec/resources/views/view_spec/_partial.html.erb
+spec/resources/views/view_spec/_partial_used_twice.html.erb
+spec/resources/views/view_spec/_partial_with_local_variable.html.erb
+spec/resources/views/view_spec/_partial_with_sub_partial.html.erb
+spec/resources/views/view_spec/_spacer.html.erb
+spec/resources/views/view_spec/accessor.html.erb
+spec/resources/views/view_spec/block_helper.html.erb
+spec/resources/views/view_spec/entry_form.html.erb
+spec/resources/views/view_spec/explicit_helper.html.erb
+spec/resources/views/view_spec/foo/show.html.erb
+spec/resources/views/view_spec/implicit_helper.html.erb
+spec/resources/views/view_spec/multiple_helpers.html.erb
 spec/resources/views/view_spec/path_params.html.erb
-spec/resources/views/view_spec/should_not_receive.rhtml
-spec/resources/views/view_spec/template_with_partial.rhtml
-spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
-spec/resources/views/view_spec/template_with_partial_with_array.rhtml
+spec/resources/views/view_spec/should_not_receive.html.erb
+spec/resources/views/view_spec/template_with_partial.html.erb
+spec/resources/views/view_spec/template_with_partial_using_collection.html.erb
+spec/resources/views/view_spec/template_with_partial_with_array.html.erb
 spec/spec/rails/example/assigns_hash_proxy_spec.rb
 spec/spec/rails/example/configuration_spec.rb
+spec/spec/rails/example/controller_example_group_spec.rb
 spec/spec/rails/example/controller_isolation_spec.rb
-spec/spec/rails/example/controller_spec_spec.rb
 spec/spec/rails/example/cookies_proxy_spec.rb
+spec/spec/rails/example/error_handling_spec.rb
 spec/spec/rails/example/example_group_factory_spec.rb
-spec/spec/rails/example/helper_spec_spec.rb
-spec/spec/rails/example/model_spec_spec.rb
-spec/spec/rails/example/shared_behaviour_spec.rb
+spec/spec/rails/example/helper_example_group_spec.rb
+spec/spec/rails/example/model_example_group_spec.rb
+spec/spec/rails/example/routing_example_group_spec.rb
+spec/spec/rails/example/shared_routing_example_group_examples.rb
 spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb
-spec/spec/rails/example/view_spec_spec.rb
-spec/spec/rails/extensions/action_controller_rescue_action_spec.rb
+spec/spec/rails/example/view_example_group_spec.rb
 spec/spec/rails/extensions/action_view_base_spec.rb
 spec/spec/rails/extensions/active_record_spec.rb
 spec/spec/rails/interop/testcase_spec.rb

data/README.txt

@@ -2,15 +2,16 @@
 
 * http://rspec.info
 * http://rubyforge.org/projects/rspec
-* http://github.com/dchelimsky/rspec-rails/wikis
+* http://github.com/dchelimsky/rspec-rails
+* http://wiki.github.com/dchelimsky/rspec/rails
 * mailto:rspec-devel@rubyforge.org
 
 == DESCRIPTION:
 
 Behaviour Driven Development for Ruby on Rails.
 
-Spec::Rails (a.k.a. RSpec on Rails) is an RSpec extension that allows you
-to drive the development of your RoR application using RSpec.
+rspec-rails is an RSpec extension that allows you to drive the development of
+Ruby on Rails applications with RSpec.
 
 == FEATURES:
 
@@ -41,4 +42,4 @@ expectations you can set on responses and models, etc.
 
 == INSTALL
 
-* Visit http://github.com/dchelimsky/rspec-rails/wikis for installation instructions.
+* Visit http://wiki.github.com/dchelimsky/rspec/rails for installation instructions.

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   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.1.12"]]
+  p.extra_deps = [["rspec","1.2.0"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
@@ -48,4 +48,11 @@ Spec::Rake::SpecTask.new
 
 Cucumber::Rake::Task.new
 
-task :default => [:features]
+task :default => [:features]
+
+namespace :update do
+  desc "update the manfest"
+  task :manifest do
+    system %q[touch Manifest.txt; rake check_manifest | grep -v "(in " | patch]
+  end
+end

data/TODO.txt

@@ -0,0 +1 @@
+* delegate params_from to assert_recognizes

data/Upgrade.markdown

@@ -0,0 +1,103 @@
+# Upgrade to rspec-rails-1.1.99.x (pre rspec-rails-1.2)
+
+## What's changed
+
+### Supported Rails Versions
+
+This release supports the following versions of rails:
+
+* 2.0.5
+* 2.1.2
+* 2.2.2
+* 2.3.1
+
+### update generated files
+
+Be sure to run "script/generate rspec" and allow the following files to be overwritten:
+
+* lib/tasks/rspec.rake
+* script/spec
+* script/spec_server
+
+### ``controller.use_rails_error_handling!`` is deprecated
+
+Use ``rescue_action_in_public!`` instead. It comes directly from rails and does
+exactly the same thing
+
+### 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,
+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
+
+If you had :id => 1 before, you need to change that to :id => "1"
+
+    #old
+    route_for(:controller => 'things', :action => 'show', :id => 1).should == "/things/1"
+  
+    #new
+    route_for(:controller => 'things', :action => 'show', :id => "1").should == "/things/1"
+  
+#### 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.
+
+    #old
+    route_for(:controller => 'things', :action => 'create').should == "/things"
+  
+    #new
+    route_for(:controller => 'things', :action => 'create').should == {:path => "/things", :method => :post}
+  
+### 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
+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``.
+
+## What's new
+
+### render no longer requires a path
+
+The ``render()`` method in view specs will infer the path from the
+first argument passed to ``describe()``.
+
+    describe "players/show" do
+      it "does something" do
+        render
+        response.should have_tag("....")
+      end
+    end
+    
+### routing specs live in spec/routing
+
+``script/generate rspec_scaffold`` now generates its routing spec in
+``spec/routing/``.
+
+### bypass_rescue
+
+Added a new ``bypass_rescue()`` 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.
+
+    describe AccountController do
+      describe "GET @account" do
+        context "requested by anonymous user" do
+          it "denies access" do
+            bypass_rescue
+            lambda do
+              get :show, :id => "37"
+            end.should raise_error(AccessDenied)
+          end
+        end
+      end
+    end

data/generators/rspec/rspec_generator.rb

@@ -14,6 +14,7 @@ class RspecGenerator < Rails::Generator::Base
     record do |m|
       script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
 
+      m.directory 'lib/tasks'
       m.file      'rspec.rake',                    'lib/tasks/rspec.rake'
 
       m.file      'script/autospec',               'script/autospec',    script_options

data/generators/rspec/templates/rspec.rake

@@ -1,3 +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")
@@ -14,145 +15,167 @@ 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/}
+
 begin
   require 'spec/rake/spectask'
-  Rake.application.instance_variable_get('@tasks').delete('default')
-
-  spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
-  task :noop do
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
   end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
 
-  task :default => :spec
-  task :stats => "spec:statsetup"
+task :default => :spec
+task :stats => "spec:statsetup"
 
-  desc "Run all specs in spec directory (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
     t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
     t.spec_files = FileList['spec/**/*/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
   end
 
-  namespace :spec do
-    desc "Run all specs in spec directory with RCov (excluding plugin specs)"
-    Spec::Rake::SpecTask.new(:rcov) do |t|
-      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['spec/**/*/*_spec.rb']
-      t.rcov = true
-      t.rcov_opts = lambda do
-        IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-      end
-    end
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+  end
 
-    desc "Print Specdoc for all specs (excluding plugin specs)"
-    Spec::Rake::SpecTask.new(:doc) do |t|
-      t.spec_opts = ["--format", "specdoc", "--dry-run"]
-      t.spec_files = FileList['spec/**/*/*_spec.rb']
-    end
+  desc "Print Specdoc for all plugin examples"
+  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  end
 
-    desc "Print Specdoc for all plugin examples"
-    Spec::Rake::SpecTask.new(:plugin_doc) do |t|
-      t.spec_opts = ["--format", "specdoc", "--dry-run"]
-      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+    desc "Run the code examples in spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
     end
+  end
 
-    [:models, :controllers, :views, :helpers, :lib].each do |sub|
-      desc "Run the code examples in spec/#{sub}"
-      Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
-        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-        t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-      end
-    end
+  desc "Run the code examples in vendor/plugins (except RSpec's own)"
+  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+  end
 
-    desc "Run the code examples in vendor/plugins (except RSpec's own)"
-    Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+  namespace :plugins do
+    desc "Runs the examples for rspec_on_rails"
+    Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
       t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
-    end
-
-    namespace :plugins do
-      desc "Runs the examples for rspec_on_rails"
-      Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
-        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-        t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
-      end
+      t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
     end
+  end
 
-    # Setup specs for stats
-    task :statsetup do
-      require 'code_statistics'
-      ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-      ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-      ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-      ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-      ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-      ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-      ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-      ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-      ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-      ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-      ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-    end
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Routing\ specs spec/lib) if File.exist?('spec/routing')
+    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+    ::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
-      namespace :fixtures do
-        desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
-        task :load => :environment do
-          ActiveRecord::Base.establish_connection(Rails.env)
-          base_dir = File.join(Rails.root, 'spec', 'fixtures')
-          fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
-          
-          (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
-            Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
-          end
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
+      task :load => :environment do
+        ActiveRecord::Base.establish_connection(Rails.env)
+        base_dir = File.join(Rails.root, 'spec', 'fixtures')
+        fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+        
+        require 'active_record/fixtures'
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
         end
       end
     end
+  end
 
-    namespace :server do
-      daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
-
-      desc "start spec_server."
-      task :start do
-        if File.exist?(daemonized_server_pid)
-          $stderr.puts "spec_server is already running."
-        else
-          $stderr.puts "Starting up spec server."
-          system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
-        end
+  namespace :server do
+    daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid")
+    
+    desc "start spec_server."
+    task :start do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts "spec_server is already running."
+      else
+        $stderr.puts %Q{Starting up spec_server ...}
+        FileUtils.mkdir_p('tmp/pids') unless test ?d, 'tmp/pids'
+        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
       end
+    end
 
-      desc "stop spec_server."
-      task :stop do
-        unless File.exist?(daemonized_server_pid)
-          $stderr.puts "No server running."
-        else
-          $stderr.puts "Shutting down spec_server."
-          system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
-          File.delete(daemonized_server_pid)
-        end
+    desc "stop spec_server."
+    task :stop do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Shutting down spec_server ..."
+        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        File.delete(daemonized_server_pid)
       end
+    end
 
-      desc "reload spec_server."
-      task :restart do
-        unless File.exist?(daemonized_server_pid)
-          $stderr.puts "No server running."
-        else
-          $stderr.puts "Reloading down spec_server."
-          system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
-        end
+    desc "restart spec_server."
+    task :restart => [:stop, :start]
+    
+    desc "check if spec server is running"
+    task :status do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})}
+      else
+        $stderr.puts "No server running."
       end
     end
   end
-rescue MissingSourceFile
-  # if rspec-rails is a configured gem, this will output helpful material and exit ...
-  require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
-
-  # ... otherwise, do this:
-  raise <<-MSG
-
-  You have rspec rake tasks installed in
-  #{__FILE__},
-  but rspec can not be found in vendor/gems, vendor/plugins or on the system.
-
-MSG
 end
 
+end