rspec-rails 1.2.7.1 → 1.2.9

data/Contribute.rdoc

@@ -0,0 +1,4 @@
+== Contribute
+
+If you're interested in contributing to rspec-rails, please see
+http://wiki.github.com/dchelimsky/rspec-dev for information.

data/History.rdoc

@@ -1,3 +1,28 @@
+=== Version 1.2.9 / 2009-10-05
+
+* enhancements
+  * added route_to and be_routable matchers (Randy Harmon). Closes #843.
+  * Provide better failure message for render_template when redirected (Josh
+    Nichols). Closes #885.
+  * generated specs require 'spec_helper'
+
+* bug fixes
+  * pass the correct args to super in controller#render depending on the rails
+    version (Lucas Carlson). Closes #865.
+  * use Rack::Utils.parse_query to convert query strings to hashes. Closes #872.
+  * errors correctly bubble up when a controller spec in isolation mode
+    requests a non-existent action/template
+    * no error if either action or template exist
+    * error if neither exist
+    * Closes #888.
+
+* removals
+  * spec_server has been removed in favor of spork.
+    * You can still use the --drb flag, but you've got to install the spork
+      gem.
+    * Windows users who cannot use the spork gem can install the spec_server
+      from http://github.com/dchelimsky/spec_server
+
 === Version 1.2.7 / 2009-06-22
 
 * enhancements
@@ -255,4 +280,4 @@ Maintenance release.
 * Applied patch from Wincent Colaiuta to invert sense of "spec --diff". Closes #281.
 * Allow any type of render in view specs. Closes #57.
 * Applied patch from Ian White to get rspec working with edge rails (8804). Closes #271.
-* Applied patch from Jon Strother to have spec_server reload fixtures. Closes #344.
+* Applied patch from Jon Strother to have spec_server reload fixtures. Closes #344.

data/Manifest.txt

@@ -1,4 +1,5 @@
 .document
+Contribute.rdoc
 History.rdoc
 License.txt
 Manifest.txt
@@ -15,7 +16,6 @@ generators/rspec/templates/rcov.opts
 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
@@ -69,8 +69,8 @@ lib/spec/rails/matchers/have_text.rb
 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
@@ -161,6 +161,5 @@ spec/spec/rails/mocks/mock_model_spec.rb
 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

data/Rakefile

@@ -1,25 +1,26 @@
 # -*- ruby -*-
 gem 'hoe', '>=2.0.0'
 require 'hoe'
-require './lib/spec/rails/version'
-require 'cucumber/rake/task'
 
-$:.unshift(File.join(File.dirname(__FILE__), "/../rspec/lib"))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__),"..","rspec","lib")))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__),"lib")))
 
+require 'spec/rails/version'
 require 'spec/rake/spectask'
+require 'cucumber/rake/task'
 
-Hoe.spec('rspec-rails') do |p|
-  p.version = Spec::Rails::VERSION::STRING
-  p.summary = Spec::Rails::VERSION::SUMMARY
-  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.7"],["rack",">=0.4.0"]]
-  p.extra_dev_deps = [["cucumber",">= 0.3.11"]]
-  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
+Hoe.spec 'rspec-rails' do
+  self.version = Spec::Rails::VERSION::STRING
+  self.summary = Spec::Rails::VERSION::SUMMARY
+  self.description = "Behaviour Driven Development for Ruby on Rails."
+  self.rubyforge_name = 'rspec'
+  self.developer 'RSpec Development Team', 'rspec-devel@rubyforge.org'
+  self.extra_deps = [["rspec",">=1.2.9"],["rack",">=1.0.0"]]
+  self.extra_dev_deps = [["cucumber",">= 0.3.99"]]
+  self.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
+  self.history_file = 'History.rdoc'
+  self.readme_file  = 'README.rdoc'
+  self.post_install_message = <<-POST_INSTALL_MESSAGE
 #{'*'*50}
 
   Thank you for installing rspec-rails-#{Spec::Rails::VERSION::STRING}

data/TODO.txt

@@ -1,11 +1,10 @@
-* delegate params_from to assert_recognizes
 * wiki
   * need a matrix of which rspec-rails versions support which rails versions
 * CI
   * need a robust CI setup that runs
     * Multiple rubies
       * MRI: 1.8.6
-      * MRI: 1.8.9
+      * MRI: 1.8.7
       * MRI: 1.9.1
       * JRuby
       * IronRuby??? (perhaps using mono)
@@ -13,6 +12,6 @@
       * 2.0.5
       * 2.1.2
       * 2.2.2
-      * 2.3.2
+      * 2.3.4
       * 3.0 (once available)
     * With and without ActiveRecord  

data/Upgrade.rdoc

@@ -1,3 +1,37 @@
+= Upgrade to 1.2.8 (in git)
+
+== What's new
+
+=== route_to and be_routable matchers
+
+Stop using route_for and params_from today! These new matchers from Randy
+Harmon are more expressive and more reliable. Here's how you use them:
+
+    { :put => "/projects/37" }.should route_to(:controller => 'projects', :action => 'update', :id => '37')
+
+    { :get => "/nonexisting_route" }.should_not be_routable
+
+== What's changed
+
+=== spec_server has been removed
+
+spec_server was deprecated in 1.2.7 and has now been removed. Admittedly, this
+was a short deprecation cycle, but spec server never quite worked right in all
+situations and spork is a great solution that you can use today! This is all
+you need to do:
+
+    [sudo] gem install spork
+    cd path/to/project
+    spork --bootsrap
+    
+Now open up spec/spec_helper.rb and follow the directions at the top. You'll
+be up and running in no time.
+
+For more info:
+
+* http://github.com/timcharper/spork
+* http://groups.google.com/group/sporkgem
+
 = Upgrade to 1.2.7
 
 == What's changed

data/generators/integration_spec/templates/integration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe "<%= class_name.pluralize %>" do
 end

data/generators/rspec/rspec_generator.rb

@@ -36,7 +36,6 @@ HELPFUL_INSTRUCTIONS
 
       m.file      'script/autospec',               'script/autospec',    script_options
       m.file      'script/spec',                   'script/spec',        script_options
-      m.file      'script/spec_server',            'script/spec_server', script_options
 
       m.directory 'spec'
       m.file      'rcov.opts',                     'spec/rcov.opts'

data/generators/rspec/templates/rspec.rake

@@ -27,7 +27,7 @@ rescue MissingSourceFile
         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")
+            require File.expand_path(File.join(File.dirname(__FILE__),"..","..","config","environment"))
 
             # ... otherwise, do this:
             raise <<-MSG
@@ -139,44 +139,6 @@ namespace :spec do
       end
     end
   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
-    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
 end
 
 end

data/generators/rspec/templates/spec_helper.rb

@@ -1,13 +1,16 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require File.expand_path(File.join(File.dirname(__FILE__),'..','config','environment'))
 require 'spec/autorun'
 require 'spec/rails'
 
+# Uncomment the next line to use webrat's matchers
+#require 'webrat/integrations/rspec-rails'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 Spec::Runner.configure do |config|
   # If you're not using ActiveRecord you should remove these

data/generators/rspec_controller/rspec_controller_generator.rb

@@ -30,6 +30,8 @@ class RspecControllerGenerator < ControllerGenerator
       m.template 'controller:helper.rb',
         File.join('app/helpers', class_path, "#{file_name}_helper.rb")
 
+
+
       # Spec and view template for each action.
       actions.each do |action|
         m.template 'view_spec.rb',

data/generators/rspec_controller/templates/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe <%= class_name %>Controller do
 

data/generators/rspec_controller/templates/helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe <%= class_name %>Helper do
 

data/generators/rspec_controller/templates/view_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 describe "/<%= class_name.underscore %>/<%= action %>" do
   before(:each) do

data/generators/rspec_model/templates/model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe <%= class_name %> do
   before(:each) do

data/generators/rspec_scaffold/templates/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe <%= controller_class_name %>Controller do
 

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do

data/generators/rspec_scaffold/templates/helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe <%= controller_class_name %>Helper do
 

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/index.<%= default_file_extension %>" do

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do

data/generators/rspec_scaffold/templates/routing_spec.rb

@@ -1,63 +1,33 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require 'spec_helper'
 
 describe <%= controller_class_name %>Controller do
-  describe "route generation" do
-    it "maps #index" do
-      route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>"
+  describe "routing" do
+    it "recognizes and generates #index" do
+      { :get => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "index")
     end
 
-    it "maps #new" do
-      route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
+    it "recognizes and generates #new" do
+      { :get => "/<%= table_name %>/new" }.should route_to(:controller => "<%= table_name %>", :action => "new")
     end
 
-    it "maps #show" do
-      route_for(:controller => "<%= table_name %>", :action => "show", :id => "1").should == "/<%= table_name %>/1"
+    it "recognizes and generates #show" do
+      { :get => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "show", :id => "1")
     end
 
-    it "maps #edit" do
-      route_for(:controller => "<%= table_name %>", :action => "edit", :id => "1").should == "/<%= table_name %>/1/edit"
+    it "recognizes and generates #edit" do
+      { :get => "/<%= table_name %>/1/edit" }.should route_to(:controller => "<%= table_name %>", :action => "edit", :id => "1")
     end
 
-    it "maps #create" do
-      route_for(:controller => "<%= table_name %>", :action => "create").should == {:path => "/<%= table_name %>", :method => :post}
+    it "recognizes and generates #create" do
+      { :post => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "create") 
     end
 
-    it "maps #update" do
-      route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :put}
+    it "recognizes and generates #update" do
+      { :put => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "update", :id => "1") 
     end
 
-    it "maps #destroy" do
-      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :delete}
-    end
-  end
-
-  describe "route recognition" do
-    it "generates params for #index" do
-      params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"}
-    end
-
-    it "generates params for #new" do
-      params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"}
-    end
-
-    it "generates params for #create" do
-      params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"}
-    end
-
-    it "generates params for #show" do
-      params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"}
-    end
-
-    it "generates params for #edit" do
-      params_from(:get, "/<%= table_name %>/1/edit").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
-    end
-
-    it "generates params for #update" do
-      params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"}
-    end
-
-    it "generates params for #destroy" do
-      params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"}
+    it "recognizes and generates #destroy" do
+      { :delete => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "destroy", :id => "1") 
     end
   end
 end

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/show.<%= default_file_extension %>" do

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

@@ -165,7 +165,14 @@ MESSAGE
             PickedTemplate.new
           end
           
+          def __action_exists?(params)
+            controller.respond_to? params[:action]
+          end
+          
           def render(*args)
+            if ::Rails::VERSION::STRING >= "2.1"
+              return super unless __action_exists?(params) 
+            end
             if file = args.last[:file].instance_eval{@template_path}
               record_render :file => file
             elsif args.last[:inline]
@@ -215,7 +222,11 @@ MESSAGE
               if matching_stub_exists(options)
                 @performed_render = true
               else
-                super
+                if ::Rails::VERSION::STRING > '2.1'
+                  super(options, extra_options, &block)
+                else
+                  super(options, &block)
+                end
               end
             end
           end