rspec 0.9.4 → 1.0.0

data/CHANGES

@@ -1,5 +1,29 @@
 = RSpec Changelog
 
+== Version 1.0.0
+The stake in the ground release. This represents a commitment to the API as it is. No significant
+backwards compatibility changes in the API are expected after this release.
+
+* Fixed [#10923] have_text matcher does not support should_not
+* Fixed [#10673] should > and should >= broken
+* Applied [#10921] Allow verify_rcov to accept greater than threshold coverage %'s via configuration
+* Applied [#10920] Added support for not implemented examples (Patch from Chad Humphries)
+* Patch to allow not implemented examples.  This works by not providing a block to the example. (Patch from Chad Humphries, Ken Barker)
+* Yanked support for Rails 1.1.6 in Spec::Rails
+* RSpec.tmbundle uses CMD-SHIFT-R to run focused examples now.
+* Spec::Rails now bundles a spec:rcov task by default (suggestion from Kurt Schrader)
+* Fixed [#10814] Runner loads shared code, test cases require them again
+* Fixed [#10753] Global before and after
+* Fixed [#10774] Allow before and after to be specified in config II
+* Refactored Spec::Ui examples to use new global before and after blocks.
+* Added instructions about how to get Selenium working with Spec::Ui (spec_ui/examples/selenium/README.txt)
+* Fixed [#10805] selenium.rb missing from gem?
+* Added rdocs explaining how to deal with errors in Rails' controller actions
+* Applied [#10770] Finer grained includes.
+* Fixed [#10747] Helper methods defined in shared specs are not visible when shared spec is used
+* Fixed [#10748] Shared descriptions in separate files causes 'already exists' error
+* Applied [#10698] Running with --drb executes specs twice (patch from Ruy Asan)
+
 == Version 0.9.4
 This release introduces massive improvements to Spec::Ui - the user interface functional testing
 extension to RSpec. There are also some minor bug fixes to the RSpec core.

data/EXAMPLES.rd

@@ -43,6 +43,9 @@
 # a mock
 # * should be able to mock the same message twice w/ different args
 # * should be able to mock the same message twice w/ different args in reverse order
+# Stack (not implemented features)
+# * should transform to xml using #to_xml [NOT IMPLEMENTED]
+# * should convert from xml using #from_xml [NOT IMPLEMENTED]
 # A partial mock
 # * should work at the class level
 # * should revert to the original after each spec
@@ -52,6 +55,7 @@
 # * should be intuitive
 # SharedBehaviourExample::OneThing
 # * should do what things do
+# * should have access to helper methods defined in the shared behaviour
 # SharedBehaviourExample::AnotherThing
 # * should do what things do
 # Stack (empty)
@@ -99,6 +103,6 @@
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
 
-Finished in 0.030613 seconds
+Finished in 0.025956 seconds
 
-74 examples, 0 failures
+77 examples, 0 failures, 2 not implemented

data/README

@@ -49,15 +49,15 @@ In order to run RSpec's full suite of specs (rake pre_commit) you must install t
 
 Once those are all installed, you should be able to run the suite with the following steps:
 
-svn co svn://rubyforge.org/var/svn/rspec/trunk rspec
-cd rspec
-rake install_dependencies
-cd example_rails_app
-export RSPEC_RAILS_VERSION=1.2.3
-rake rspec:generate_mysql_config
-mysql -u root < db/mysql_setup.sql
-cd ..
-rake pre_commit
+* svn co svn://rubyforge.org/var/svn/rspec/trunk rspec
+* cd rspec
+* rake install_dependencies
+* cd example_rails_app
+* export RSPEC_RAILS_VERSION=1.2.3
+* rake rspec:generate_mysql_config
+* mysql -u root < db/mysql_setup.sql
+* cd ..
+* rake pre_commit
 
 
 Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core 

data/Rakefile

@@ -5,6 +5,9 @@ require 'rake/contrib/rubyforgepublisher'
 require 'rake/clean'
 require 'rake/rdoctask'
 require 'spec/version'
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../pre_commit/lib"))
+require "pre_commit"
 
 # Some of the tasks are in separate files since they are also part of the website documentation
 load File.dirname(__FILE__) + '/rake_tasks/examples.rake'
@@ -30,7 +33,7 @@ task :default => [:verify_rcov]
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList[
-    'spec/**/*_spec.rb', 
+    'spec/**/*_spec.rb',
     '../RSpec.tmbundle/Support/spec/*_spec.rb'
     # TODO: get these in too - need to fix coverage
     # '../spec_ui/spec/**/*_spec.rb'
@@ -67,16 +70,7 @@ end
 
 desc 'Generate HTML documentation for website'
 task :webgen do
-  Dir.chdir '../doc' do
-    output = nil
-    IO.popen('webgen 2>&1') do |io|
-      output = io.read
-    end
-    raise "ERROR while running webgen: #{output}" if output =~ /ERROR/n || $? != 0
-  end
-  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
+  core.webgen
 end
 
 desc 'Generate RDoc'
@@ -85,15 +79,19 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.options << '--title' << 'RSpec' << '--line-numbers' << '--inline-source' << '--main' << 'README'
   rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'EXAMPLES.rd', 'UPGRADE', 'lib/**/*.rb')
 end
-task :rdoc => :examples_specdoc # We generate EXAMPLES.rd
+
+desc "Generate EXAMPLES.rb"
+task :rdoc do
+  core.rdoc
+end
 
 spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.summary = Spec::VERSION::DESCRIPTION
   s.description = <<-EOF
-    RSpec is a behaviour driven development (BDD) framework for Ruby.  RSpec was 
-    created in response to Dave Astels' article _A New Look at Test Driven Development_ 
+    RSpec is a behaviour driven development (BDD) framework for Ruby.  RSpec was
+    created in response to Dave Astels' article _A New Look at Test Driven Development_
     which can be read at: http://daveastels.com/index.php?p=5  RSpec is intended to
     provide the features discussed in Dave's article.
   EOF
@@ -104,7 +102,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.rdoc_options = rd.options
   s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a
-  
+
   s.autorequire = 'spec'
   s.bindir = 'bin'
   s.executables = ['spec', 'spec_translator']
@@ -140,8 +138,7 @@ task :todo do
 end
 
 task :clobber do
-  rm_rf '../doc/output'
-  rm_rf 'translated_specs'
+  core.clobber
 end
 
 task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news]
@@ -167,21 +164,13 @@ task :tag do
 end
 
 desc "Run this task before you commit. You should see 'OK TO COMMIT'"
-task :pre_commit => [
-  :website,
-  :examples,
-  :translated_specs,
-  :failing_examples_with_html
-]
+task(:pre_commit) {core.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, :rdoc_rails]
+task(:website) {core.website}
 
 task :rdoc_rails do
-  Dir.chdir '../rspec_on_rails' do
-    rake = (PLATFORM == "i386-mswin32") ? "rake.cmd" : "rake"
-    `#{rake} rdoc`
-  end
+  core.rdoc_rails
 end
 
 task :verify_user do
@@ -202,6 +191,16 @@ task :publish_website => [:verify_user, :website] do
   end
 end
 
+desc "Upload Website archive to RubyForge"
+task :archive_website => [:verify_user, :website] do
+  publisher = Rake::SshDirPublisher.new(
+    "rspec-website@rubyforge.org",
+    "/var/www/gforge-projects/#{PKG_NAME}/#{Spec::VERSION::TAG}",
+    "../doc/output"
+  )
+  publisher.upload
+end
+
 desc "Package the RSpec.tmbundle"
 task :package_tmbundle do
   mkdir 'pkg' rescue nil
@@ -255,7 +254,7 @@ task :publish_packages => [:verify_user, :package] do
       *release_files
     )
     publisher.upload
-    
+
     puts "UPLADED THE FOLLOWING FILES:"
     release_files.each do |file|
       name = file.match(/pkg\/(.*)/)[1]
@@ -279,3 +278,7 @@ task :publish_news => [:verify_user] do
     puts "** Not publishing news to RubyForge - this is a prerelease"
   end
 end
+
+def core
+  PreCommit::Core.new(self)
+end

data/examples/not_yet_implemented_spec.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + "/stack"
+
+describe Stack, ' (not implemented features)'  do
+  before(:each) do
+    @stack = Stack.new
+  end
+
+  it "should transform to xml using #to_xml"
+  
+  it "should convert from xml using #from_xml"
+end

data/examples/shared_behaviours_example.rb

@@ -14,6 +14,10 @@ module SharedBehaviourExample
   end
   
   describe "All Things", :shared => true do
+    def helper_method
+      "helper method"
+    end
+    
     it "should do what things do" do
       @thing.what_things_do.should == "stuff"
     end
@@ -22,6 +26,10 @@ module SharedBehaviourExample
   describe OneThing do
     it_should_behave_like "All Things"
     before(:each) { @thing = OneThing.new }
+    
+    it "should have access to helper methods defined in the shared behaviour" do
+      helper_method.should == "helper method"
+    end
   end
 
   describe AnotherThing do

data/examples/stack_spec.rb

@@ -93,4 +93,5 @@ describe Stack, " (full)" do
   it "should complain on #push" do
     lambda { @stack.push Object.new }.should raise_error(StackOverflowError)
   end
+  
 end

data/lib/spec/dsl/behaviour.rb

@@ -6,7 +6,8 @@ module Spec
 
       class << self
         def add_shared_behaviour(behaviour)
-          raise ArgumentError.new("Shared Behaviour '#{behaviour.description}' already exists") if find_shared_behaviour(behaviour.description)
+          return if behaviour.equal?(found_behaviour = find_shared_behaviour(behaviour.description))
+          raise ArgumentError.new("Shared Behaviour '#{behaviour.description}' already exists") if found_behaviour
           shared_behaviours << behaviour
         end
 
@@ -66,12 +67,12 @@ module Spec
         if errors.empty?
           specs.each do |example|
             example_execution_context = execution_context(example)
-            example_execution_context.copy_instance_variables_from(@before_and_after_all_context_instance) unless before_all_proc.nil?
-            example.run(reporter, before_each_proc, after_each_proc, dry_run, example_execution_context, timeout)
+            example_execution_context.copy_instance_variables_from(@before_and_after_all_context_instance) unless before_all_proc(behaviour_type).nil?
+            example.run(reporter, before_each_proc(behaviour_type), after_each_proc(behaviour_type), dry_run, example_execution_context, timeout)
           end
         end
         
-        @before_and_after_all_context_instance.copy_instance_variables_from(example_execution_context) unless after_all_proc.nil?
+        @before_and_after_all_context_instance.copy_instance_variables_from(example_execution_context) unless after_all_proc(behaviour_type).nil?
         run_after_all(reporter, dry_run)
       end
 
@@ -106,8 +107,22 @@ module Spec
         my_methods
       end
 
+      # Includes modules in the Behaviour (the <tt>describe</tt> block).
+      def include(*args)
+        args << {} unless Hash === args.last
+        modules, options = args_and_options(*args)
+        required_behaviour_type = options[:behaviour_type]
+        if required_behaviour_type.nil? || required_behaviour_type.to_sym == behaviour_type.to_sym
+          @eval_module.include(*modules)
+        end
+      end
+
     protected
 
+      def behaviour_type #:nodoc:
+        @description[:behaviour_type]
+      end
+
       # Messages that this class does not understand
       # are passed directly to the @eval_module.
       def method_missing(sym, *args, &block)
@@ -144,7 +159,7 @@ module Spec
         unless dry_run
           begin
             @before_and_after_all_context_instance = execution_context(nil)
-            @before_and_after_all_context_instance.instance_eval(&before_all_proc)
+            @before_and_after_all_context_instance.instance_eval(&before_all_proc(behaviour_type))
           rescue => e
             errors << e
             location = "before(:all)"
@@ -158,7 +173,7 @@ module Spec
         unless dry_run
           begin 
             @before_and_after_all_context_instance ||= execution_context(nil) 
-            @before_and_after_all_context_instance.instance_eval(&after_all_proc) 
+            @before_and_after_all_context_instance.instance_eval(&after_all_proc(behaviour_type)) 
           rescue => e
             location = "after(:all)"
             reporter.example_finished(location, e, location) if reporter

data/lib/spec/dsl/behaviour_callbacks.rb

@@ -1,31 +1,38 @@
 module Spec
   module DSL
     module BehaviourCallbacks
-      def prepend_before(scope=:each, &block)
-        case scope
-        when :each; before_each_parts.unshift(block)
-        when :all;  before_all_parts.unshift(block)
-        end
+      def prepend_before(*args, &block)
+        scope, options = scope_and_options(*args)
+        add(scope, options, :before, :unshift, &block)
       end
-      def append_before(scope=:each, &block)
-        case scope
-        when :each; before_each_parts << block
-        when :all;  before_all_parts << block
-        end
+      def append_before(*args, &block)
+        scope, options = scope_and_options(*args)
+        add(scope, options, :before, :<<, &block)
       end
       alias_method :before, :append_before
 
-      def prepend_after(scope=:each, &block)
-        case scope
-        when :each; after_each_parts.unshift(block)
-        when :all;  after_all_parts.unshift(block)
-        end
+      def prepend_after(*args, &block)
+        scope, options = scope_and_options(*args)
+        add(scope, options, :after, :unshift, &block)
       end
       alias_method :after, :prepend_after
-      def append_after(scope=:each, &block)
+      def append_after(*args, &block)
+        scope, options = scope_and_options(*args)
+        add(scope, options, :after, :<<, &block)
+      end
+      
+      def scope_and_options(*args)
+        args, options = args_and_options(*args)
+        scope = (args[0] || :each), options
+      end
+      
+      def add(scope, options, where, how, &block)
+        scope ||= :each
+        options ||= {}
+        behaviour_type = options[:behaviour_type]
         case scope
-        when :each; after_each_parts << block
-        when :all;  after_all_parts << block
+          when :each; self.__send__("#{where}_each_parts", behaviour_type).__send__(how, block)
+          when :all;  self.__send__("#{where}_all_parts", behaviour_type).__send__(how, block)
         end
       end
 
@@ -39,20 +46,31 @@ module Spec
         after(:each, &block)
       end
 
-      def before_all_parts # :nodoc:
-        @before_all_parts ||= []
+      def before_all_parts(behaviour_type=nil) # :nodoc:
+        @before_all_parts ||= {}
+        @before_all_parts[behaviour_type] ||= []
+      end
+
+      def after_all_parts(behaviour_type=nil) # :nodoc:
+        @after_all_parts ||= {}
+        @after_all_parts[behaviour_type] ||= []
       end
 
-      def after_all_parts # :nodoc:
-        @after_all_parts ||= []
+      def before_each_parts(behaviour_type=nil) # :nodoc:
+        @before_each_parts ||= {}
+        @before_each_parts[behaviour_type] ||= []
       end
 
-      def before_each_parts # :nodoc:
-        @before_each_parts ||= []
+      def after_each_parts(behaviour_type=nil) # :nodoc:
+        @after_each_parts ||= {}
+        @after_each_parts[behaviour_type] ||= []
       end
 
-      def after_each_parts # :nodoc:
-        @after_each_parts ||= []
+      def clear_before_and_after! # :nodoc:
+        @before_all_parts = nil
+        @after_all_parts = nil
+        @before_each_parts = nil
+        @after_each_parts = nil
       end
     end
   end

data/lib/spec/dsl/behaviour_eval.rb

@@ -35,6 +35,7 @@ module Spec
           before_all_parts.each  { |p| eval_module.before_all_parts << p }
           after_all_parts.each   { |p| eval_module.after_all_parts << p }
           included_modules.each  { |m| eval_module.included_modules << m }
+          eval_module.included_modules << self
         end
         
         # :call-seq:
@@ -97,31 +98,39 @@ module Spec
           super
         end
 
-        def before_all_proc(&error_handler)
+        def before_all_proc(behaviour_type, &error_handler)
           parts = []
-          parts.push(*Behaviour.before_all_parts)
-          parts.push(*before_all_parts)
+          parts.push(*Behaviour.before_all_parts(nil))
+          parts.push(*Behaviour.before_all_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*before_all_parts(nil))
+          parts.push(*before_all_parts(behaviour_type)) unless behaviour_type.nil?
           CompositeProcBuilder.new(parts).proc(&error_handler)
         end
 
-        def after_all_proc(&error_handler)
+        def after_all_proc(behaviour_type, &error_handler)
           parts = []
-          parts.push(*after_all_parts)
-          parts.push(*Behaviour.after_all_parts)
+          parts.push(*after_all_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*after_all_parts(nil))
+          parts.push(*Behaviour.after_all_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*Behaviour.after_all_parts(nil))
           CompositeProcBuilder.new(parts).proc(&error_handler)
         end
 
-        def before_each_proc(&error_handler)
+        def before_each_proc(behaviour_type, &error_handler)
           parts = []
-          parts.push(*Behaviour.before_each_parts)
-          parts.push(*before_each_parts)
+          parts.push(*Behaviour.before_each_parts(nil))
+          parts.push(*Behaviour.before_each_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*before_each_parts(nil))
+          parts.push(*before_each_parts(behaviour_type)) unless behaviour_type.nil?
           CompositeProcBuilder.new(parts).proc(&error_handler)
         end
 
-        def after_each_proc(&error_handler)
+        def after_each_proc(behaviour_type, &error_handler)
           parts = []
-          parts.push(*after_each_parts)
-          parts.push(*Behaviour.after_each_parts)
+          parts.push(*after_each_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*after_each_parts(nil))
+          parts.push(*Behaviour.after_each_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*Behaviour.after_each_parts(nil))
           CompositeProcBuilder.new(parts).proc(&error_handler)
         end