rspec 1.1.3 → 1.1.4

data/spec/spec/story/runner/story_mediator_spec.rb

@@ -47,7 +47,7 @@ module Spec
           @runner.scenarios.first.name.should == "scenario name"
           @runner.scenarios.first.story.should == @runner.stories.first
         end
-
+        
         it "should create a given scenario step if one matches" do
           pending("need to untangle the dark mysteries of the story runner - something needs to get stubbed here") do
             story = @mediator.create_story "title", "narrative"
@@ -120,7 +120,7 @@ module Spec
         it "should pass options to the stories it creates" do
           @mediator = StoryMediator.new @step_group, @runner, :foo => :bar
           @mediator.create_story "story title", "story narrative"
-
+        
           run_stories
           
           @runner.stories.first[:foo].should == :bar

data/spec/spec/story/runner/story_runner_spec.rb

@@ -68,6 +68,44 @@ module Spec
           worlds[0].should_not == worlds[1]
         end
         
+        it "should return false if the scenario runner returns false ever" do
+          #given
+          stub_scenario_runner = stub_everything
+          story_runner = StoryRunner.new(stub_scenario_runner)
+          story_runner.Story 'story', 'narrative' do
+            Scenario 'scenario1' do end
+            Scenario 'scenario2' do end
+          end
+          
+          # expect
+          stub_scenario_runner.should_receive(:run).once.and_return(false,true)
+          
+          # when
+          success = story_runner.run_stories
+          
+          #then
+          success.should == false
+        end
+        
+        it "should return true if the scenario runner returns true for all scenarios" do
+          #given
+          stub_scenario_runner = stub_everything
+          story_runner = StoryRunner.new(stub_scenario_runner)
+          story_runner.Story 'story', 'narrative' do
+            Scenario 'scenario1' do end
+            Scenario 'scenario2' do end
+          end
+          
+          # expect
+          stub_scenario_runner.should_receive(:run).once.and_return(true,true)
+          
+          # when
+          success = story_runner.run_stories
+          
+          #then
+          success.should == true
+        end
+        
         it 'should use the provided world creator to create worlds' do
           # given
           stub_scenario_runner = stub_everything
@@ -225,7 +263,7 @@ module Spec
           steps1 = StepGroup.new
           steps1.add :when, step1
           
-          story_runner.Story 'title', 'narrative', :steps => steps1 do
+          story_runner.Story 'title', 'narrative', :steps_for => steps1 do
             Scenario 'first scenario' do
               When 'step'
             end
@@ -237,7 +275,7 @@ module Spec
           steps2 = StepGroup.new
           steps2.add :when, step2
           
-          story_runner.Story 'title2', 'narrative', :steps => steps2 do
+          story_runner.Story 'title2', 'narrative', :steps_for => steps2 do
             Scenario 'second scenario' do
               When 'step'
             end

data/spec/spec/story/runner_spec.rb

@@ -1,29 +1,19 @@
 require File.dirname(__FILE__) + '/story_helper'
+require 'spec/runner/formatter/story/plain_text_formatter'
+require 'spec/runner/formatter/story/html_formatter'
 
 module Spec
   module Story
     describe Runner, "module" do
-      def dev_null
-        io = StringIO.new
-        def io.write(str)
-          str.to_s.size
-        end
-        return io
-      end
-      
-      before :each do
-        Kernel.stub!(:at_exit)
-        @stdout, $stdout = $stdout, dev_null
-        @argv = Array.new(ARGV)
-        @runner_module = Runner.dup
+      before(:each) do
         @world_creator = World.dup
-        @runner_module.module_eval { @run_options = @story_runner = @scenario_runner = @world_creator = nil }
+        @runner_module = Runner.dup
+        @runner_module.instance_eval {@story_runner = nil}
+        @runner_module.stub!(:register_exit_hook)
       end
       
-      after :each do
-        $stdout = @stdout
-        ARGV.replace @argv
-        @runner_module.module_eval { @run_options = @story_runner = @scenario_runner = @world_creator = nil }
+      def create_options(args=[])
+        Spec::Runner::OptionParser.parse(args, StringIO.new, StringIO.new)
       end
       
       it 'should wire up a singleton StoryRunner' do
@@ -32,75 +22,72 @@ module Spec
       
       it 'should set its options based on ARGV' do
         # given
-        ARGV << '--dry-run'
-        
+        @runner_module.should_receive(:run_options).and_return(
+          create_options(['--dry-run'])
+        )
+
         # when
         options = @runner_module.run_options
         
         # then
         options.dry_run.should be_true
       end
-
-      it 'should add a reporter to the runner classes' do
-        # given
-        story_runner = mock('story runner', :null_object => true)
-        scenario_runner = mock('scenario runner', :null_object => true)
-        world_creator = mock('world', :null_object => true)
-        
-        @runner_module::class_eval { @world_creator = world_creator }
-        @runner_module::StoryRunner.stub!(:new).and_return(story_runner)
-        @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner)
-        
-        # expect
-        world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
-        story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
-        scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
-        
-        # when
-        @runner_module.story_runner
-      end
       
-      it 'should add a documenter to the runner classes if one is specified' do
-        # given
-        ARGV << "--format" << "html"
-        story_runner = mock('story runner', :null_object => true)
-        scenario_runner = mock('scenario runner', :null_object => true)
-        world_creator = mock('world', :null_object => true)
+      describe "initialization" do
         
-        @runner_module::class_eval { @world_creator = world_creator }
-        @runner_module::StoryRunner.stub!(:new).and_return(story_runner)
-        @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner)
+        before(:each) do
+          # given
+          @story_runner = mock('story runner', :null_object => true)
+          @scenario_runner = mock('scenario runner', :null_object => true)
+          @world_creator = mock('world', :null_object => true)
         
-        # expect
-        world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
-        story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
-        scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
+          @runner_module.stub!(:world_creator).and_return(@world_creator)
+          @runner_module.stub!(:create_story_runner).and_return(@story_runner)
+          @runner_module.stub!(:scenario_runner).and_return(@scenario_runner)
+        end
+
+        it 'should add a reporter to the runner classes' do
+          @runner_module.should_receive(:run_options).and_return(
+            create_options
+          )
         
-        # when
-        @runner_module.story_runner
-      end
+          # expect
+          @world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
+          @story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
+          @scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
+        
+          # when
+          @runner_module.story_runner
+        end
       
-      it 'should add any registered listener to the runner classes' do
-        # given
-        ARGV << "--format" << "html"
-        story_runner = mock('story runner', :null_object => true)
-        scenario_runner = mock('scenario runner', :null_object => true)
-        world_creator = mock('world', :null_object => true)
+        it 'should add a documenter to the runner classes if one is specified' do
         
-        @runner_module::class_eval { @world_creator = world_creator }
-        @runner_module::StoryRunner.stub!(:new).and_return(story_runner)
-        @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner)
+          @runner_module.should_receive(:run_options).and_return(
+            create_options(["--format","html"])
+          )
+
+          # expect
+          @world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
+          @story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
+          @scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
         
-        listener = Object.new
+          # when
+          @runner_module.story_runner
+        end
+      
+        it 'should add any registered listener to the runner classes' do
+          # given
+          listener = Object.new
         
-        # expect
-        world_creator.should_receive(:add_listener).with(listener)
-        story_runner.should_receive(:add_listener).with(listener)
-        scenario_runner.should_receive(:add_listener).with(listener)
+          # expect
+          @world_creator.should_receive(:add_listener).with(listener)
+          @story_runner.should_receive(:add_listener).with(listener)
+          @scenario_runner.should_receive(:add_listener).with(listener)
         
-        # when
-        @runner_module.register_listener listener
+          # when
+          @runner_module.register_listener listener
+        end
+      end
       end
-    end
   end
 end

data/spec/spec/story/step_spec.rb

@@ -42,6 +42,16 @@ module Spec
         step = Step.new("1 2 $three") {}
         step.matches?("1 2 c").should be_true
       end
+
+      it "should match a text string with a dollar sign ($)" do
+        step = Step.new("show me the $$money") {}
+        step.matches?("show me the $kwan").should be_true
+      end
+
+      it "should match a string with an escaped dollar sign" do
+        step = Step.new("show me the \$money") {}
+        step.matches?("show me the $kwan").should be_true
+      end
       
       it "should not match a different string" do
         step = Step.new("this text") {}
@@ -101,7 +111,16 @@ module Spec
         step.matches?("he is very cool").should be_true
         step.parse_args("he is very cool").should == ['he', 'very', 'cool']
       end
-      
+
+      it "should match a regex with a dollar sign ($)" do
+        step = Step.new(/show me the \$\d+/) {}
+        step.matches?("show me the $123").should be_true
+      end
+
+      it "should match a regex with a dollar sign and named variable" do
+        step = Step.new(/show me the \$$money/) {}
+        step.matches?("show me the $123").should be_true
+      end
     end
     
     describe Step do

data/spec/spec/story/story_spec.rb

@@ -28,7 +28,7 @@ module Spec
         error.should be_nil
       end
       
-      it "should raise when error raised running in another object" do
+      it "should raise an error when an error is raised running in another object" do
         #given
         story = Story.new 'title', 'narrative' do
           raise "this is raised in the story"
@@ -42,7 +42,7 @@ module Spec
       end
       
       it "should use the steps it is told to using a StepGroup" do
-        story = Story.new("title", "narrative", :steps => steps = StepGroup.new) do end
+        story = Story.new("title", "narrative", :steps_for => steps = StepGroup.new) do end
         assignee = mock("assignee")
         assignee.should_receive(:use).with(steps)
         story.assign_steps_to(assignee)

data/stories/all.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), *%w[helper])
 
-["example_groups","interop"].each do |dir|
+%w[example_groups interop mock_framework_integration].each do |dir|
   require File.join(File.dirname(__FILE__), "#{dir}/stories")
 end

data/stories/example_groups/stories.rb

@@ -1,7 +1,8 @@
 require File.join(File.dirname(__FILE__), *%w[.. helper])
 
 with_steps_for :running_rspec do
-  Dir["#{File.dirname(__FILE__)}/*"].each do |file|
-    run file if File.file?(file) && !(file =~ /\.rb$/)
-  end
+  run File.dirname(__FILE__) + "/nested_groups"
+  # Dir["#{File.dirname(__FILE__)}/*"].each do |file|
+  #   run file if File.file?(file) && !(file =~ /\.rb$/)
+  # end
 end

data/stories/mock_framework_integration/stories.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), *%w[.. helper])
+
+with_steps_for :running_rspec do
+  Dir["#{File.dirname(__FILE__)}/*"].each do |file|
+    run file if File.file?(file) && !(file =~ /\.rb$/)
+  end
+end

data/stories/mock_framework_integration/use_flexmock.story

@@ -0,0 +1,9 @@
+Story: Getting correct output
+
+  As an RSpec user who prefers flexmock
+  I want to be able to use flexmock without rspec mocks interfering
+
+  Scenario: Mock with flexmock
+    Given the file spec/spec_with_flexmock.rb
+    When I run it with the ruby interpreter
+    Then the exit code should be 0

data/stories/resources/spec/spec_with_flexmock.rb

@@ -0,0 +1,18 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. .. lib])
+require "rubygems"
+require 'spec'
+
+Spec::Runner.configure do |config|
+  config.mock_with :flexmock
+end
+
+# This is to ensure that requiring spec/mocks/framework doesn't interfere w/ flexmock
+require 'spec/mocks/framework'
+
+describe "something" do
+  it "should receive some message" do
+    target = Object.new
+    flexmock(target).should_receive(:foo).once
+    lambda {flexmock_verify}.should raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-31 00:00:00 -06:00
+date: 2008-05-26 00:00:00 -05:00
 default_executable: spec
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
+- RSpec.tmbundle
 - TODO
 - UPGRADE
 - lib/autotest/discover.rb
@@ -41,6 +42,7 @@ files:
 - lib/spec/example/example_group_methods.rb
 - lib/spec/example/example_matcher.rb
 - lib/spec/example/example_methods.rb
+- lib/spec/example/module_inclusion_warnings.rb
 - lib/spec/example/module_reopening_fix.rb
 - lib/spec/example/pending.rb
 - lib/spec/example/shared_example_group.rb
@@ -54,6 +56,7 @@ files:
 - lib/spec/expectations.rb
 - lib/spec/extensions/class.rb
 - lib/spec/extensions/main.rb
+- lib/spec/extensions/metaclass.rb
 - lib/spec/extensions/object.rb
 - lib/spec/extensions.rb
 - lib/spec/interop/test/unit/autorunner.rb
@@ -84,6 +87,8 @@ files:
 - lib/spec/mocks/error_generator.rb
 - lib/spec/mocks/errors.rb
 - lib/spec/mocks/extensions/object.rb
+- lib/spec/mocks/extensions.rb
+- lib/spec/mocks/framework.rb
 - lib/spec/mocks/message_expectation.rb
 - lib/spec/mocks/methods.rb
 - lib/spec/mocks/mock.rb
@@ -104,6 +109,7 @@ files:
 - lib/spec/runner/formatter/failing_example_groups_formatter.rb
 - lib/spec/runner/formatter/failing_examples_formatter.rb
 - lib/spec/runner/formatter/html_formatter.rb
+- lib/spec/runner/formatter/nested_text_formatter.rb
 - lib/spec/runner/formatter/profile_formatter.rb
 - lib/spec/runner/formatter/progress_bar_formatter.rb
 - lib/spec/runner/formatter/snippet_extractor.rb
@@ -151,6 +157,9 @@ files:
 - spec/spec
 - spec/spec/example
 - spec/spec/example/configuration_spec.rb
+- spec/spec/example/example_group
+- spec/spec/example/example_group/described_module_spec.rb
+- spec/spec/example/example_group/warning_messages_spec.rb
 - spec/spec/example/example_group_class_definition_spec.rb
 - spec/spec/example/example_group_factory_spec.rb
 - spec/spec/example/example_group_methods_spec.rb
@@ -214,7 +223,7 @@ files:
 - spec/spec/mocks/at_least_spec.rb
 - spec/spec/mocks/at_most_spec.rb
 - spec/spec/mocks/bug_report_10260_spec.rb
-- spec/spec/mocks/bug_report_10263.rb
+- spec/spec/mocks/bug_report_10263_spec.rb
 - spec/spec/mocks/bug_report_11545_spec.rb
 - spec/spec/mocks/bug_report_15719_spec.rb
 - spec/spec/mocks/bug_report_7611_spec.rb
@@ -222,6 +231,7 @@ files:
 - spec/spec/mocks/bug_report_8165_spec.rb
 - spec/spec/mocks/bug_report_8302_spec.rb
 - spec/spec/mocks/failing_mock_argument_constraints_spec.rb
+- spec/spec/mocks/hash_including_matcher_spec.rb
 - spec/spec/mocks/mock_ordering_spec.rb
 - spec/spec/mocks/mock_space_spec.rb
 - spec/spec/mocks/mock_spec.rb
@@ -255,6 +265,7 @@ files:
 - 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_formatter_spec.rb
+- spec/spec/runner/formatter/nested_text_formatter_spec.rb
 - spec/spec/runner/formatter/profile_formatter_spec.rb
 - spec/spec/runner/formatter/progress_bar_formatter_spec.rb
 - spec/spec/runner/formatter/snippet_extractor_spec.rb
@@ -280,6 +291,7 @@ files:
 - spec/spec/runner/resources/a_foo.rb
 - spec/spec/runner/resources/a_spec.rb
 - spec/spec/runner/spec.opts
+- spec/spec/runner/spec_drb.opts
 - spec/spec/runner/spec_parser
 - spec/spec/runner/spec_parser/spec_parser_fixture.rb
 - spec/spec/runner/spec_parser_spec.rb
@@ -404,6 +416,9 @@ files:
 - stories/interop/examples_and_tests_together
 - stories/interop/stories.rb
 - stories/interop/test_case_with_should_methods
+- stories/mock_framework_integration
+- stories/mock_framework_integration/stories.rb
+- stories/mock_framework_integration/use_flexmock.story
 - stories/pending_stories
 - stories/pending_stories/README
 - stories/resources
@@ -415,6 +430,7 @@ files:
 - stories/resources/spec
 - stories/resources/spec/example_group_with_should_methods.rb
 - stories/resources/spec/simple_spec.rb
+- stories/resources/spec/spec_with_flexmock.rb
 - stories/resources/steps
 - stories/resources/steps/running_rspec.rb
 - stories/resources/stories
@@ -422,19 +438,6 @@ files:
 - stories/resources/test
 - stories/resources/test/spec_and_test_together.rb
 - stories/resources/test/test_case_with_should_methods.rb
-- pre_commit/lib
-- pre_commit/lib/pre_commit
-- pre_commit/lib/pre_commit/core.rb
-- pre_commit/lib/pre_commit/pre_commit.rb
-- pre_commit/lib/pre_commit/rspec.rb
-- pre_commit/lib/pre_commit/rspec_on_rails.rb
-- pre_commit/lib/pre_commit.rb
-- pre_commit/spec
-- pre_commit/spec/pre_commit
-- pre_commit/spec/pre_commit/pre_commit_spec.rb
-- pre_commit/spec/pre_commit/rspec_on_rails_spec.rb
-- pre_commit/spec/spec_helper.rb
-- pre_commit/spec/spec_suite.rb
 - rake_tasks/examples.rake
 - rake_tasks/examples_with_rcov.rake
 - rake_tasks/failing_examples_with_html.rake
@@ -466,9 +469,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: RSpec-1.1.3 (build 20080131122909) - BDD for Ruby http://rspec.rubyforge.org/
+summary: RSpec-1.1.4 (build 20080526202855) - BDD for Ruby http://rspec.rubyforge.org/
 test_files: []