rspec-rails 1.1.12 → 1.2.0

data/generators/rspec/templates/script/autospec

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
 ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
 ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
 system((RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV) ||

data/generators/rspec/templates/script/spec

@@ -1,5 +1,22 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
-require 'rubygems'
-require 'spec'
-exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))
+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")
+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,125 +1,52 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin
-require 'rubygems'
-require 'drb/drb'
-require 'rbconfig'
-require 'spec'
-require 'optparse'
-
-# This is based on Florian Weber's TDDMate
-module Spec
-  module Runner
-    class RailsSpecServer
-      def run(argv, stderr, stdout)
-        $stdout = stdout
-        $stderr = stderr
-        
-        unless ActiveRecord::Base.respond_to?(:clear_reloadable_connections!)
-          base = ActiveRecord::Base
-          def base.clear_reloadable_connections!
-            active_connections.each do |name, conn|
-              if conn.requires_reloading?
-                conn.disconnect!
-                active_connections.delete(name)
-              end
-            end
-          end
-        end
-
-        ActiveRecord::Base.clear_reloadable_connections!
-
-        if ActionController.const_defined?(:Dispatcher)
-          dispatcher = ::ActionController::Dispatcher.new($stdout)
-          dispatcher.cleanup_application
-        elsif ::Dispatcher.respond_to?(:reset_application!)
-          ::Dispatcher.reset_application!
-        else
-          raise "Application reloading failed"
-        end
-        if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
-          Fixtures.reset_cache
-        end
-        
-        if ::ActiveSupport.const_defined?(:Dependencies)
-          ::ActiveSupport::Dependencies.mechanism = :load
-        else
-          ::Dependencies.mechanism = :load
-        end
+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")
 
-        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
-        load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
+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 in_memory_database?
-          load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default
-          ActiveRecord::Migrator.up('db/migrate') # use migrations
-        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
 
-        ::Spec::Runner::CommandLine.run(
-          ::Spec::Runner::OptionParser.parse(
-            argv,
-            $stderr,
-            $stdout
-          )
-        )
-      end
+require 'optparse'
+require 'spec/rails/spec_server'
 
-      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
 puts "Loading Rails environment"
 
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'dispatcher'
 
-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
+if Rails::VERSION::STRING >= '2.2' && Rails.configuration.cache_classes
+  warn <<-MESSAGE
+
+#{'*'*50}
 
-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
-    }
-    yield
-  }
-  puts "spec_server launched. (PID: %d)" % pid
-  File.open(pid_file,"w"){|f| f.puts pid } if pid_file
-  exit! 0
+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
-opts = OptionParser.new
-opts.on("-d", "--daemon"){|v| options[:daemon] = true }
-opts.on("-p", "--pid PIDFILE"){|v| options[:pid] = v }
-opts.parse!(ARGV)
-
-puts "Ready"
-exec_server = lambda {
-  trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2")
-  DRb.start_service("druby://127.0.0.1:8989", Spec::Runner::RailsSpecServer.new)
-  DRb.thread.join
-}
+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]
-  daemonize(options[:pid], &exec_server)
+  ::Spec::Rails::SpecServer.daemonize(options[:pid])
 else
-  exec_server.call
+  ::Spec::Rails::SpecServer.run
 end

data/generators/rspec/templates/spec_helper.rb

@@ -2,7 +2,7 @@
 # from the project root directory.
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
+require 'spec/autorun'
 require 'spec/rails'
 
 Spec::Runner.configure do |config|

data/generators/rspec_controller/rspec_controller_generator.rb

@@ -15,11 +15,7 @@ class RspecControllerGenerator < ControllerGenerator
       m.directory File.join('spec/helpers', class_path)
       m.directory File.join('spec/views', class_path, file_name)
 
-			if Rails::VERSION::STRING < "2.0.0"
-        @default_file_extension = "rhtml"
-      else
-        @default_file_extension = "html.erb"
-      end
+      @default_file_extension = "html.erb"
 
       # Controller spec, class, and helper.
       m.template 'controller_spec.rb',

data/generators/rspec_scaffold/rspec_scaffold_generator.rb

@@ -30,19 +30,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
     
-    if Rails::VERSION::STRING < "2.0.0"
-      @resource_generator = "scaffold_resource"
-      @default_file_extension = "rhtml"
-		else
-      @resource_generator = "scaffold"
-      @default_file_extension = "html.erb"
-    end
-    
-    if ActionController::Base.respond_to?(:resource_action_separator)
-      @resource_edit_path = "/edit"
-    else
-      @resource_edit_path = ";edit"
-    end
+    @default_file_extension = "html.erb"
   end
 
   def manifest
@@ -57,31 +45,39 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       m.directory(File.join('app/controllers', controller_class_path))
       m.directory(File.join('app/helpers', controller_class_path))
       m.directory(File.join('app/views', controller_class_path, controller_file_name))
+      m.directory(File.join('app/views/layouts', controller_class_path))
+      m.directory(File.join('public/stylesheets', class_path))
+
       m.directory(File.join('spec/controllers', controller_class_path))
+      m.directory(File.join('spec/routing', controller_class_path))
       m.directory(File.join('spec/models', class_path))
       m.directory(File.join('spec/helpers', class_path))
       m.directory File.join('spec/fixtures', class_path)
       m.directory File.join('spec/views', controller_class_path, controller_file_name)
       
+      # Layout and stylesheet.
+      m.template("scaffold:layout.html.erb", File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
+      m.template("scaffold:style.css", 'public/stylesheets/scaffold.css')
+
       # Controller spec, class, and helper.
       m.template 'rspec_scaffold:routing_spec.rb',
-        File.join('spec/controllers', controller_class_path, "#{controller_file_name}_routing_spec.rb")
+        File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
 
       m.template 'rspec_scaffold:controller_spec.rb',
         File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
 
-      m.template "#{@resource_generator}:controller.rb",
+      m.template "scaffold:controller.rb",
         File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
 
       m.template 'rspec_scaffold:helper_spec.rb',
         File.join('spec/helpers', class_path, "#{controller_file_name}_helper_spec.rb")
 
-      m.template "#{@resource_generator}:helper.rb",
+      m.template "scaffold:helper.rb",
         File.join('app/helpers', controller_class_path, "#{controller_file_name}_helper.rb")
 
       for action in scaffold_views
         m.template(
-          "#{@resource_generator}:view_#{action}.#{@default_file_extension}",
+          "scaffold:view_#{action}.#{@default_file_extension}",
           File.join('app/views', controller_class_path, controller_file_name, "#{action}.#{default_file_extension}")
         )
       end

data/generators/rspec_scaffold/templates/controller_spec.rb

@@ -6,9 +6,9 @@ describe <%= controller_class_name %>Controller do
     @mock_<%= file_name %> ||= mock_model(<%= class_name %>, stubs)
   end
   
-  describe "responding to GET index" do
+  describe "GET index" do
 
-    it "should expose all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+    it "exposes all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= class_name %>.should_receive(:find).with(:all).and_return([mock_<%= file_name %>])
       get :index
       assigns[:<%= table_name %>].should == [mock_<%= file_name %>]
@@ -16,11 +16,10 @@ describe <%= controller_class_name %>Controller do
 
     describe "with mime type of xml" do
   
-      it "should render all <%= table_name.pluralize %> as xml" do
-        request.env["HTTP_ACCEPT"] = "application/xml"
+      it "renders all <%= table_name.pluralize %> as xml" do
         <%= class_name %>.should_receive(:find).with(:all).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>"))
         <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML")
-        get :index
+        get :index, :format => 'xml'
         response.body.should == "generated XML"
       end
     
@@ -28,9 +27,9 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to GET show" do
+  describe "GET show" do
 
-    it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+    it "exposes the requested <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       get :show, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
@@ -38,11 +37,10 @@ describe <%= controller_class_name %>Controller do
     
     describe "with mime type of xml" do
 
-      it "should render the requested <%= file_name %> as xml" do
-        request.env["HTTP_ACCEPT"] = "application/xml"
+      it "renders the requested <%= file_name %> as xml" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:to_xml).and_return("generated XML")
-        get :show, :id => "37"
+        get :show, :id => "37", :format => 'xml'
         response.body.should == "generated XML"
       end
 
@@ -50,9 +48,9 @@ describe <%= controller_class_name %>Controller do
     
   end
 
-  describe "responding to GET new" do
+  describe "GET new" do
   
-    it "should expose a new <%= file_name %> as @<%= file_name %>" do
+    it "exposes a new <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:new).and_return(mock_<%= file_name %>)
       get :new
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
@@ -60,9 +58,9 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to GET edit" do
+  describe "GET edit" do
   
-    it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+    it "exposes the requested <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       get :edit, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
@@ -70,17 +68,17 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to POST create" do
+  describe "POST create" do
 
     describe "with valid params" do
       
-      it "should expose a newly created <%= file_name %> as @<%= file_name %>" do
+      it "exposes a newly created <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {:these => 'params'}
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should redirect to the created <%= file_name %>" do
+      it "redirects to the created <%= file_name %>" do
         <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
@@ -90,13 +88,13 @@ describe <%= controller_class_name %>Controller do
     
     describe "with invalid params" do
 
-      it "should expose a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
+      it "exposes a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {:these => 'params'}
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should re-render the 'new' template" do
+      it "re-renders the 'new' template" do
         <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
@@ -106,23 +104,23 @@ describe <%= controller_class_name %>Controller do
     
   end
 
-  describe "responding to PUT udpate" do
+  describe "PUT udpate" do
 
     describe "with valid params" do
 
-      it "should update the requested <%= file_name %>" do
+      it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
       end
 
-      it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+      it "exposes the requested <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should redirect to the <%= file_name %>" do
+      it "redirects to the <%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
@@ -132,19 +130,19 @@ describe <%= controller_class_name %>Controller do
     
     describe "with invalid params" do
 
-      it "should update the requested <%= file_name %>" do
+      it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
       end
 
-      it "should expose the <%= file_name %> as @<%= file_name %>" do
+      it "exposes the <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should re-render the 'edit' template" do
+      it "re-renders the 'edit' template" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
         response.should render_template('edit')
@@ -154,15 +152,15 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to DELETE destroy" do
+  describe "DELETE destroy" do
 
-    it "should destroy the requested <%= file_name %>" do
+    it "destroys the requested <%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       mock_<%= file_name %>.should_receive(:destroy)
       delete :destroy, :id => "37"
     end
   
-    it "should redirect to the <%= table_name %> list" do
+    it "redirects to the <%= table_name %> list" do
       <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true))
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)