rspec 0.7.5.1 → 0.8.0

data/CHANGES

@@ -1,11 +1,70 @@
 = RSpec Changelog
 
+== Version 0.8.0
+
+This release introduces a new approach to handling expectations using Expression Matchers.
+
+See Upgrade[http://rspec.rubyforge.org/upgrade.html], Spec::Expectations, Spec::Matchers and RELEASE-PLAN for more info.
+
+This release also improves the spec command line by adding DRb support and making it possible to
+store command line options in a file. This means a more flexible RSpec experience with Rails, 
+Rake and editor plugins like TextMate.
+
+It also sports myriad new features, bug fixes, patches and general goodness:
+
+* Fixed [#8928] rspec_on_rails 0.8.0-RC1 controller tests make double call to setup_with_fixtures
+* Fixed [#8925] Documentation bug in 0.8.0RC1 rspec website
+* Applied [#8132] [PATCH] RSpec breaks "rake db:sessions:create" in a rails project that has the rspec_on_rails plugin (Patch from Erik Kastner)
+* Fixed [#8789] --line and --spec not working when the context has parenhesis in the name
+* Added [#8783] auto generate spec names from last expectation
+* --heckle now fails if the heckled class or module is not found.
+* Fixed [#8771] Spec::Mocks::BaseExpectation#with converts hash params to array of arrays with #collect
+* Fixed [#8750] should[_not]_include backwards compatibility between 0.8.0-RC1 and 0.7.5.1 broken
+* Fixed [#8646] Context Runner does not report on Non standard exceptions and return a 0 return code
+* RSpec on Rails' spec_helper.rb will only force RAILS_ENV to test if it was not specified on the command line.
+* Fixed [#5485] proc#should_raise and proc#should_not_raise output
+* Added [#8484] should_receive with blocks
+* Applied [#8218] heckle_runner.rb doesn't work with heckle >= 1.2.0 (Patch from Michal Kwiatkowski)
+* Fixed [#8240] Cryptic error message when no controller_name
+* Applied [#7461] [PATCH] Contexts don't call Module::included when they include a module
+* Removed unintended block of test/unit assertions in rspec_on_rails - they should all, in theory, now be accessible
+* Added mock_model method to RSpec on Rails, which stubs common methods. Based on http://metaclass.org/2006/12/22/making-a-mockery-of-activerecord
+* Fixed [#8165] Partial Mock Errors when respond_to? is true but the method is not in the object
+* Fixed [#7611] Partial Mocks override Subclass methods
+* Fixed [#8302] Strange side effect when mocking a class method
+* Applied [#8316] to_param should return a stringified key in resource generator's controller spec (Patch from Chris Anderson)
+* Applied [#8216] shortcut for creating object stub
+* Applied [#8008] Correct generated specs for view when calling resource generator (Patch from Jonathan Tron)
+* Fixed [#7754] Command-R fails to run spec in TextMate (added instruction from Luke Redpath to the website)
+* Fixed [#7826] RSpect.tmbundle web page out of date.
+* RSpec on Rails specs are now running against RoR 1.2.1 and 1.2.2
+* rspec_resource now generates specs for views (TODO: make them use the new assert_select, when it's documented)
+* In a Rails app, RSpec core is only loaded when RAILS_ENV==test (init.rb)
+* Added support for target.should arbitrary_expectation_handler and target.should_not arbitrary_expectation_handler
+* Fixed [#7533] Spec suite fails and the process exits with a code 0
+* Fixed [#7565] Subsequent stub! calls for method fail to override the first call to method
+* Applied [#7524] Incorrect Documentation for 'pattern' in Rake task (patch from Stephen Duncan)
+* Fixed [#7409] default fixtures do not appear to run.
+* Fixed [#7507] "render..and return" doesn't return
+* Fixed [#7509] rcov/rspec incorrectly includes boot.rb (Patch from Courtenay)
+* Fixed [#7506] unnecessary complex output on failure of response.should_be_redirect
+* Applied [#6098] Make scaffold_resource generator. Based on code from Pat Maddox.
+* The drbspec command is gone. Use spec --drb instead.
+* The drb option is gone from the Rake task. Pass --drb to spec_opts instead.
+* New -X/--drb option for running specs against a server like spec/rails' script/rails_spec_server
+* New -O/--options and -G/--generate flags for file-based options (handy for spec/rails)
+* Applied [#7339] Turn off caching in HTML reports
+* Applied [#7419] "c option for colorizing output does not work with rails_spec" (Patch from Shintaro Kakutani)
+* Applied [#7406] [PATCH] 0.7.5 rspec_on_rails loads fixtures into development database (Patch from Wilson Bilkovich)
+* Applied [#7387] Allow stubs to return consecutive values (Patch from Pat Maddox)
+* Applied [#7393] Fix for rake task (Patch from Pat Maddox)
+* Reinstated support for response.should_render (in addition to controller.should_render)
+
 == Version 0.7.5.1
 
 Bug fix release to allow downloads of rspec gem using rubygems 0.9.1.
 
 == Version 0.7.5
-
 This release adds support for Heckle - Seattle'rb's code mutation tool.
 There are also several bug fixes to the RSpec core and the RSpec on Rails plugin.
 

data/EXAMPLES.rd

@@ -1,3 +1,22 @@
+# specs with no names
+# * NAME NOT GENERATED
+# * NAME NOT GENERATED
+# * NAME NOT GENERATED
+# * NAME NOT GENERATED
+# A mouse
+# * should eat cheese
+# * should not eat cat
+# The month march
+# * The root of 1 square should be 1
+# * The root of 2 square should be 2
+# * The root of 3 square should be 3
+# * The root of 4 square should be 4
+# * The root of 5 square should be 5
+# * The root of 6 square should be 6
+# * The root of 7 square should be 7
+# * The root of 8 square should be 8
+# * The root of 9 square should be 9
+# * The root of 10 square should be 10
 # A FileAccessor
 # * should open a file and pass it to the processor's process method
 # Greeter
@@ -23,29 +42,29 @@
 # State created in context_setup
 # * should be accessible from spec
 # * should not have sideffects
-# A stack which is neither empty nor full
-# * should add to the top when sent 'push'
-# * should return the top item when sent 'peek'
-# * should NOT remove the top item when sent 'peek'
-# * should return the top item when sent 'pop'
-# * should remove the top item when sent 'pop'
+# A Stack
+# * should add to the top when sent #push
+# * should return the top item when sent #peek
+# * should NOT remove the top item when sent #peek
+# * should return the top item when sent #pop
+# * should remove the top item when sent #pop
 # An empty stack
-# * should be empty
-# * should no longer be empty after 'push'
-# * should complain when sent 'peek'
-# * should complain when sent 'pop'
+# * NAME NOT GENERATED
+# * should no longer be empty after #push
+# * should complain when sent #peek
+# * should complain when sent #pop
 # An almost empty stack (with one item)
-# * should not be empty
-# * should remain not empty after 'peek'
-# * should become empty after 'pop'
+# * NAME NOT GENERATED
+# * should remain not empty after #peek
+# * should become empty after #pop
 # An almost full stack (with one item less than capacity)
-# * should not be full
-# * should become full when sent 'push'
+# * NAME NOT GENERATED
+# * should become full when sent #push
 # A full stack
-# * should be full
-# * should remain full after 'peek'
-# * should no longer be full after 'pop'
-# * should complain on 'push'
+# * NAME NOT GENERATED
+# * should remain full after #peek
+# * should no longer be full after #pop
+# * should complain on #push
 # A consumer of a stub
 # * should be able to stub methods on any Object
 # A stubbed method on a class

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2006 The RSpec Development Team
+Copyright (c) 2005-2007 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -1,30 +1,38 @@
 == RSpec
 
-RSpec is a framework for developing ruby applications using Behaviour Driven Development.
+RSpec is a Behaviour Definition Framework intended for use in Behaviour
+Driven Development. RSpec plays the same role that a unit testing framework
+would play in a Test Driven Development environment, but does so using
+words and structures that better support BDD.
 
-== Expectations
+RSpec ships with four modules:
 
-RSpec adds expectation methods to every object, with specific types of expectations
-set on specific classes. For example ...
+Spec::Matchers provides Expression Matchers for use with Spec::Expectations
+and Spec::Mocks.
 
-<code>
-@message = "some message"
-@message.should == "some message"
-</code>
+Spec::Expectations supports setting expectations on your objects so you
+can do things like:
 
-... will be available on every object, whereas ...
+  result.should equal(expected_result)
+  
+Spec::Mocks supports creating Mock Objects, Stubs, and adding Mock/Stub
+behaviour to your existing objects.
 
-<code>
-proc { @number = @number + 1 }.should_change{ @number }.by(1)
-</code>
+Spec::Runner provides a very small but powerful DSL for writing executable
+specifications.
 
-... will only be available for proc objects.
+== Installation
 
-See Spec::Expectations for details on the different expectations you can set.
+The simplest approach is to install the gem:
+
+  gem install -r rspec #mac users must sudo
 
 == Building the RSpec gem
-rake gem
-gem install pkg/rspec-0.x.x.gem (you may have to sudo)
+If you prefer to build the gem locally, check out source from svn://rubyforge.org/var/svn/rspec/trunk. Then
+do the following:
+
+  rake gem
+  gem install pkg/rspec-0.x.x.gem (you may have to sudo)
 
 == Running the specs ==
 In order to run RSpec's full suite of specs (rake pre_commit) you must install the following gems:
@@ -45,6 +53,5 @@ and stdlib - with a few exceptions:
 * The spec command line uses diff-lcs when --diff is specified.
 * The spec command line uses heckle when --heckle is specified.
 * The Spec::Rake::SpecTask needs RCov if RCov is enabled in the task.
-* RSpec on Rails needs the ZenTest gem to be installed (and Rails and its dependencies of course)
 
 See http://rspec.rubyforge.org for further documentation.

data/RELEASE-PLAN

@@ -0,0 +1,117 @@
+Beginning with 0.8.0, RSpec is moving towards a new syntax using Expression Matchers
+instead of adding expectations directly to Object. We'll still be adding a few methods
+to Object, but it will be much less invasive, and will eliminate conflicts with
+other tools and frameworks that utilize method_missing to perform magic.
+
+For more information on Expression Matchers, see the rdoc for Spec::Matchers
+
+Our plan is as follows:
+
+* release 0.8.0 with:
+  - full support for Expression Matchers
+  - a translation tool that will convert the majority of your specs from the old syntax to the new syntax
+  - deprecation warnings for all of the old methods that will be removed
+* release 0.9.0 with all of the old methods removed
+
+Everything that is listed below is already supported and usable right now.
+
+== General: should_xyz
+
+  #before
+  actual.should_xyz expected
+  actual.should_not_xyz expected
+
+  #after
+  actual.should xyz(expected)
+  actual.should_not xyz(expected)
+
+This change applies to all of these as well:
+
+  should_equal
+  should_eql
+  should_be_close
+  should_include
+  should_match
+  should_satisfy
+
+== should_be
+
+  #before
+  result.should_be true
+  result.should_be false
+  result.should_be nil
+  result.should_not_be nil
+
+  #after
+  result.should be(true)
+  result.should be(false)
+  result.should be(nil)
+  result.should_not be(true)
+
+== should_be with arbitrary predicates
+
+  #before
+  true.should_be_arbitrary_predicate
+  true.should_be_a_arbitrary_predicate
+  true.should_be_an_arbitrary_predicate
+
+  #after
+  true.should be_arbitrary_predicate
+  true.should be_a_arbitrary_predicate
+  true.should be_an_arbitrary_predicate
+
+== should_be with comparison operators
+
+  #before
+  5.should_be > 3
+  4.should_be >= 4
+  4.should_be <= 4
+  4.should_be < 4
+
+  #before
+  5.should be > 3
+  4.should be >= 4
+  4.should be <= 4
+  4.should be < 4
+  
+== should ==
+
+  #before
+  actual.should == expected
+  actual.should_not == expected
+  
+  #after - exactly the same
+  actual.should == expected
+  actual.should_not == expected
+
+== should =~
+
+  #before
+  actual.should =~ regexp
+  actual.should_not =~ regexp
+
+  #after - exactly the same
+  actual.should =~ regexp
+  actual.should_not =~ regexp
+  
+== should_have
+
+  #before
+  team.should_have(3).players
+  hash.should_have_key(:a)
+
+  #after
+  team.should have(3).players
+  hash.should have_key(:a)
+
+== should_change
+
+  #before
+  proc.should_change(:target, message)
+  proc.should_change(:target, message).by(1)
+  proc.should_change(:target, message).from("a").to("b")
+  
+  proc.should change(:target, message)
+  proc.should change(:target, message).by(1)
+  proc.should change(:target, message).from("a").to("b")
+  

data/Rakefile

@@ -7,11 +7,11 @@ require 'rake/rdoctask'
 require 'spec/version'
 
 # Some of the tasks are in separate files since they are also part of the website documentation
-load File.dirname(__FILE__) + '/tasks/examples.rake'
-load File.dirname(__FILE__) + '/tasks/examples_specdoc.rake'
-load File.dirname(__FILE__) + '/tasks/examples_with_rcov.rake'
-load File.dirname(__FILE__) + '/tasks/failing_examples_with_html.rake'
-load File.dirname(__FILE__) + '/tasks/verify_rcov.rake'
+load File.dirname(__FILE__) + '/rake_tasks/examples.rake'
+load File.dirname(__FILE__) + '/rake_tasks/examples_specdoc.rake'
+load File.dirname(__FILE__) + '/rake_tasks/examples_with_rcov.rake'
+load File.dirname(__FILE__) + '/rake_tasks/failing_examples_with_html.rake'
+load File.dirname(__FILE__) + '/rake_tasks/verify_rcov.rake'
 
 PKG_NAME = "rspec"
 PKG_VERSION   = Spec::VERSION::STRING
@@ -19,28 +19,25 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
   'lib/**/*.rb', 
-  'test/**/*.rb', 
-  'examples/**/*',
-  File.dirname(__FILE__) + '../web_spec/**/*.rb',
-  File.dirname(__FILE__) + '../web_spec/**/*.txt',
-  File.dirname(__FILE__) + '../web_spec/**/*.patch'
+  'spec/**/*.rb', 
+  'examples/**/*'
 ]
 
 task :default => [:spec, :verify_rcov]
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb', 'vendor/RSpec.tmbundle/Support/spec/*_spec.rb']
+  t.spec_files = FileList['spec/**/*_spec.rb', '../RSpec.tmbundle/Support/spec/*_spec.rb']
   t.spec_opts = ['--color','--backtrace']
   t.rcov = true
   t.rcov_dir = '../doc/output/coverage'
-  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,bin\/drbspec,examples']
+  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples']
 end
 
 desc "Run all specs and store html output in doc/output/report.html"
 Spec::Rake::SpecTask.new('spec_html') do |t|
   t.spec_files = FileList['spec/**/*_spec.rb', 'vendor/RSpec.tmbundle/Support/spec/*_spec.rb']
-  t.spec_opts = ['--diff','--format html','--backtrace','--out ../doc/output/report.html']
+  t.spec_opts = ['--format html','--backtrace','--out ../doc/output/report.html']
 end
 
 desc "Run all failing examples"
@@ -65,15 +62,16 @@ task :webgen do
     end
     raise "ERROR while running webgen: #{output}" if output =~ /ERROR/n || $? != 0
   end
-  spec_page = File.open(File.dirname(__FILE__) + '/../doc/output/tools/spec.html').read
-  raise "It seems like the output in the generated documentation is broken" unless spec_page =~/\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\./m
+  spec_page = File.expand_path(File.dirname(__FILE__) + '/../doc/output/tools/spec.html')
+  spec_page_content = File.open(spec_page).read
+  raise "#{'!'*400}\nIt seems like the output in the generated documentation is broken (no dots: ......)\n. Look in #{spec_page}" unless spec_page_content =~/\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\./m
 end
 
 desc 'Generate RDoc'
 rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = '../doc/output/rdoc'
   rdoc.options << '--title' << 'RSpec' << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'EXAMPLES.rd', 'lib/**/*.rb')
+  rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'EXAMPLES.rd', 'RELEASE-PLAN', 'lib/**/*.rb')
 end
 task :rdoc => :examples_specdoc # We generate EXAMPLES.rd
 
@@ -97,7 +95,7 @@ spec = Gem::Specification.new do |s|
   
   s.autorequire = 'spec'
   s.bindir = 'bin'
-  s.executables = ['spec', 'drbspec']
+  s.executables = ['spec']
   s.default_executable = 'spec'
   s.author = ["RSpec Development Team"]
   s.email = "rspec-devel@rubyforge.org"
@@ -131,6 +129,7 @@ end
 
 task :clobber do
   rm_rf '../doc/output'
+  rm_rf 'translated_specs'
 end
 
 task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news]
@@ -160,7 +159,14 @@ task :pre_commit => [
 ]
 
 desc "Build the website, but do not publish it"
-task :website => [:clobber, :verify_rcov, :spec_html, :webgen, :failing_examples_with_html, :examples_specdoc, :rdoc]
+task :website => [:clobber, :verify_rcov, :spec_html, :webgen, :failing_examples_with_html, :examples_specdoc, :rdoc, :rdoc_rails]
+
+task :rdoc_rails do
+  Dir.chdir '../rspec_on_rails/vendor/plugins/rspec_on_rails' do
+    rake = (PLATFORM == "i386-mswin32") ? "rake.cmd" : "rake"
+    `#{rake} rdoc`
+  end
+end
 
 task :verify_user do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']

data/TODO.0.8.0

@@ -0,0 +1,5 @@
+See ~/rspec_on_rails/TODO.0.8.0 for issues related to the rails plugin.
+
+Here's what remains to do everywhere else before the 0.8.0 release:
+
+NOTHING

data/examples/auto_spec_name_generation_example.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+# Run spec w/ -fs to see the output of this file
+
+context "specs with no names" do
+  
+  # spec name is auto-generated as "should equal(5)"
+  specify do
+    3.should equal(3)
+    5.should equal(5)
+  end
+  
+  specify { 3.should be < 5 }
+  
+  specify { ["a"].should include("a") }
+  
+  specify { [1,2,3].should respond_to(:size) }
+end