rspec 1.1.3 → 1.1.4

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

@@ -17,9 +17,6 @@ module Spec
             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]

data/spec/spec/runner/formatter/nested_text_formatter_spec.rb

@@ -0,0 +1,333 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require 'spec/runner/formatter/nested_text_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      describe NestedTextFormatter do
+        it_should_behave_like "sandboxed rspec_options"
+        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 = NestedTextFormatter.new(options, io)
+          @example_group = ::Spec::Example::ExampleGroup.describe("ExampleGroup") do
+            specify "example" do
+            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 "#dump_summary" do
+            it "should produce standard summary without pending when pending has a 0 count" do
+              formatter.dump_summary(3, 2, 1, 0)
+              expected_output = <<-OUT
+              ExampleGroup
+
+              Finished in 3 seconds
+
+              2 examples, 1 failure
+              OUT
+
+              io.string.should == expected_output.gsub(/^              /, '')
+            end
+
+            it "should produce standard summary" do
+              formatter.dump_summary(3, 2, 1, 4)
+              expected_output = <<-OUT
+              ExampleGroup
+
+              Finished in 3 seconds
+
+              2 examples, 1 failure, 4 pending
+              OUT
+              io.string.should == expected_output.gsub(/^              /, '')
+            end
+          end
+
+          describe "#add_example_group" do
+            describe "when ExampleGroup has description_args" do
+              before do
+                example_group.description_args.should_not be_nil
+              end
+
+              describe "when ExampleGroup has no parents with description args" do
+                before do
+                  example_group.superclass.description_args.should be_nil
+                end
+
+                it "should push ExampleGroup name" do
+                  io.string.should eql("ExampleGroup\n")
+                end
+              end
+
+              describe "when ExampleGroup has one parent with description args" do
+                attr_reader :child_example_group
+                def add_example_group
+                  example_group.description_args.should_not be_nil
+                  @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
+                end
+
+                describe "and parent ExampleGroups have not been printed" do
+                  before do
+                    formatter.add_example_group(child_example_group)
+                  end
+
+                  it "should push ExampleGroup name with two spaces of indentation" do
+                    expected_output = <<-OUT
+                    ExampleGroup
+                      Child ExampleGroup
+                    OUT
+                    io.string.should == expected_output.gsub(/^                    /, '')
+                  end
+                end
+
+                describe "and parent ExampleGroups have been printed" do
+                  before do
+                    formatter.add_example_group(example_group)
+                    io.string = ""
+                    formatter.add_example_group(child_example_group)
+                  end
+
+                  it "should print only the indented ExampleGroup" do
+                    expected_output = <<-OUT
+                      Child ExampleGroup
+                    OUT
+                    io.string.should == expected_output.gsub(/^                    /, '')
+                  end
+                end
+              end
+
+              describe "when ExampleGroup has two parents with description args" do
+                attr_reader :child_example_group, :grand_child_example_group
+                def add_example_group
+                  example_group.description_args.should_not be_nil
+                  @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
+                  @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup")
+                end
+
+                describe "and parent ExampleGroups have not been printed" do
+                  before do
+                    formatter.add_example_group(grand_child_example_group)
+                  end
+
+                  it "should print the entire nested ExampleGroup heirarchy" do
+                    expected_output = <<-OUT
+                    ExampleGroup
+                      Child ExampleGroup
+                        GrandChild ExampleGroup
+                    OUT
+                    io.string.should == expected_output.gsub(/^                    /, '')
+                  end
+                end
+
+                describe "and parent ExampleGroups have been printed" do
+                  before do
+                    formatter.add_example_group(child_example_group)
+                    io.string = ""
+                    formatter.add_example_group(grand_child_example_group)
+                  end
+
+                  it "should print only the indented ExampleGroup" do
+                    expected_output = <<-OUT
+                        GrandChild ExampleGroup
+                    OUT
+                    io.string.should == expected_output.gsub(/^                    /, '')
+                  end
+                end
+              end
+            end
+
+            describe "when ExampleGroup description_args is nil" do
+              attr_reader :child_example_group
+
+              describe "and parent ExampleGroups have not been printed" do
+                def add_example_group
+                  @child_example_group = Class.new(example_group)
+                  child_example_group.description_args.should be_nil
+                  formatter.add_example_group(child_example_group)
+                end
+
+                it "should render only the parent ExampleGroup" do
+                  expected_output = <<-OUT
+                  ExampleGroup
+                  OUT
+                  io.string.should == expected_output.gsub(/^                  /, '')
+                end
+              end
+
+              describe "and parent ExampleGroups have been printed" do
+                def add_example_group
+                  @child_example_group = Class.new(example_group)
+                  child_example_group.description_args.should be_nil
+                  formatter.add_example_group(example_group)
+                  io.string = ""
+                  formatter.add_example_group(child_example_group)
+                end
+
+                it "should not render anything" do
+                  io.string.should == ""
+                end
+              end
+            end
+
+            describe "when ExampleGroup description_args is empty" do
+              def add_example_group
+                example_group.set_description
+                example_group.description_args.should be_empty
+                super
+              end
+
+              it "should not render anything" do
+                io.string.should == ""
+              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)
+                  )
+                  expected_output = <<-OUT
+                  ExampleGroup
+                    spec (ERROR - 98)
+                  OUT
+                  io.string.should == expected_output.gsub(/^                  /, '')
+                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)
+                  )
+                  expected_output = <<-OUT
+                  ExampleGroup
+                    spec (FAILED - 98)
+                  OUT
+                  io.string.should == expected_output.gsub(/^                  /, '')
+                end
+              end
+            end
+
+            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(
+                    grand_child_example_group.it("spec"),
+                    98,
+                    Reporter::Failure.new("c s", RuntimeError.new)
+                  )
+                  expected_output = <<-OUT
+                  ExampleGroup
+                    Child ExampleGroup
+                      GrandChild ExampleGroup
+                        spec (ERROR - 98)
+                  OUT
+                  io.string.should == expected_output.gsub(/^                  /, '')
+                end
+              end
+
+              describe "when having an expectation" do
+                it "should push failing spec name and failure number" do
+                  formatter.example_failed(
+                    grand_child_example_group.it("spec"),
+                    98,
+                    Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)
+                  )
+                  expected_output = <<-OUT
+                  ExampleGroup
+                    Child ExampleGroup
+                      GrandChild ExampleGroup
+                        spec (FAILED - 98)
+                  OUT
+                  io.string.should == expected_output.gsub(/^                  /, '')
+                end
+              end
+            end
+          end
+
+          describe "#start" do
+            it "should push nothing on start" do
+              formatter.start(5)
+              expected_output = <<-OUT
+              ExampleGroup
+              OUT
+              io.string.should == expected_output.gsub(/^              /, '')
+            end
+          end
+
+          describe "#start_dump" do
+            it "should push nothing on start dump" do
+              formatter.start_dump
+              expected_output = <<-OUT
+              ExampleGroup
+              OUT
+              io.string.should == expected_output.gsub(/^              /, '')
+            end
+          end
+
+          describe "#example_passed" do
+            it "should push passing spec name" do
+              formatter.example_passed(example_group.it("spec"))
+              expected_output = <<-OUT
+              ExampleGroup
+                spec
+              OUT
+              io.string.should == expected_output.gsub(/^              /, '')
+            end
+          end
+
+          describe "#example_pending" do
+            it "should push pending example name and message" do
+              formatter.example_pending(example_group.examples.first, 'reason')
+              expected_output = <<-OUT
+              ExampleGroup
+                example (PENDING: reason)
+              OUT
+              io.string.should == expected_output.gsub(/^              /, '')
+            end
+
+            it "should dump pending" do
+              formatter.example_pending(example_group.examples.first, 'reason')
+              io.rewind
+              formatter.dump_pending
+              io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/
+            end
+          end
+
+          def have_single_level_example_group_output(expected_output)
+            expected = "ExampleGroup\n  #{expected_output}"
+            ::Spec::Matchers::SimpleMatcher.new(expected) do |actual|
+              actual == expected
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec/runner/formatter/progress_bar_formatter_spec.rb

@@ -24,7 +24,12 @@ module Spec
         end
         
         it "should produce standard summary" do
-          @formatter.example_pending("example_group", ExampleGroup.new("example"), "message")
+          example_group = ExampleGroup.describe("example_group") do
+            specify "example" do
+            end
+          end
+          example = example_group.examples.first
+          @formatter.example_pending(example, "message")
           @io.rewind
           @formatter.dump_summary(3, 2, 1, 1)
           @io.string.should eql(%Q|
@@ -84,7 +89,12 @@ EOE
         end
         
         it "should dump pending" do
-          @formatter.example_pending("example_group", ExampleGroup.new("example"), "message")
+          example_group = ExampleGroup.describe("example_group") do
+            specify "example" do
+            end
+          end
+          example = example_group.examples.first
+          @formatter.example_pending(example, "message")
           @formatter.dump_pending
           @io.string.should =~ /Pending\:\nexample_group example \(message\)\n/
         end

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

@@ -50,10 +50,10 @@ module Spec
         #       Spec::Runner::CommandLine.run(
         #         ::Spec::Runner::OptionParser.parse(args, err, out)
         #       )
-        #
+        # 
         #       seconds = /\d+\.\d+ seconds/
         #       html = out.string.gsub seconds, 'x seconds'
-        #
+        # 
         #       File.open(expected_file, 'w') {|io| io.write(html)}
         #     end
         #   end

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

@@ -12,71 +12,137 @@ module Spec
           options.stub!(:dry_run).and_return(false)
           options.stub!(:colour).and_return(false)
           @formatter = SpecdocFormatter.new(options, io)
-          @example_group = Class.new(::Spec::Example::ExampleGroup).describe("ExampleGroup")
+          @example_group = ::Spec::Example::ExampleGroup.describe("ExampleGroup") do
+            specify "example" do
+            end
+          end
         end
 
         describe "where ExampleGroup has no superclasss with a description" do
           before do
-            formatter.add_example_group(example_group)
+            add_example_group
           end
 
-          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")
-          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")
+            end
 
-          it "should push ExampleGroup name" do
-            io.string.should eql("\nExampleGroup\n")
+            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
 
-          it "when having an error, 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 "#add_example_group" do
+            it "should push ExampleGroup name" do
+              io.string.should eql("\nExampleGroup\n")
+            end
           end
 
-          it "when having an expectation failure, 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
+          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
+
+              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
 
-          it "should push nothing on start" do
-            formatter.start(5)
-            io.string.should have_example_group_output("")
+            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")
+                end
+              end
+
+              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
 
-          it "should push nothing on start dump" do
-            formatter.start_dump
-            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
-
-          it "should push passing spec name" do
-            formatter.example_passed(example_group.it("spec"))
-            io.string.should have_example_group_output("- spec\n")
+          
+          describe "#start_dump" do
+            it "should push nothing on start dump" do
+              formatter.start_dump
+              io.string.should have_example_group_output("")
+            end
           end
 
-          it "should push pending example name and message" do
-            formatter.example_pending('example_group', ExampleGroup.new("example"), 'reason')
-            io.string.should have_example_group_output("- example (PENDING: reason)\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
 
-          it "should dump pending" do
-            formatter.example_pending('example_group', ExampleGroup.new("example"), 'reason')
-            io.rewind
-            formatter.dump_pending
-            io.string.should =~ /Pending\:\nexample_group example \(reason\)\n/
+          describe "#example_pending" do
+            it "should push pending example name and message" do
+              formatter.example_pending(example_group.examples.first, 'reason')
+              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')
+              io.rewind
+              formatter.dump_pending
+              io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/
+            end
           end
 
           def have_example_group_output(expected_output)
@@ -86,40 +152,6 @@ module Spec
             end
           end
         end
-
-        describe "where ExampleGroup has two superclasses with a description" do
-          attr_reader :child_example_group, :grand_child_example_group
-          before do
-            @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
-
-          specify "when having an error, 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")
-          end
-
-          specify "when having an expectation failure, 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
-
-          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
   end