rspec 1.1.3 → 1.1.4

data/lib/spec/story/runner.rb

@@ -10,16 +10,17 @@ module Spec
     module Runner
       class << self
         def run_options # :nodoc:
-          @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout)
+          rspec_options
+          # @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout)
         end
         
         def story_runner # :nodoc:
           unless @story_runner
-            @story_runner = StoryRunner.new(scenario_runner, world_creator)
+            @story_runner = create_story_runner
             run_options.story_formatters.each do |formatter|
               register_listener(formatter)
             end
-            Runner.register_exit_hook
+            self.register_exit_hook
           end
           @story_runner
         end
@@ -32,6 +33,10 @@ module Spec
           @world_creator ||= World
         end
         
+        def create_story_runner
+          StoryRunner.new(scenario_runner, world_creator)
+        end
+        
         # Use this to register a customer output formatter.
         def register_listener(listener)
           story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended
@@ -41,9 +46,8 @@ module Spec
         
         def register_exit_hook # :nodoc:
           at_exit do
-            Runner.story_runner.run_stories unless $!
+            exit Runner.story_runner.run_stories unless $!
           end
-          # TODO exit with non-zero status if run fails
         end
         
         def dry_run

data/lib/spec/story/runner/plain_text_story_runner.rb

@@ -26,9 +26,9 @@ module Spec
           @story_file = path
         end
         
-        def run
+        def run(story_runner=Spec::Story::Runner.story_runner)
           raise "You must set a path to the file with the story. See the RDoc." if @story_file.nil?
-          mediator = Spec::Story::Runner::StoryMediator.new(steps, Spec::Story::Runner.story_runner, @options)
+          mediator = Spec::Story::Runner::StoryMediator.new(steps, story_runner, @options)
           parser = Spec::Story::Runner::StoryParser.new(mediator)
 
           story_text = File.read(@story_file)          

data/lib/spec/story/runner/scenario_runner.rb

@@ -11,6 +11,12 @@ module Spec
           run_story_ignoring_scenarios(scenario.story, world)
           
           world.start_collecting_errors
+
+          unless scenario.body
+            @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, '') }
+            return true
+          end
+          
           world.instance_eval(&scenario.body)
           if world.errors.empty?
             @listeners.each { |l| l.scenario_succeeded(scenario.story.title, scenario.name) }
@@ -19,8 +25,10 @@ module Spec
               @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, e.message) }
             else
               @listeners.each { |l| l.scenario_failed(scenario.story.title, scenario.name, e) }
+              return false
             end
           end
+          true
         end
         
         def add_listener(listener)

data/lib/spec/story/runner/story_mediator.rb

@@ -64,7 +64,7 @@
             title = @title
             narrative = @narrative
             scenarios = @scenarios.collect { |scenario| scenario.to_proc }
-            options = @options.merge(:steps => @step_group)
+            options = @options.merge(:steps_for => @step_group)
             lambda do
               Story title, narrative, options do
                 scenarios.each { |scenario| instance_eval(&scenario) }

data/lib/spec/story/runner/story_runner.rb

@@ -36,6 +36,7 @@ module Spec
         def run_stories
           return if @stories.empty?
           @listeners.each { |l| l.run_started(scenarios.size) }
+          success = true
           @stories.each do |story|
             story.assign_steps_to(World)
             @current_story = story
@@ -45,7 +46,7 @@ module Spec
               type = story[:type] || Object
               args = story[:args] || []
               world = @world_creator.create(type, *args)
-              @scenario_runner.run(scenario, world)
+              success = success & @scenario_runner.run(scenario, world)
             end
             @listeners.each { |l| l.story_ended(story.title, story.narrative) }
             World.step_mother.clear
@@ -53,6 +54,7 @@ module Spec
           unique_steps = (World.step_names.collect {|n| Regexp === n ? n.source : n.to_s}).uniq.sort
           @listeners.each { |l| l.collected_steps(unique_steps) }
           @listeners.each { |l| l.run_ended }
+          return success
         end
         
         def add_listener(listener)

data/lib/spec/story/step.rb

@@ -1,8 +1,8 @@
 module Spec
   module Story
     class Step
-      PARAM_PATTERN = /(\$\w*)/
-      PARAM_OR_GROUP_PATTERN = /(\$\w*)|\(.*?\)/
+      PARAM_PATTERN = /([^\\]|^)(\$(?!\$)\w*)/
+      PARAM_OR_GROUP_PATTERN = /(\$(?!\$)\w*)|\(.*?\)/
       
       attr_reader :name
       def initialize(name, &block)
@@ -48,11 +48,11 @@ module Spec
             expression = string_or_regexp.source
           end
           while expression =~ PARAM_PATTERN
-            expression.gsub!($1, "(.*?)")
+            expression.gsub!($2, "(.*?)")
           end
           @expression = Regexp.new("^#{expression}$")
         end
 
     end
   end
-end
+end

data/lib/spec/story/story.rb

@@ -19,17 +19,14 @@ module Spec
       end
       
       def assign_steps_to(assignee)
-        if @params[:steps]
-          assignee.use(@params[:steps])
-        else
-          case keys = @params[:steps_for]
-          when Symbol
-            keys = [keys]
-          when nil
-            keys = []
-          end
-          keys.each do |key|
-            assignee.use(steps_for(key))
+        if steps=@params[:steps_for]
+          steps = [steps] unless steps.is_a?(Array)
+          steps.each do |step|
+            if step.is_a?(StepGroup)
+              assignee.use(step)
+            else
+              assignee.use(steps_for(step))
+            end
           end
         end
       end

data/lib/spec/story/world.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'spec/expectations'
 require 'spec/matchers'
 require 'spec/example/pending'

data/lib/spec/version.rb

@@ -3,10 +3,10 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 1
-      TINY   = 3
+      TINY   = 4
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20080131122909
+      BUILD_TIME_UTC = 20080526202855
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/plugins/mock_frameworks/rspec.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "spec", "mocks"))
+require 'spec/mocks/framework'
+require 'spec/mocks/extensions'
 
 module Spec
   module Plugins

data/spec/autotest/rspec_spec.rb

@@ -49,7 +49,7 @@ HERE
   describe Rspec, "selection of rspec command" do
     include AutotestHelper
     
-    before :each do
+    before(:each) do
       common_setup
       @rspec_autotest = Rspec.new
     end
@@ -83,7 +83,7 @@ HERE
   describe Rspec, "selection of rspec command (windows compatibility issues)" do
     include AutotestHelper
     
-    before :each do
+    before(:each) do
       common_setup
     end
     
@@ -104,7 +104,7 @@ HERE
   end
 
   describe Rspec, "adding spec.opts --options" do 
-    before :each do
+    before(:each) do
       @rspec_autotest = Rspec.new
     end
 
@@ -120,7 +120,7 @@ HERE
   end  
   
   describe Rspec do
-    before :each do
+    before(:each) do
       @rspec_autotest = Rspec.new
       @rspec_autotest.stub!(:ruby).and_return "ruby"
       @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts"
@@ -167,11 +167,11 @@ HERE
   describe Rspec, "consolidating failures" do
     include AutotestHelper
     
-    before :each do
+    before(:each) do
       common_setup
       @rspec_autotest = Rspec.new
       
-      @spec_file = "./spec/autotest/rspec_spec.rb"
+      @spec_file = "spec/autotest/rspec_spec.rb"
       @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
       @rspec_autotest.stub!(:find_files_to_test).and_return true
     end
@@ -181,14 +181,16 @@ HERE
     end
     
     it "should return a hash with the spec filename => spec name for each failure or error" do
-      @rspec_autotest.stub!(:test_files_for).and_return "./spec/autotest/rspec_spec.rb"
-      foo = [
+      @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/rspec_spec.rb"
+      failures = [
         [
           "false should be false", 
-          "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
+          "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
         ]
       ]
-      @rspec_autotest.consolidate_failures(foo).should == {@spec_file => ["false should be false"]}
+      @rspec_autotest.consolidate_failures(failures).should == {
+        @spec_file => ["false should be false"]
+      }
     end
     
   end

data/spec/spec/example/example_group/described_module_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + "/../../../spec_helper"
+
+module Spec
+  module Example
+    module  AModule;  end
+    class   AClass;   end
+
+    describe "With", AModule do
+      it "should have the described_type as 'AModule'" do
+        self.class.described_module.should == AModule
+      end
+    end
+    
+    describe "With", AClass do
+      it "should have the described_module as nil" do
+        self.class.described_module.should be_nil
+      end
+    end
+  end
+end

data/spec/spec/example/example_group/warning_messages_spec.rb

@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + "/../../../spec_helper"
+
+module Spec
+  module Example
+    module AModuleAutomaticallyIncluded
+      def call_method
+        @method_called = true
+        return "a string"
+      end
+      
+      def method_called?
+        @method_called ? true : false
+      end
+    end
+    
+    describe "Including modules in an example group" do
+      describe AModuleAutomaticallyIncluded do
+        before :each do
+          Kernel.stub!(:warn)
+        end
+        
+        it "should return the correct values" do
+          self.method_called?.should be_false
+          self.call_method.should eql("a string")
+          self.method_called?.should be_true
+        end
+        
+        it "should respond_to? the methods from the module" do
+          self.should respond_to(:method_called?)
+          self.should respond_to(:call_method)
+        end
+        
+        it "should not respond_to? methods which do not come from the module (or are in Spec::ExampleGroup)" do
+          self.should_not respond_to(:adsfadfadadf_a_method_which_does_not_exist)
+        end
+        
+        it "should respond_to? a method in Spec::ExampleGroup" do
+          self.should respond_to(:describe)
+        end
+        
+        it "should issue a warning with Kernel.warn" do
+          Kernel.should_receive(:warn)
+          self.call_method
+        end
+        
+        it "should issue a warning when the example calls the method which is automatically included" do
+          Kernel.should_receive(:warn).with("Modules will no longer be automatically included in RSpec version 1.1.4.  Called from #{__FILE__}:#{__LINE__+1}")
+          self.method_called?
+        end
+        
+        it "should issue a warning with the correct file and line numbers" do
+          Kernel.should_receive(:warn).with("Modules will no longer be automatically included in RSpec version 1.1.4.  Called from #{__FILE__}:#{__LINE__+1}")
+          self.method_called?
+        end
+      end
+      
+      describe AModuleAutomaticallyIncluded, "which is also manually included" do
+        include AModuleAutomaticallyIncluded
+        
+        before :each do
+          Kernel.stub!(:warn)
+        end
+        
+        it "should respond to the methods since it is included" do
+          self.should respond_to(:method_called?)
+          self.should respond_to(:call_method)
+        end
+        
+        it "should not issue a warning, since the module is manually included" do
+          Kernel.should_not_receive(:warn)
+          self.method_called?
+        end
+      end
+    end
+  end
+end

data/spec/spec/example/example_group_factory_spec.rb

@@ -1,128 +1,143 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module Spec
   module Example
-    describe ExampleGroupFactory, "with :foobar registered as custom type" do
+    describe ExampleGroupFactory do
+      describe "#get" do
+        attr_reader :example_group
+        before do
+          @example_group = Class.new(ExampleGroup)
+          ExampleGroupFactory.register(:registered_type, @example_group)
+        end
 
-      before do
-        @example_group = Class.new(ExampleGroup)
-        ExampleGroupFactory.register(:foobar, @example_group)
-      end
+        after do
+          ExampleGroupFactory.reset
+        end
 
-      after do
-        ExampleGroupFactory.reset
-      end
+        it "should #get the default ExampleGroup type when passed nil" do
+          ExampleGroupFactory.get(nil).should == ExampleGroup
+        end
 
-      it "should #get the default ExampleGroup type when passed nil" do
-        ExampleGroupFactory.get(nil).should == ExampleGroup
-      end
+        it "should #get the default ExampleGroup for unregistered non-nil values" do
+          ExampleGroupFactory.get(:does_not_exist).should == ExampleGroup
+        end
 
-      it "should #get the default ExampleGroup for unregistered non-nil values" do
-        ExampleGroupFactory.get(:does_not_exist).should == ExampleGroup
-      end
+        it "should #get custom type for :registered_type" do
+          ExampleGroupFactory.get(:registered_type).should == @example_group
+        end
 
-      it "should #get custom type for :foobar" do
-        ExampleGroupFactory.get(:foobar).should == @example_group
-      end
+        it "should #get the actual type when that is passed in" do
+          ExampleGroupFactory.get(@example_group).should == @example_group
+        end
 
-      it "should #get the actual type when that is passed in" do
-        ExampleGroupFactory.get(@example_group).should == @example_group
+        it "should get the custom type after setting the default" do
+          @example_group2 = Class.new(ExampleGroup)
+          ExampleGroupFactory.default(@example_group2)
+          ExampleGroupFactory.get(:registered_type).should == @example_group
+        end
       end
 
-    end    
+      describe "#create_example_group" do
+        attr_reader :parent_example_group
+        before do
+          @parent_example_group = Class.new(ExampleGroup) do
+            def initialize(*args, &block)
+              ;
+            end
+          end
+        end
 
-    describe ExampleGroupFactory, "#create_example_group" do
-      it "should create a uniquely named class" do
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group("example_group") {}
-        example_group.name.should =~ /Spec::Example::ExampleGroup::Subclass_\d+/
-      end
+        it "should create a uniquely named class" do
+          example_group = Spec::Example::ExampleGroupFactory.create_example_group("example_group") {}
+          example_group.name.should =~ /Spec::Example::ExampleGroup::Subclass_\d+/
+        end
 
-      it "should create a Spec::Example::Example subclass by default" do
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group("example_group") {}
-        example_group.superclass.should == Spec::Example::ExampleGroup
-      end
+        it "should create a Spec::Example::Example subclass by default" do
+          example_group = Spec::Example::ExampleGroupFactory.create_example_group("example_group") {}
+          example_group.superclass.should == Spec::Example::ExampleGroup
+        end
 
-      it "should create a Spec::Example::Example when :type => :default" do
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "example_group", :type => :default
-        ) {}
-        example_group.superclass.should == Spec::Example::ExampleGroup
-      end
+        describe "when :type => :default" do
+          it "should create a Spec::Example::Example" do
+            example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+            "example_group", :type => :default
+            ) {}
+            example_group.superclass.should == Spec::Example::ExampleGroup
+          end
+
+          it "should create a Spec::Example::Example" do
+            example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+            "example_group", :type => :default
+            ) {}
+            example_group.superclass.should == Spec::Example::ExampleGroup
+          end
+        end
 
-      it "should create a Spec::Example::Example when :type => :default" do
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "example_group", :type => :default
-        ) {}
-        example_group.superclass.should == Spec::Example::ExampleGroup
-      end
+        describe "when :type => :something_other_than_default" do
+          it "should create specified type" do
+            Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
+            non_default_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+              "example_group", :type => :something_other_than_default
+            ) {}
+            non_default_example_group.superclass.should == parent_example_group
+          end
+        end
 
-      it "should create specified type when :type => :something_other_than_default" do
-        klass = Class.new(ExampleGroup) do
-          def initialize(*args, &block); end
+        it "should create a type indicated by :spec_path" do
+          Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
+          custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+            "example_group", :spec_path => "./spec/something_other_than_default/some_spec.rb"
+          ) {}
+          custom_example_group.superclass.should == parent_example_group
         end
-        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "example_group", :type => :something_other_than_default
-        ) {}
-        example_group.superclass.should == klass
-      end
-      
-      it "should create a type indicated by :spec_path" do
-        klass = Class.new(ExampleGroup) do
-          def initialize(*args, &block); end
-        end
-        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "example_group", :spec_path => "./spec/something_other_than_default/some_spec.rb"
-        ) {}
-        example_group.superclass.should == klass
-      end
-      
-      it "should create a type indicated by :spec_path (with spec_path generated by caller on windows)" do
-        klass = Class.new(ExampleGroup) do
-          def initialize(*args, &block); end
-        end
-        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "example_group", :spec_path => "./spec\\something_other_than_default\\some_spec.rb"
-        ) {}
-        example_group.superclass.should == klass
-      end
-      
-      it "should create and register a Spec::Example::Example if :shared => true" do
-        shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/models/blah.rb', :type => :controller, :shared => true
-        ) {}
-        shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
-        SharedExampleGroup.shared_example_groups.should include(shared_example_group)
-      end
 
-      it "should favor the :type over the :spec_path" do
-        klass = Class.new(ExampleGroup) do
-          def initialize(*args, &block); end
+        it "should create a type indicated by :spec_path (with spec_path generated by caller on windows)" do
+          Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
+          custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+            "example_group",
+            :spec_path => "./spec\\something_other_than_default\\some_spec.rb"
+          ) {}
+          custom_example_group.superclass.should == parent_example_group
         end
-        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-          "name", :spec_path => '/blah/spec/models/blah.rb', :type => :something_other_than_default
-        ) {}
-        example_group.superclass.should == klass
-      end
 
-      it "should register ExampleGroup by default" do
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
+        describe "when :shared => true" do
+          attr_reader :shared_example_group
+          before do
+            @shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+              "name", :spec_path => '/blah/spec/models/blah.rb', :type => :controller, :shared => true
+            ) {}
+          end
+
+          it "should create and register a Spec::Example::Example" do
+            shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
+            SharedExampleGroup.shared_example_groups.should include(shared_example_group)
+          end
         end
-        rspec_options.example_groups.should include(example_group)
-      end
 
-      it "should enable unregistering of ExampleGroups" do
-        example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
-          unregister
+        it "should favor the :type over the :spec_path" do
+          Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
+          custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+            "name", :spec_path => '/blah/spec/models/blah.rb', :type => :something_other_than_default
+          ) {}
+          custom_example_group.superclass.should == parent_example_group
+        end
+
+        it "should register ExampleGroup by default" do
+          example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
+          end
+          rspec_options.example_groups.should include(example_group)
+        end
+
+        it "should enable unregistering of ExampleGroups" do
+          example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
+            unregister
+          end
+          rspec_options.example_groups.should_not include(example_group)
+        end
+
+        after(:each) do
+          Spec::Example::ExampleGroupFactory.reset
         end
-        rspec_options.example_groups.should_not include(example_group)
-      end
-      
-      after(:each) do
-        Spec::Example::ExampleGroupFactory.reset
       end
     end
   end