dchelimsky-rspec 1.1.11.4 → 1.1.11.5

data/History.txt

@@ -14,7 +14,7 @@
   * hash_including mock argument matcher can now accept just keys, key/value pairs, or both (David Krmpotic)
   * added hash_not_including mock argument matcher (David Krmpotic). Closes #634.
 
-* 6 minor enhancements
+* 7 minor enhancements
 
   * should throw_symbol accepts an optional argument: should throw_symbol(:sym, arg)
   * fixed --line for jruby (Zach Moazeni)
@@ -22,8 +22,9 @@
   * removed all instances of class << self - I do know who I am
   * SpecParser can't handle backtrace paths with colons (John-Mason P. Shackelford). Closes #505.
   * html formatter (and subsequently the textmate formatter) header fills in completely when running a single example
+  * config.include now accepts an array of types (config.include(Helpers, :type => [:view, :controller]))
   
-* 8 bug fixes
+* 9 bug fixes
 
   * fixed bug where {:a => 1, :b => 2}.should include(:a, :b) failed (Yossef Mendelssohn)
   * only try to load Test::Unit if Test::Unit is defined (not just Test)
@@ -33,6 +34,7 @@
   * Check whether test/unit has really been loaded before calling a method it defines (Brian Donovan). Closes #503.
   * Fix spec_path for shared groups (Zach Dennis). Closes #615.
   * stubbed message expectation not verified if it has been called *before* the expectation (Matthias Hennemeyer). Closes #637.
+  * stubs calculate return value by executing block passed to #and_return (hint from Aisha Fenton). Closes #642.
   
 === Version 1.1.11 / 2008-10-24
 

data/Manifest.txt

@@ -52,7 +52,8 @@ examples/passing/stack_spec.rb
 examples/passing/stack_spec_with_nested_example_groups.rb
 examples/passing/stubbing_example.rb
 examples/passing/yielding_example.rb
-features/configuration/before_blocks.feature
+examples/ruby1.9.compatibility/access_to_constants_spec.rb
+features/before_and_after_blocks/before_and_after_blocks.feature
 features/example_groups/autogenerated_docstrings.feature
 features/example_groups/example_group_with_should_methods.feature
 features/example_groups/nested_groups.feature
@@ -139,6 +140,7 @@ lib/spec/mocks/space.rb
 lib/spec/mocks/spec_methods.rb
 lib/spec/rake/spectask.rb
 lib/spec/rake/verify_rcov.rb
+lib/spec/ruby.rb
 lib/spec/runner.rb
 lib/spec/runner/backtrace_tweaker.rb
 lib/spec/runner/class_and_arguments_parser.rb
@@ -190,7 +192,6 @@ resources/rake/examples.rake
 resources/rake/examples_with_rcov.rake
 resources/rake/failing_examples_with_html.rake
 resources/rake/verify_rcov.rake
-resources/spec/before_blocks_example.rb
 resources/spec/example_group_with_should_methods.rb
 resources/spec/simple_spec.rb
 resources/spec/spec_with_flexmock.rb
@@ -214,7 +215,6 @@ spec/spec/example/example_group_methods_spec.rb
 spec/spec/example/example_group_spec.rb
 spec/spec/example/example_matcher_spec.rb
 spec/spec/example/example_methods_spec.rb
-spec/spec/example/example_runner_spec.rb
 spec/spec/example/helper_method_spec.rb
 spec/spec/example/nested_example_group_spec.rb
 spec/spec/example/pending_module_spec.rb
@@ -308,6 +308,8 @@ spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html
 spec/spec/runner/formatter/html_formatted-1.8.5.html
 spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html
 spec/spec/runner/formatter/html_formatted-1.8.6.html
+spec/spec/runner/formatter/html_formatted-1.8.7.html
+spec/spec/runner/formatter/html_formatted-1.9.1.html
 spec/spec/runner/formatter/html_formatter_spec.rb
 spec/spec/runner/formatter/nested_text_formatter_spec.rb
 spec/spec/runner/formatter/profile_formatter_spec.rb
@@ -320,6 +322,8 @@ spec/spec/runner/formatter/story/plain_text_formatter_spec.rb
 spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb
 spec/spec/runner/formatter/text_mate_formatted-1.8.4.html
 spec/spec/runner/formatter/text_mate_formatted-1.8.6.html
+spec/spec/runner/formatter/text_mate_formatted-1.8.7.html
+spec/spec/runner/formatter/text_mate_formatted-1.9.1.html
 spec/spec/runner/heckle_runner_spec.rb
 spec/spec/runner/heckler_spec.rb
 spec/spec/runner/noisy_backtrace_tweaker_spec.rb

data/Rakefile

@@ -44,7 +44,7 @@ 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
 

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
+

data/features/step_definitions/running_rspec.rb

@@ -5,6 +5,13 @@ Given /^the file (.*)$/ do |relative_path|
   end
 end
 
+Given /^the following spec:$/ do |spec|
+  @path = "/tmp/example_spec.rb"
+  File.open(@path, "w") do |f|
+    f.write spec
+  end
+end
+
 When /^I run it with the (.*)$/ do |interpreter|
   stderr_file = Tempfile.new('rspec')
   stderr_file.close
@@ -40,7 +47,6 @@ Then /^the (.*) should not match (.*)$/ do |stream, string_or_regex|
   written.should_not smart_match(string_or_regex)
 end
 
-
 Then /^the exit code should be (\d+)$/ do |exit_code|
   if @exit_code != exit_code.to_i
     raise "Did not exit with #{exit_code}, but with #{@exit_code}. Standard error:\n#{@stderr}"

data/lib/spec.rb

@@ -4,3 +4,4 @@ require 'spec/example'
 require 'spec/runner'
 require 'spec/version'
 require 'spec/dsl'
+require 'spec/ruby'

data/lib/spec/dsl/main.rb

@@ -21,10 +21,11 @@ module Spec
       #
       def describe(*args, &block)
         Spec::Example::add_spec_path_to(args)
+        Spec::Example::ExampleGroupFactory.assign_scope(self, args)
         Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
       end
       alias :context :describe
-    
+      
       # Creates an example group that can be shared by other example groups
       #
       # == Examples

data/lib/spec/example/before_and_after_hooks.rb

@@ -1,6 +1,16 @@
 module Spec
   module Example
     module BeforeAndAfterHooks
+      class << self
+        def before_suite_parts
+          @before_suite_parts ||= []
+        end
+        
+        def after_suite_parts
+          @after_suite_parts ||= []
+        end
+      end
+      
       # Registers a block to be executed before each example.
       # This method prepends +block+ to existing before blocks.
       def prepend_before(*args, &block)
@@ -58,13 +68,21 @@ module Spec
         @after_each_parts ||= []
       end
       
+      def before_suite_parts
+        BeforeAndAfterHooks.before_suite_parts
+      end
+      
+      def after_suite_parts
+        BeforeAndAfterHooks.after_suite_parts
+      end
+      
     private  
       
       def before_parts(*args)
         case Spec::Example.scope_from(*args)
         when :each; before_each_parts
         when :all; before_all_parts
-        when :suite; Spec::Runner.options.before_suite_parts
+        when :suite; before_suite_parts
         end
       end
 
@@ -72,7 +90,7 @@ module Spec
         case Spec::Example.scope_from(*args)
         when :each; after_each_parts
         when :all; after_all_parts
-        when :suite; Spec::Runner.options.after_suite_parts
+        when :suite; after_suite_parts
         end
       end
 

data/lib/spec/example/example_group_factory.rb

@@ -62,6 +62,17 @@ module Spec
           SharedExampleGroup.register(*args, &block)
         end
         
+        def include_constants_in(context, &block)
+          if (Spec::Ruby.version.to_f >= 1.9 && Module === context && !(Class === context))
+            return lambda {include context;instance_eval(&block)}
+          end
+          block
+        end
+        
+        def assign_scope(scope, args)
+          args.last[:scope] = scope
+        end
+
       protected
 
         def determine_superclass(opts)