rspec 1.0.8 → 1.1.0

data/spec/spec/runner/class_and_argument_parser_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe ClassAndArgumentsParser, ".parse" do
+      
+      it "should use a single : to separate class names from arguments" do
+        ClassAndArgumentsParser.parse('Foo').should == ['Foo', nil]
+        ClassAndArgumentsParser.parse('Foo:arg').should == ['Foo', 'arg']
+        ClassAndArgumentsParser.parse('Foo::Bar::Zap:arg').should == ['Foo::Bar::Zap', 'arg']
+        ClassAndArgumentsParser.parse('Foo:arg1,arg2').should == ['Foo', 'arg1,arg2']
+        ClassAndArgumentsParser.parse('Foo::Bar::Zap:arg1,arg2').should == ['Foo::Bar::Zap', 'arg1,arg2']
+        ClassAndArgumentsParser.parse('Foo::Bar::Zap:drb://foo,drb://bar').should == ['Foo::Bar::Zap', 'drb://foo,drb://bar']
+      end
+
+      it "should raise an error when passed an empty string" do
+        lambda do
+          ClassAndArgumentsParser.parse('')
+        end.should raise_error("Couldn't parse \"\"")
+      end      
+    end
+  end
+end

data/spec/spec/runner/command_line_spec.rb

@@ -1,33 +1,146 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-describe "CommandLine" do
-  it "should run directory" do
-    file = File.dirname(__FILE__) + '/../../../examples'
-    err = StringIO.new
-    out = StringIO.new
-    Spec::Runner::CommandLine.run([file], err, out, false, true)
-    
-    out.rewind
-    out.read.should =~ /78 examples, 0 failures, 3 pending/n
-  end
+module Spec
+  module Runner
+    describe CommandLine, ".run" do
+      it_should_behave_like "sandboxed rspec_options"
+      attr_reader :options, :err, :out
+      before do
+        @err = options.error_stream
+        @out = options.output_stream
+      end
 
-  it "should run file" do
-    file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb'
-    err = StringIO.new
-    out = StringIO.new
-    Spec::Runner::CommandLine.run([file], err, out, false, true)
-    
-    out.rewind
-    out.read.should =~ /2 examples, 1 failure/n
-  end
+      it "should run directory" do
+        file = File.dirname(__FILE__) + '/../../../examples/pure'
+        Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+
+        @out.rewind
+        @out.read.should =~ /\d+ examples, 0 failures, 3 pending/n
+      end
+
+      it "should run file" do
+        file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb'
+        Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+
+        @out.rewind
+        @out.read.should =~ /2 examples, 1 failure/n
+      end
+
+      it "should raise when file does not exist" do
+        file = File.dirname(__FILE__) + '/doesntexist'
+
+        lambda {
+          Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+        }.should raise_error
+      end
+
+      it "should return true when in --generate-options mode" do
+        Spec::Runner::CommandLine.run(
+          OptionParser.parse(['--generate-options', '/dev/null'], @err, @out)
+        ).should be_true
+      end
+
+      it "should dump even if Interrupt exception is occurred" do
+        example_group = Class.new(::Spec::Example::ExampleGroup) do
+          describe("example_group")
+          it "no error" do
+          end
+
+          it "should interrupt" do
+            raise Interrupt, "I'm interrupting"
+          end
+        end
+
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.reporter.should_receive(:dump)
+        options.add_example_group(example_group)
+
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+      end
+
+      it "should heckle when options have heckle_runner" do
+        example_group = Class.new(::Spec::Example::ExampleGroup).describe("example_group") do
+          it "no error" do
+          end
+        end
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.add_example_group example_group
+
+        heckle_runner = mock("heckle_runner")
+        heckle_runner.should_receive(:heckle_with)
+        $rspec_mocks.__send__(:mocks).delete(heckle_runner)
+
+        options.heckle_runner = heckle_runner
+        options.add_example_group(example_group)
+
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+        heckle_runner.rspec_verify
+      end
+
+      it "should run examples backwards if options.reverse is true" do
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.reverse = true
+
+        b1 = Class.new(Spec::Example::ExampleGroup)
+        b2 = Class.new(Spec::Example::ExampleGroup)
+
+        b2.should_receive(:run).ordered
+        b1.should_receive(:run).ordered
+
+        options.add_example_group(b1)
+        options.add_example_group(b2)
+
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+      end
+
+      it "should pass its ExampleGroup to the reporter" do
+        example_group = Class.new(::Spec::Example::ExampleGroup).describe("example_group") do
+          it "should" do
+          end
+        end
+        options = ::Spec::Runner::Options.new(@err, @out)
+        options.add_example_group(example_group)
+
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.reporter.should_receive(:add_example_group).with(example_group)
+        
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+      end
+
+      it "runs only selected Examples when options.examples is set" do
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+
+        options.examples << "example_group should"
+        should_has_run = false
+        should_not_has_run = false
+        example_group = Class.new(::Spec::Example::ExampleGroup).describe("example_group") do
+          it "should" do
+            should_has_run = true
+          end
+          it "should not" do
+            should_not_has_run = true
+          end
+        end
+
+        options.reporter.should_receive(:add_example_group).with(example_group)
+
+        options.add_example_group example_group
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
 
-  it "should raise when file does not exist" do
-    file = File.dirname(__FILE__) + '/doesntexist'
-    err = StringIO.new
-    out = StringIO.new
+        should_has_run.should be_true
+        should_not_has_run.should be_false
+      end
 
-    lambda {
-      Spec::Runner::CommandLine.run([file], err, out, false, true)
-    }.should raise_error
+      it "sets Spec.run to true" do
+        ::Spec.run = false
+        ::Spec.should_not be_run
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+        ::Spec.should be_run
+      end
+    end
   end
-end
+end

data/spec/spec/runner/drb_command_line_spec.rb

@@ -3,82 +3,90 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Runner
     describe DrbCommandLine, "without running local server" do
-  
       unless Config::CONFIG['ruby_install_name'] == 'jruby'
         it "should print error when there is no running local server" do
           err = StringIO.new
           out = StringIO.new
-          DrbCommandLine.run(['--version'], err, out, false)
-    
+          DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
+
           err.rewind
           err.read.should =~ /No server is running/
         end
       end    
     end
 
-    describe DrbCommandLine, "with local server" do
+    class DrbCommandLineSpec < ::Spec::Example::ExampleGroup
+      describe DrbCommandLine, "with local server"
 
-      unless Config::CONFIG['ruby_install_name'] == 'jruby'  
+      class CommandLineForSpec
+        def self.run(argv, stderr, stdout)
+          exit Spec::Runner::CommandLine.run(OptionParser.parse(argv, stderr, stdout))
+        end
+      end
+      
+      unless Config::CONFIG['ruby_install_name'] == 'jruby'
         before(:all) do
-          DRb.start_service("druby://localhost:8989", Spec::Runner::CommandLine)
-          $drb_example_file_counter = 0
+          DRb.start_service("druby://localhost:8989", CommandLineForSpec)
+          @@drb_example_file_counter = 0
         end
-    
+
         before(:each) do
           create_dummy_spec_file
-          $drb_example_file_counter = $drb_example_file_counter + 1
+          @@drb_example_file_counter = @@drb_example_file_counter + 1
         end
-    
+
         after(:each) do
           File.delete(@dummy_spec_filename)
         end
-    
+
         after(:all) do
-          DRb.stop_service      
+          DRb.stop_service
         end
 
-        it "should run against local server" do
+        xit "should run against local server" do
           out = run_spec_via_druby(['--version'])
           out.should =~ /RSpec/n
         end
-    
-        it "should output green colorized text when running with --colour option" do
+
+        xit "should output green colorized text when running with --colour option" do
           out = run_spec_via_druby(["--colour", @dummy_spec_filename])
           out.should =~ /\e\[32m/n
         end
-    
-        it "should output red colorized text when running with -c option" do      
+
+        xit "should output red colorized text when running with -c option" do
           out = run_spec_via_druby(["-c", @dummy_spec_filename])
           out.should =~ /\e\[31m/n
         end
 
         def create_dummy_spec_file
-          @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{$drb_example_file_counter}.rb"
+          @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@@drb_example_file_counter}.rb"
           File.open(@dummy_spec_filename, 'w') do |f|
             f.write %{
-    describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
-      it "should be output with green bar" do
-        true.should be_true
-      end
+              describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
+                it "should be output with green bar" do
+                  true.should be_true
+                end
 
-      it "should be output with red bar" do
-        violated("I want to see a red bar!")
-      end
-    end
-    }
+                it "should be output with red bar" do
+                  violated("I want to see a red bar!")
+                end
+              end
+            }
           end
         end
-    
-        def run_spec_via_druby(args)
+
+        def run_spec_via_druby(argv)
           err, out = StringIO.new, StringIO.new
           out.instance_eval do
             def tty?; true end
           end
-          Spec::Runner::DrbCommandLine.run(args, err, out, false, true)
+          options = ::Spec::Runner::Options.new(err, out)
+          options.argv = argv
+          Spec::Runner::DrbCommandLine.run(options)
           out.rewind; out.read
         end
       end
-  
+
     end
   end
 end

data/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec/runner/formatter/failing_example_groups_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      describe FailingExampleGroupsFormatter do
+        attr_reader :example_group, :formatter, :io
+
+        before(:each) do
+          @io = StringIO.new
+          options = mock('options')
+          @formatter = FailingExampleGroupsFormatter.new(options, io)
+          @example_group = Class.new(::Spec::Example::ExampleGroup)
+        end
+        
+        it "should add example name for each failure" do
+          formatter.add_example_group(Class.new(ExampleGroup).describe("b 1"))
+          formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          formatter.add_example_group(Class.new(ExampleGroup).describe("b 2"))
+          formatter.example_failed("e 2", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          formatter.example_failed("e 3", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          io.string.should == "b 1\nb 2\n"
+        end
+        
+        it "should delimit ExampleGroup superclass descriptions with :" do
+          parent_example_group = Class.new(example_group).describe("Parent")
+          child_example_group = Class.new(parent_example_group).describe("#child_method")
+          grand_child_example_group = Class.new(child_example_group).describe("GrandChild")
+
+          formatter.add_example_group(grand_child_example_group)
+          formatter.example_failed("failure", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          io.string.should == "Parent#child_method GrandChild\n"
+        end
+
+        it "should remove druby url, which is used by Spec::Distributed" do
+          @formatter.add_example_group(Class.new(ExampleGroup).describe("something something (druby://99.99.99.99:99)"))
+          @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          io.string.should == "something something\n"
+        end
+      end
+    end
+  end
+end

data/spec/spec/runner/formatter/failing_examples_formatter_spec.rb

@@ -1,24 +1,29 @@
-require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec/runner/formatter/failing_examples_formatter'
 
 module Spec
   module Runner
     module Formatter
-      describe "FailingExamplesFormatter" do
+      describe FailingExamplesFormatter do
         before(:each) do
           @io = StringIO.new
-          @formatter = FailingExamplesFormatter.new(@io)
+          options = mock('options')
+          @formatter = FailingExamplesFormatter.new(options, @io)
         end
 
         it "should add example name for each failure" do
-          @formatter.add_behaviour("b 1")
-          @formatter.example_failed(DSL::Example.new("e 1"), nil, Reporter::Failure.new(nil, RuntimeError.new))
-          @formatter.add_behaviour("b 2")
-          @formatter.example_failed(DSL::Example.new("e 2"), nil, Reporter::Failure.new(nil, RuntimeError.new))
-          @formatter.example_failed(DSL::Example.new("e 3"), nil, Reporter::Failure.new(nil, RuntimeError.new))
+          example_group_1 = Class.new(ExampleGroup).describe("A")
+          example_group_2 = Class.new(example_group_1).describe("B")
+
+          @formatter.add_example_group(example_group_1)
+          @formatter.example_failed(example_group_1.it("a1"){}, nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.add_example_group(example_group_2)
+          @formatter.example_failed(example_group_2.it("b2"){}, nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed(example_group_2.it("b3"){}, nil, Reporter::Failure.new(nil, RuntimeError.new))
           @io.string.should eql(<<-EOF
-b 1 e 1
-b 2 e 2
-b 2 e 3
+A a1
+A B b2
+A B b3
 EOF
 )
         end

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -1,56 +1,66 @@
-require File.dirname(__FILE__) + '/../../../spec_helper.rb'
-
-describe "HtmlFormatter" do
-  ['--diff', '--dry-run'].each do |opt|
-    it "should produce HTML identical to the one we designed manually with #{opt}" do
-      root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
-      suffix = PLATFORM == 'java' ? '-jruby' : ''
-      expected_file = File.dirname(__FILE__) + "/html_formatted-#{VERSION}#{suffix}.html"
-      raise "There is no HTML file with expected content for this platform: #{expected_file}" unless File.file?(expected_file)
-      expected_html = File.read(expected_file)
-      raise "There should be no absolute paths in html_formatted.html!!" if (expected_html =~ /\/Users/n || expected_html =~ /\/home/n)
-
-      Dir.chdir(root) do
-        args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/stubbing_example.rb',  'examples/pending_example.rb', '--format', 'html', opt]
-        err = StringIO.new
-        out = StringIO.new
-        Spec::Runner::CommandLine.run(
-          args,
-          err,
-          out,
-          false
-        )
-
-        seconds = /\d+\.\d+ seconds/
-        html = out.string.gsub seconds, 'x seconds'
-        expected_html.gsub! seconds, 'x seconds'
-
-        if opt == '--diff'
-          # Uncomment this line temporarily in order to overwrite the expected with actual.
-          # Use with care!!!
-          # File.open(expected_file, 'w') {|io| io.write(html)}
-
-          doc = Hpricot(html)
-          backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
-          doc.search("div.backtrace").remove
-
-          expected_doc = Hpricot(expected_html)
-          expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
-          expected_doc.search("div.backtrace").remove
-
-          doc.inner_html.should == expected_doc.inner_html
-
-          expected_backtraces.each_with_index do |expected_line, i|
-            expected_path, expected_line_number, expected_suffix = expected_line.split(':')
-            actual_path, actual_line_number, actual_suffix = backtraces[i].split(':')
-            File.expand_path(actual_path).should == File.expand_path(expected_path)
-            actual_line_number.should == expected_line_number
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'hpricot' # Needed to compare generated with wanted HTML
+require 'spec/runner/formatter/html_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      describe HtmlFormatter do
+        ['--diff', '--dry-run'].each do |opt|
+          def jruby?
+            PLATFORM == 'java'
+          end
+    
+          it "should produce HTML identical to the one we designed manually with #{opt}" do
+            root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
+            suffix = jruby? ? '-jruby' : ''
+            expected_file = File.dirname(__FILE__) + "/html_formatted-#{::VERSION}#{suffix}.html"
+            raise "There is no HTML file with expected content for this platform: #{expected_file}" unless File.file?(expected_file)
+            expected_html = File.read(expected_file)
+            unless jruby?
+              raise "There should be no absolute paths in html_formatted.html!!" if (expected_html =~ /\/Users/n || expected_html =~ /\/home/n)
+            end
+
+            Dir.chdir(root) do
+              args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/pure/stubbing_example.rb',  'examples/pure/pending_example.rb', '--format', 'html', opt]
+              err = StringIO.new
+              out = StringIO.new
+              CommandLine.run(
+                OptionParser.parse(args, err, out)
+              )
+
+              seconds = /\d+\.\d+ seconds/
+              html = out.string.gsub seconds, 'x seconds'
+              expected_html.gsub! seconds, 'x seconds'
+
+              if opt == '--diff'
+                # Uncomment this line temporarily in order to overwrite the expected with actual.
+                # Use with care!!!
+                # File.open(expected_file, 'w') {|io| io.write(html)}
+
+                doc = Hpricot(html)
+                backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
+                doc.search("div.backtrace").remove
+
+                expected_doc = Hpricot(expected_html)
+                expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
+                expected_doc.search("div.backtrace").remove
+
+                doc.inner_html.should == expected_doc.inner_html
+
+                expected_backtraces.each_with_index do |expected_line, i|
+                  expected_path, expected_line_number, expected_suffix = expected_line.split(':')
+                  actual_path, actual_line_number, actual_suffix = backtraces[i].split(':')
+                  File.expand_path(actual_path).should == File.expand_path(expected_path)
+                  actual_line_number.should == expected_line_number
+                end
+              else
+                html.should =~ /This was a dry-run/m
+              end
+            end
           end
-        else
-          html.should =~ /This was a dry-run/m
         end
       end
     end
   end
-  
 end