rspec 1.1.11 → 1.1.12

data/Rakefile

@@ -5,6 +5,7 @@ require 'rubygems'
 require 'hoe'
 require 'spec/version'
 require 'spec/rake/spectask'
+require 'cucumber/rake/task'
 
 class Hoe
   def extra_deps
@@ -19,6 +20,7 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
+  p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
 end
 
@@ -26,14 +28,14 @@ end
   Rake.application.instance_variable_get('@tasks').delete(task)
 end
 
-task :verify_rcov => [:spec, :stories]
+task :verify_rcov => [:spec, :features]
 task :default => :verify_rcov
 
 # # 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'
-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'
+load File.dirname(__FILE__) + '/resources/rake/examples.rake'
+load File.dirname(__FILE__) + '/resources/rake/examples_with_rcov.rake'
+load File.dirname(__FILE__) + '/resources/rake/failing_examples_with_html.rake'
+load File.dirname(__FILE__) + '/resources/rake/verify_rcov.rake'
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
@@ -42,14 +44,12 @@ Spec::Rake::SpecTask.new do |t|
   unless ENV['NO_RCOV']
     t.rcov = true
     t.rcov_dir = 'coverage'
-    t.rcov_opts = ['--text-report', '--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/var\/lib\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+    t.rcov_opts = ['--text-report', '--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
   end
 end
 
-desc "Run all stories"
-task :stories do
-  ruby "stories/all.rb --colour --format plain"
-end
+desc "Run Cucumber features"
+Cucumber::Rake::Task.new do; end
 
 desc "Run failing examples (see failure output)"
 Spec::Rake::SpecTask.new('failing_examples') do |t|

data/TODO.txt

@@ -1,10 +1,18 @@
+== Refactoring
+
+Refactoring for 1.2.0
+
+* eliminate dependency from Spec::Example to Spec::Runner
+** global predictate matchers should be stored in run_options
+* eliminate dependency on global options and configuration
+** the only place they should exist is in the Runner, which should manage them
+
 == Future
 
 * do SOMETHING with the website
 * extract spec/story to rspec-stories (new gem)
-* remove the ruby engine adapter unless Rubinius team plans to use it
 * rename top level namespace to Rspec and commands to 'rspec' and 'autorspec'
   * continue to support Spec 'spec' and 'autospec' as aliases for a reasonable time
 * separate the underlying framework from the DSL
   * be able to do everything with classes and methods
-* tweak raise_error rdoc to show only one arg
+* tweak raise_error rdoc to show only one arg

data/{failing_examples/failure_in_teardown.rb → examples/failing/failure_in_after.rb}

@@ -1,6 +1,6 @@
 describe "This example" do
   
-  it "should be listed as failing in teardown" do
+  it "should be listed as failing in after" do
   end
   
   after(:each) do

data/{failing_examples/failure_in_setup.rb → examples/failing/failure_in_before.rb}

@@ -4,7 +4,7 @@ describe "This example" do
     NonExistentClass.new
   end
   
-  it "should be listed as failing in setup" do
+  it "should be listed as failing in each" do
   end
   
 end

data/{failing_examples → examples/failing}/predicate_example.rb

@@ -26,4 +26,9 @@ describe "BDD framework" do
     @bdd_framework.should be_intuitive
   end
 
+  it "should not respond to test" do
+    #this will fail
+    @bdd_framework.test
+  end
+
 end

data/{failing_examples → examples/failing}/spec_helper.rb

@@ -1,3 +1,3 @@
-lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+lib_path = File.expand_path(File.dirname(__FILE__) + "/../../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 require "spec"

data/examples/{pure → passing}/autogenerated_docstrings_example.rb

@@ -17,3 +17,9 @@ describe "Examples with no descriptions" do
   specify { [1,2,3].should respond_to(:size) }
   
 end
+
+describe "the number 1" do
+  subject { 1 }
+  it { should == 1 }
+  it { should be < 2}
+end

data/examples/{pure → passing}/custom_formatter.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'spec/runner/formatter/progress_bar_formatter'
 
 # Example of a formatter with custom bactrace printing. Run me with:
-# ruby bin/spec failing_examples -r examples/custom_formatter.rb -f CustomFormatter
+# ruby bin/spec examples/failing -r examples/passing/custom_formatter.rb -f CustomFormatter
 class CustomFormatter < Spec::Runner::Formatter::ProgressBarFormatter
   def backtrace_line(line)
     line.gsub(/([^:]*\.rb):(\d*)/) do

data/examples/{pure → passing}/dynamic_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "Some integers" do
+describe "The square root" do
   (1..10).each do |n|
-    it "The root of #{n} square should be #{n}" do
+    it "of #{n*n} should be #{n}" do
       Math.sqrt(n*n).should == n
     end
   end

data/examples/{pure/multi_threaded_behaviour_runner.rb → passing/multi_threaded_example_group_runner.rb}

@@ -23,6 +23,4 @@ class MultiThreadedExampleGroupRunner < Spec::Runner::ExampleGroupRunner
     @threads.each {|t| t.join}
     success
   end
-end
-
-MultiThreadedBehaviourRunner = MultiThreadedExampleGroupRunner
+end

data/examples/{pure → passing}/shared_stack_examples.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
-
 shared_examples_for "non-empty Stack" do
 
   it { @stack.should_not be_empty }
@@ -7,7 +5,7 @@ shared_examples_for "non-empty Stack" do
   it "should return the top item when sent #peek" do
     @stack.peek.should == @last_item_added
   end
-
+  
   it "should NOT remove the top item when sent #peek" do
     @stack.peek.should == @last_item_added
     @stack.peek.should == @last_item_added

data/examples/passing/simple_matcher_example.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "arrays" do
+  def contain_same_elements_as(expected)
+    simple_matcher "array with same elements in any order as #{expected.inspect}" do |actual|
+      if actual.size == expected.size
+        a, e = actual.dup, expected.dup
+        until e.empty? do
+          if i = a.index(e.pop) then a.delete_at(i) end
+        end
+        a.empty?
+      else
+        false
+      end
+    end
+  end
+  
+  describe "can be matched by their contents disregarding order" do
+    subject { [1,2,2,3] }
+    it { should contain_same_elements_as([1,2,2,3]) }
+    it { should contain_same_elements_as([2,3,2,1]) }
+    it { should_not contain_same_elements_as([3,3,2,1]) }
+  end
+  
+  describe "fail the match with different contents" do
+    subject { [1,2,3] }
+    it { should_not contain_same_elements_as([2,3,4])}
+    it { should_not contain_same_elements_as([1,2,2,3])}
+    it { should_not contain_same_elements_as([1,2])}
+  end
+end

data/examples/{pure → passing}/stack_spec.rb

@@ -7,8 +7,9 @@ describe Stack, " (empty)" do
     @stack = Stack.new
   end
   
-  # NOTE that this one auto-generates the description "should be empty"
-  it { @stack.should be_empty }
+  # This uses @stack (because the described class is Stack) auto-generates the
+  # description "should be empty"
+  it { should be_empty }
   
   it_should_behave_like "non-full Stack"
   

data/examples/ruby1.9.compatibility/access_to_constants_spec.rb

@@ -0,0 +1,86 @@
+# courtesy of Matthias Hennemeyer
+#
+# The following should pass against ruby 1.8 and 1.9. It currently only passes
+# 1.8 (as of 1/2/2009)
+#
+# Once cucumber supports ruby 1.9, this should be moved to cucumber scenarios instead. 
+module Foo 
+  module Bar
+    
+    module ModuleInEnclosingModule;end
+    class ClassInEnclosingModule;end 
+    def method_in_enclosing_module;end
+    CONSTANT_IN_ENCLOSING_MODULE = 0
+
+    describe "Examples trying to access constants defined in an enclosing module" do 
+
+      it "can access Modules" do 
+        ModuleInEnclosingModule
+      end
+      it "can access Classes" do 
+        ClassInEnclosingModule.new
+      end
+      it "can access CONSTANTS" do 
+        CONSTANT_IN_ENCLOSING_MODULE
+      end
+      it "can NOT access methods" do 
+        lambda {method_in_enclosing_module}.should raise_error(/undefined/)
+      end
+
+      describe "from a nested example group" do 
+
+        it "can access Modules" do 
+          ModuleInEnclosingModule
+        end
+        it "can access Classes" do 
+          ClassInEnclosingModule.new
+        end
+        it "can access CONSTANTS" do 
+          CONSTANT_IN_ENCLOSING_MODULE
+        end
+        it "can NOT access methods" do 
+          lambda {method_in_enclosing_module}.should raise_error(/undefined/)
+        end
+
+      end 
+
+    end
+    
+    describe "Examples trying to access constants defined in the example group" do 
+      
+      module ModuleDefinedInGroup;end
+      class ClassDefinedInGroup; end 
+      def method_defined_in_group; end
+      CONSTANT_DEFINED_IN_GROUP = 0
+
+      it "can access Modules" do
+        ModuleDefinedInGroup
+      end
+      it "can access Classes" do 
+        ClassDefinedInGroup.new
+      end
+      it "can access CONSTANTS" do 
+        CONSTANT_DEFINED_IN_GROUP
+      end
+      it "can access methods" do 
+        method_defined_in_group
+      end
+      
+      describe "that live inside a nested group" do
+        it "can access Modules" do
+          ModuleDefinedInGroup
+        end
+        it "can access Classes" do 
+          ClassDefinedInGroup.new
+        end
+        it "can access CONSTANTS" do 
+          CONSTANT_DEFINED_IN_GROUP
+        end
+        it "can access methods" do 
+          method_defined_in_group
+        end
+      end
+    end 
+  end 
+end
+

data/features/before_and_after_blocks/before_and_after_blocks.feature

@@ -0,0 +1,168 @@
+Feature: before and after blocks
+
+  As a developer using RSpec
+  I want to execute arbitrary code before and after each example
+  So that I can control the environment in which it is run
+  
+    This is supported by the before and after methods which each take a symbol
+    indicating the scope, and a block of code to execute.
+  
+    before(:each) blocks are run before each example
+    before(:all) blocks are run once before all of the examples in a group
+    before(:suite) blocks are run once before the entire suite
+
+    after(:each) blocks are run after each example
+    after(:all) blocks are run once after all of the examples in a group
+    after(:suite) blocks are run once after the entire suite
+
+    Before and after blocks are called in the following order:
+      before suite
+      before all
+      before each
+      after each
+      after all
+      after suite
+    
+    Before and after blocks can be defined in the example groups to which they
+    apply or in a configuration. When defined in a configuration, they can be
+    applied to all groups or subsets of all groups defined by example group
+    types.
+  
+  Scenario: define before(:each) block in example group
+    Given the following spec:
+      """
+      class Thing
+        def widgets
+          @widgets ||= []
+        end
+      end
+
+      describe Thing do
+        before(:each) do
+          @thing = Thing.new
+        end
+        
+        context "initialized in before(:each)" do
+          it "has 0 widgets" do
+            @thing.should have(0).widgets
+          end
+        
+          it "can get accept new widgets" do
+            @thing.widgets << Object.new
+          end
+        
+          it "does not share state across examples" do
+            @thing.should have(0).widgets
+          end
+        end
+      end
+      """
+  	When I run it with the spec script
+    Then the stdout should match "3 examples, 0 failures"
+  
+  Scenario: define before(:all) block in example group
+    Given the following spec:
+      """
+      class Thing
+        def widgets
+          @widgets ||= []
+        end
+      end
+
+      describe Thing do
+        before(:all) do
+          @thing = Thing.new
+        end
+        
+        context "initialized in before(:all)" do
+          it "has 0 widgets" do
+            @thing.should have(0).widgets
+          end
+        
+          it "can get accept new widgets" do
+            @thing.widgets << Object.new
+          end
+        
+          it "shares state across examples" do
+            @thing.should have(1).widgets
+          end
+        end
+      end
+      """
+  	When I run it with the spec script
+    Then the stdout should match "3 examples, 0 failures"
+  
+  Scenario: define before and after blocks in configuration
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.before(:suite) do
+          $before_suite = "before suite"
+        end
+        config.before(:each) do
+          @before_each = "before each"
+        end
+        config.before(:all) do
+          @before_all = "before all"
+        end
+      end
+
+      describe "stuff in before blocks" do
+        describe "with :suite" do
+          it "should be available in the example" do
+            $before_suite.should == "before suite"
+          end
+        end
+        describe "with :all" do
+          it "should be available in the example" do
+            @before_all.should == "before all"
+          end
+        end
+        describe "with :each" do
+          it "should be available in the example" do
+            @before_each.should == "before each"
+          end
+        end
+      end
+      """
+    When I run it with the spec script
+    Then the stdout should match "3 examples, 0 failures"
+
+  Scenario: before/after blocks are run in order
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.before(:suite) do
+          puts "before suite"
+        end
+        config.after(:suite) do
+          puts "after suite"
+        end
+      end
+
+      describe "before and after callbacks" do
+        before(:all) do
+          puts "before all"
+        end
+
+        before(:each) do
+          puts "before each"
+        end
+
+        after(:each) do
+          puts "after each"
+        end
+
+        after(:all) do
+          puts "after all"
+        end
+
+        it "gets run in order" do
+
+        end
+      end
+      """
+
+    When I run it with the spec script
+    Then the stdout should match /before suite\nbefore all\nbefore each\nafter each\n\.after all\n.*after suite/m
+