rspec-rails 1.2.6 → 1.2.7

data/History.rdoc

@@ -1,3 +1,26 @@
+=== Version 1.2.7 / 2009-06-22
+
+* enhancements
+  * alias :stub!, :stub so rspec-rails extensions of rspec stubs can use the
+    same syntax as rspec (core)
+  * integration specs (Ben Mabey and David Chelimsky)
+  * added support for references and belongs_to generated model specs (José
+    Valim). Closes #792.
+  * add discovery for autotest-rails to keep compatible with ZenTest-4.0.0
+    (Ryan Davis). Closes #838.
+  * controller specs in isolation mode don't care whether the file exists
+    anymore!
+
+* bug fixes
+  * allow rspec-rails to work without ActiveRecord. Closes #810.
+  * fix bug with have() matcher failure message (Dave Giunta). Closes #818.
+  * fix bug where render_template('new') would pass if 'newer' was rendered
+    (or anything that started with 'new')
+  
+* deprecations
+  * spec_server is now deprecated - use spork instead (gem install spork).
+    Closes #827.
+
 === Version 1.2.6 / 2009-04-30
 
 * bug fixes
@@ -13,7 +36,8 @@
   * Fixed a small typo that makes rake stats fail (José Valim). Closes #802.
   * link_to and friends are available to ViewExampleGroup again
     (J.B. Rainsberger). Closes #787.
-  * spec_server works correctly with rails 2.3 again (Neil Buckley). Closes #759.
+  * spec_server works correctly with rails 2.3 again (Neil Buckley). Closes
+    #759.
 
 === Version 1.2.4 / 2009-03-13
 
@@ -40,7 +64,8 @@ See Upgrade.rdoc for information about upgrading to rspec-rails-1.2.1
   * 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
+  * 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

data/Manifest.txt

@@ -6,8 +6,8 @@ README.rdoc
 Rakefile
 TODO.txt
 Upgrade.rdoc
-features/step_definitions/people.rb
-features/support/env.rb
+generators/integration_spec/integration_spec_generator.rb
+generators/integration_spec/templates/integration_spec.rb
 generators/rspec/CHANGES
 generators/rspec/rspec_generator.rb
 generators/rspec/templates/previous_failures.txt
@@ -45,6 +45,7 @@ lib/spec/rails/example/controller_example_group.rb
 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/integration_example_group.rb
 lib/spec/rails/example/model_example_group.rb
 lib/spec/rails/example/render_observer.rb
 lib/spec/rails/example/routing_example_group.rb

data/Rakefile

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-gem 'hoe', '>=1.9.0'
+gem 'hoe', '>=2.0.0'
 require 'hoe'
 require './lib/spec/rails/version'
 require 'cucumber/rake/task'
@@ -8,13 +8,14 @@ $:.unshift(File.join(File.dirname(__FILE__), "/../rspec/lib"))
 
 require 'spec/rake/spectask'
 
-Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
+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.6"],["rack",">=0.4.0"]]
-  p.extra_dev_deps = [["cucumber",">= 0.2.2"]]
+  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'
@@ -58,8 +59,6 @@ task :release => [:clean, :package] do |t|
   end
 end
 
-Spec::Rake::SpecTask.new
-
 Cucumber::Rake::Task.new
 
 task :default => [:features]

data/TODO.txt

@@ -1 +1,18 @@
 * 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.9.1
+      * JRuby
+      * IronRuby??? (perhaps using mono)
+    * Multiple rails-es
+      * 2.0.5
+      * 2.1.2
+      * 2.2.2
+      * 2.3.2
+      * 3.0 (once available)
+    * With and without ActiveRecord  

data/Upgrade.rdoc

@@ -1,3 +1,14 @@
+= Upgrade to 1.2.7
+
+== What's changed
+
+=== spec_server is deprecated
+
+spec_server is deprecated in favor of Tim Harper's new spork library
+(http://github.com/timcharper/spork). Get it. Use it. Love it.
+
+    gem install spork
+    
 = Upgrade to 1.2.0-1.2.6
 
 == What's changed

data/generators/integration_spec/integration_spec_generator.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../rspec_default_values'
+
+class IntegrationSpecGenerator < ModelGenerator
+  def manifest
+    record do |m|
+      m.class_collisions class_path, class_name
+      m.template 'integration_spec.rb',  File.join('spec/integration', class_path, "#{class_name.tableize}_spec.rb")
+    end
+  end
+end

data/generators/integration_spec/templates/integration_spec.rb

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

data/generators/rspec/templates/rcov.opts

@@ -1,2 +1,2 @@
---exclude "spec/*,gems/*" 
+--exclude "spec/*,gems/*"
 --rails

data/generators/rspec/templates/rspec.rake

@@ -1,6 +1,19 @@
 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')
-$LOAD_PATH.unshift("#{rspec_plugin_dir}/lib") if File.exist?(rspec_plugin_dir)
+
+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/}
@@ -44,14 +57,14 @@ task :stats => "spec:statsetup"
 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']
+  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.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
@@ -61,16 +74,16 @@ namespace :spec do
   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']
+    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/*')
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
   end
 
-  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+  [:models, :controllers, :views, :helpers, :lib, :integration].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\""]
@@ -81,14 +94,14 @@ namespace :spec do
   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/*")
+    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']
+      t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb']
     end
   end
 
@@ -101,12 +114,14 @@ namespace :spec do
     ::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/routing) if File.exist?('spec/routing')
+    ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration')
     ::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')
+    ::CodeStatistics::TEST_TYPES << "Integration specs" if File.exist?('spec/integration')
   end
 
   namespace :db do
@@ -116,7 +131,7 @@ namespace :spec 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, '.*'))
@@ -127,7 +142,7 @@ namespace :spec do
 
   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)
@@ -145,14 +160,14 @@ namespace :spec do
         $stderr.puts "No server running."
       else
         $stderr.puts "Shutting down spec_server ..."
-        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        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)

data/generators/rspec/templates/spec_helper.rb

@@ -5,6 +5,10 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
 require 'spec/autorun'
 require 'spec/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}
+
 Spec::Runner.configure do |config|
   # If you're not using ActiveRecord you should remove these
   # lines, delete config/database.yml and disable :active_record
@@ -42,6 +46,6 @@ Spec::Runner.configure do |config|
   # config.mock_with :rr
   #
   # == Notes
-  # 
+  #
   # For more information take a look at Spec::Runner::Configuration and Spec::Runner
 end

data/generators/rspec_controller/templates/helper_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
 
 describe <%= class_name %>Helper do
-  
+
   #Delete this example and add some real ones or delete this file
   it "should be included in the object returned by #helper" do
     included_modules = (class << helper; self; end).send :included_modules

data/generators/rspec_controller/templates/view_spec.rb

@@ -4,7 +4,7 @@ describe "/<%= class_name.underscore %>/<%= action %>" do
   before(:each) do
     render '<%= class_name.underscore %>/<%= action %>'
   end
-  
+
   #Delete this example and add some real ones or delete this file
   it "should tell you where to find the file" do
     response.should have_tag('p', %r[Find me in app/views/<%= class_name.underscore %>/<%= action %>])

data/generators/rspec_default_values.rb

@@ -10,10 +10,19 @@ module Rails
           when :date                        then "Date.today"
           when :string, :text               then "\"value for #{@name}\""
           when :boolean                     then "false"
+          when :belongs_to, :references     then "1"
           else
             ""
-        end      
+        end
+      end
+
+      def name_or_reference
+        if ::Rails::VERSION::STRING >= '2.2'
+          reference? ? :"#{name}_id" : name
+        else
+          name
+        end
       end
     end
   end
-end
+end

data/generators/rspec_model/templates/model_spec.rb

@@ -3,9 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 describe <%= class_name %> do
   before(:each) do
     @valid_attributes = {
-<% attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%>
+      <%= attributes.map{|a| ":#{a.name_or_reference} => #{a.default_value}" }.join(",\n      ") %>
     }
   end
 

data/generators/rspec_scaffold/rspec_scaffold_generator.rb

@@ -54,6 +54,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       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)
+      m.directory File.join('spec/integration', class_path)
       
       # Layout and stylesheet.
       m.template("scaffold:layout.html.erb", File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
@@ -83,9 +84,9 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       end
       
       # Model class, unit test, and fixtures.
-      m.template 'model:model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'model:fixtures.yml',  File.join('spec/fixtures', class_path, "#{table_name}.yml")
-      m.template 'rspec_model:model_spec.rb',       File.join('spec/models', class_path, "#{file_name}_spec.rb")
+      m.template 'model:model.rb',            File.join('app/models', class_path, "#{file_name}.rb")
+      m.template 'model:fixtures.yml',        File.join('spec/fixtures', class_path, "#{table_name}.yml")
+      m.template 'rspec_model:model_spec.rb', File.join('spec/models', class_path, "#{file_name}_spec.rb")
 
       # View specs
       m.template "rspec_scaffold:edit_erb_spec.rb",
@@ -97,6 +98,9 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       m.template "rspec_scaffold:show_erb_spec.rb",
         File.join('spec/views', controller_class_path, controller_file_name, "show.#{default_file_extension}_spec.rb")
 
+      # Integration
+      m.template 'integration_spec:integration_spec.rb', File.join('spec/integration', class_path, "#{table_name}_spec.rb")
+
       unless options[:skip_migration]
         m.migration_template(
           'model:migration.rb', 'db/migrate', 

data/generators/rspec_scaffold/templates/controller_spec.rb

@@ -5,7 +5,7 @@ describe <%= controller_class_name %>Controller do
   def mock_<%= file_name %>(stubs={})
     @mock_<%= file_name %> ||= mock_model(<%= class_name %>, stubs)
   end
-  
+
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= class_name %>.stub!(:find).with(:all).and_return([mock_<%= file_name %>])
@@ -39,7 +39,7 @@ describe <%= controller_class_name %>Controller do
   end
 
   describe "POST create" do
-    
+
     describe "with valid params" do
       it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
@@ -53,7 +53,7 @@ describe <%= controller_class_name %>Controller do
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
       end
     end
-    
+
     describe "with invalid params" do
       it "assigns 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))
@@ -67,11 +67,11 @@ describe <%= controller_class_name %>Controller do
         response.should render_template('new')
       end
     end
-    
+
   end
 
   describe "PUT update" do
-    
+
     describe "with valid params" do
       it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
@@ -91,7 +91,7 @@ describe <%= controller_class_name %>Controller do
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
       end
     end
-    
+
     describe "with invalid params" do
       it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
@@ -111,7 +111,7 @@ describe <%= controller_class_name %>Controller do
         response.should render_template('edit')
       end
     end
-    
+
   end
 
   describe "DELETE destroy" do
@@ -120,7 +120,7 @@ describe <%= controller_class_name %>Controller do
       mock_<%= file_name %>.should_receive(:destroy)
       delete :destroy, :id => "37"
     end
-  
+
     it "redirects to the <%= table_name %> list" do
       <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true))
       delete :destroy, :id => "1"