rspec 1.1.8 → 1.1.9

data/spec/spec/runner/formatter/spec_mate_formatter_spec.rb

@@ -6,7 +6,6 @@ module Spec
   module Runner
     module Formatter
       describe TextMateFormatter do
-        include SandboxedOptions
         attr_reader :root, :suffix, :expected_file
         before do
           @root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
@@ -33,9 +32,9 @@ module Spec
             ]
             err = StringIO.new
             out = StringIO.new
-            options = ::Spec::Runner::OptionParser.parse(args, err, out)
-            run_with(options)
 
+            run_with ::Spec::Runner::OptionParser.parse(args, err, out)
+              
             yield(out.string)
           end          
         end

data/spec/spec/runner/formatter/specdoc_formatter_spec.rb

@@ -5,150 +5,151 @@ module Spec
   module Runner
     module Formatter
       describe SpecdocFormatter do
-        include SandboxedOptions
-        attr_reader :io, :options, :formatter, :example_group
-        before(:each) do
-          @io = StringIO.new
-          options.stub!(:dry_run).and_return(false)
-          options.stub!(:colour).and_return(false)
-          @formatter = SpecdocFormatter.new(options, io)
-          @example_group = ::Spec::Example::ExampleGroup.describe("ExampleGroup") do
-            specify "example" do
+        with_sandboxed_options do
+          attr_reader :io, :formatter, :example_group
+          before(:each) do
+            @io = StringIO.new
+            options.stub!(:dry_run).and_return(false)
+            options.stub!(:colour).and_return(false)
+            @formatter = SpecdocFormatter.new(options, io)
+            @example_group = ::Spec::Example::ExampleGroup.describe("ExampleGroup") do
+              specify "example" do
+              end
             end
           end
-        end
 
-        describe "where ExampleGroup has no superclasss with a description" do
-          before do
-            add_example_group
-          end
-
-          def add_example_group
-            formatter.add_example_group(example_group)
-          end
+          describe "where ExampleGroup has no superclasss with a description" do
+            before do
+              add_example_group
+            end
 
-          describe "#dump_summary" do
-            it "should produce standard summary without pending when pending has a 0 count" do
-              formatter.dump_summary(3, 2, 1, 0)
-              io.string.should have_example_group_output("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
+            def add_example_group
+              formatter.add_example_group(example_group)
             end
 
-            it "should produce standard summary" do
-              formatter.dump_summary(3, 2, 1, 4)
-              io.string.should have_example_group_output("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 pending\n")
+            describe "#dump_summary" do
+              it "should produce standard summary without pending when pending has a 0 count" do
+                formatter.dump_summary(3, 2, 1, 0)
+                io.string.should have_example_group_output("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
+              end
+
+              it "should produce standard summary" do
+                formatter.dump_summary(3, 2, 1, 4)
+                io.string.should have_example_group_output("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 pending\n")
+              end
             end
-          end
 
-          describe "#add_example_group" do
-            it "should push ExampleGroup name" do
-              io.string.should eql("\nExampleGroup\n")
+            describe "#add_example_group" do
+              it "should push ExampleGroup name" do
+                io.string.should eql("\nExampleGroup\n")
+              end
             end
-          end
 
-          describe "#example_failed" do
-            describe "where ExampleGroup has no superclasss with a description" do
-              describe "when having an error" do
-                it "should push failing spec name and failure number" do
-                  formatter.example_failed(
-                    example_group.it("spec"),
-                    98,
-                    Reporter::Failure.new("c s", RuntimeError.new)
-                  )
-                  io.string.should have_example_group_output("- spec (ERROR - 98)\n")
+            describe "#example_failed" do
+              describe "where ExampleGroup has no superclasss with a description" do
+                describe "when having an error" do
+                  it "should push failing spec name and failure number" do
+                    formatter.example_failed(
+                      example_group.it("spec"),
+                      98,
+                      Reporter::Failure.new("c s", RuntimeError.new)
+                    )
+                    io.string.should have_example_group_output("- spec (ERROR - 98)\n")
+                  end
                 end
-              end
 
-              describe "when having an expectation failure" do
-                it "should push failing spec name and failure number" do
-                  formatter.example_failed(
-                    example_group.it("spec"),
-                    98,
-                    Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)
-                  )
-                  io.string.should have_example_group_output("- spec (FAILED - 98)\n")
+                describe "when having an expectation failure" do
+                  it "should push failing spec name and failure number" do
+                    formatter.example_failed(
+                      example_group.it("spec"),
+                      98,
+                      Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)
+                    )
+                    io.string.should have_example_group_output("- spec (FAILED - 98)\n")
+                  end
                 end
               end
-            end
 
-            describe "where ExampleGroup has two superclasses with a description" do
-              attr_reader :child_example_group, :grand_child_example_group
+              describe "where ExampleGroup has two superclasses with a description" do
+                attr_reader :child_example_group, :grand_child_example_group
               
-              def add_example_group
-                @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
-                @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup")
-                formatter.add_example_group(grand_child_example_group)
-              end
-
-              describe "when having an error" do
-                it "should push failing spec name and failure number" do
-                  formatter.example_failed(
-                  example_group.it("spec"),
-                  98,
-                  Reporter::Failure.new("c s", RuntimeError.new)
-                  )
-                  io.string.should have_nested_example_group_output("- spec (ERROR - 98)\n")
+                def add_example_group
+                  @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
+                  @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup")
+                  formatter.add_example_group(grand_child_example_group)
                 end
-              end
 
-              describe "when having an expectation" do
-                it "should push failing spec name and failure number" do
-                  formatter.example_failed(
+                describe "when having an error" do
+                  it "should push failing spec name and failure number" do
+                    formatter.example_failed(
                     example_group.it("spec"),
                     98,
-                    Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)
-                  )
-                  io.string.should have_nested_example_group_output("- spec (FAILED - 98)\n")
+                    Reporter::Failure.new("c s", RuntimeError.new)
+                    )
+                    io.string.should have_nested_example_group_output("- spec (ERROR - 98)\n")
+                  end
                 end
-              end
 
-              def have_nested_example_group_output(expected_output)
-                expected_full_output = "\nExampleGroup Child ExampleGroup GrandChild ExampleGroup\n#{expected_output}"
-                ::Spec::Matchers::SimpleMatcher.new(expected_full_output) do |actual|
-                  actual == expected_full_output
+                describe "when having an expectation" do
+                  it "should push failing spec name and failure number" do
+                    formatter.example_failed(
+                      example_group.it("spec"),
+                      98,
+                      Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)
+                    )
+                    io.string.should have_nested_example_group_output("- spec (FAILED - 98)\n")
+                  end
+                end
+
+                def have_nested_example_group_output(expected_output)
+                  expected_full_output = "\nExampleGroup Child ExampleGroup GrandChild ExampleGroup\n#{expected_output}"
+                  ::Spec::Matchers::SimpleMatcher.new(expected_full_output) do |actual|
+                    actual == expected_full_output
+                  end
                 end
               end
             end
-          end
 
-          describe "#start" do
-            it "should push nothing on start" do
-              formatter.start(5)
-              io.string.should have_example_group_output("")
+            describe "#start" do
+              it "should push nothing on start" do
+                formatter.start(5)
+                io.string.should have_example_group_output("")
+              end
             end
-          end
           
-          describe "#start_dump" do
-            it "should push nothing on start dump" do
-              formatter.start_dump
-              io.string.should have_example_group_output("")
+            describe "#start_dump" do
+              it "should push nothing on start dump" do
+                formatter.start_dump
+                io.string.should have_example_group_output("")
+              end
             end
-          end
 
-          describe "#example_passed" do
-            it "should push passing spec name" do
-              formatter.example_passed(example_group.it("spec"))
-              io.string.should have_example_group_output("- spec\n")
+            describe "#example_passed" do
+              it "should push passing spec name" do
+                formatter.example_passed(example_group.it("spec"))
+                io.string.should have_example_group_output("- spec\n")
+              end
             end
-          end
 
-          describe "#example_pending" do
-            it "should push pending example name and message" do
-              formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
-              io.string.should have_example_group_output("- example (PENDING: reason)\n")
-            end
+            describe "#example_pending" do
+              it "should push pending example name and message" do
+                formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
+                io.string.should have_example_group_output("- example (PENDING: reason)\n")
+              end
 
-            it "should dump pending" do
-              formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
-              io.rewind
-              formatter.dump_pending
-              io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/
+              it "should dump pending" do
+                formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
+                io.rewind
+                formatter.dump_pending
+                io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/
+              end
             end
-          end
 
-          def have_example_group_output(expected_output)
-            expected = "\nExampleGroup\n#{expected_output}"
-            ::Spec::Matchers::SimpleMatcher.new(expected) do |actual|
-              actual == expected
+            def have_example_group_output(expected_output)
+              expected = "\nExampleGroup\n#{expected_output}"
+              ::Spec::Matchers::SimpleMatcher.new(expected) do |actual|
+                actual == expected
+              end
             end
           end
         end

data/spec/spec/runner/option_parser_spec.rb

@@ -28,6 +28,12 @@ describe "OptionParser" do
     @parser.options
   end
   
+  it "should leave the submitted argv alone" do
+    args = ["--pattern", "foo"]
+    @parser.order!(args)
+    args.should == ["--pattern", "foo"]
+  end
+  
   it "should accept files to include" do
     options = parse(["--pattern", "foo"])
     options.filename_pattern.should == "foo"
@@ -66,12 +72,18 @@ describe "OptionParser" do
     options.colour.should == false
   end
   
-  it "should print help to stdout if no args" do
-    pending 'A regression since 1.0.8' do
-      options = parse([])
-      @out.rewind
-      @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
-    end
+  it "should print help to stdout if no args and spec_comand?" do
+    Spec.stub!(:spec_command?).and_return(true)
+    options = parse([])
+    @out.rewind
+    @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
+  end
+    
+  it "should not print help to stdout if no args and NOT spec_command?" do
+    Spec.stub!(:spec_command?).and_return(false)
+    options = parse([])
+    @out.rewind
+    @out.read.should == ""
   end
   
   it "should print help to stdout" do

data/spec/spec_helper.rb

@@ -35,12 +35,16 @@ module Spec
       end
       exception
     end
+    
+    def run_with(options)
+      ::Spec::Runner::CommandLine.run(options)
+    end
   end
 end
 
-share_as :SandboxedOptions do
+def with_sandboxed_options
   attr_reader :options
-
+  
   before(:each) do
     @original_rspec_options = ::Spec::Runner.options
     ::Spec::Runner.use(@options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new))
@@ -49,8 +53,25 @@ share_as :SandboxedOptions do
   after(:each) do
     ::Spec::Runner.use(@original_rspec_options)
   end
+  
+  yield
+end
 
-  def run_with(options)
-    ::Spec::Runner::CommandLine.run(options)
+def with_sandboxed_config
+  attr_reader :config
+  
+  before(:each) do
+    @config = ::Spec::Example::Configuration.new
+    @original_configuration = ::Spec::Runner.configuration
+    spec_configuration = @config
+    ::Spec::Runner.instance_eval {@configuration = spec_configuration}
   end
-end unless Object.const_defined?(:SandboxedOptions)
+  
+  after(:each) do
+    original_configuration = @original_configuration
+    ::Spec::Runner.instance_eval {@configuration = original_configuration}
+    ::Spec::Example::ExampleGroupFactory.reset
+  end
+  
+  yield
+end

data/stories/mock_framework_integration/use_flexmock.story

@@ -1,4 +1,4 @@
-Story: Getting correct output
+Story: Getting correct output with flexmock
 
   As an RSpec user who prefers flexmock
   I want to be able to use flexmock without rspec mocks interfering

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,9 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-03 00:00:00 -05:00
+date: 2008-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: spicycode-rcov
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: syntax
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -20,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: Behaviour Driven Development for Ruby.
 email: 
@@ -32,6 +62,7 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- License.txt
 - Manifest.txt
 - README.txt
 - TODO.txt
@@ -44,6 +75,7 @@ extra_rdoc_files:
 - spec/spec/runner/failed.txt
 files: 
 - History.txt
+- License.txt
 - Manifest.txt
 - README.txt
 - Rakefile
@@ -130,6 +162,7 @@ files:
 - lib/spec/adapters/ruby_engine/mri.rb
 - lib/spec/adapters/ruby_engine/rubinius.rb
 - lib/spec/example.rb
+- lib/spec/example/before_and_after_hooks.rb
 - lib/spec/example/configuration.rb
 - lib/spec/example/errors.rb
 - lib/spec/example/example_group.rb
@@ -137,7 +170,6 @@ 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
@@ -258,8 +290,6 @@ files:
 - spec/spec.opts
 - spec/spec/adapters/ruby_engine_spec.rb
 - spec/spec/example/configuration_spec.rb
-- 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
@@ -279,6 +309,7 @@ files:
 - spec/spec/interop/test/unit/resources/spec_that_fails.rb
 - spec/spec/interop/test/unit/resources/spec_that_passes.rb
 - spec/spec/interop/test/unit/resources/spec_with_errors.rb
+- spec/spec/interop/test/unit/resources/spec_with_options_hash.rb
 - spec/spec/interop/test/unit/resources/test_case_that_fails.rb
 - spec/spec/interop/test/unit/resources/test_case_that_passes.rb
 - spec/spec/interop/test/unit/resources/test_case_with_errors.rb
@@ -472,6 +503,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: rspec 1.1.8
+summary: rspec 1.1.9
 test_files: []