rspec 0.5.12 → 0.5.13

data/test/spec/runner/context_matching_test.rb

@@ -16,14 +16,14 @@ module Spec
         assert !@context.matches?("context with spec", @matcher)
       end
 
-      def test_run_single_spec_should_trim_specs_when_spec_is_specified
+      def test_should_only_run_specified_specs_when_specified
         @context.specify("spec1") {}
         @context.specify("spec2") {}
         @context.run_single_spec "context spec1"
         assert_equal 1, @context.number_of_specs
       end
       
-      def test_run_single_spec_should_not_trim_specs_when_spec_is_not_specified
+      def test_run_all_specs_when_spec_is_not_specified
         @context.specify("spec1") {}
         @context.specify("spec2") {}
         @context.run_single_spec "context"

data/test/spec/runner/formatter/failure_dump_test.rb

@@ -0,0 +1,94 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Spec
+  module Runner
+    module Formatter
+      class ProgressBarFormatterFailureDumpTest < Test::Unit::TestCase
+
+        def setup
+          @io = StringIO.new
+          @reporter = Reporter.new(ProgressBarFormatter.new(@io), QuietBacktraceTweaker.new)
+          @reporter.add_context "context"
+        end
+      
+        def set_backtrace error
+          error.set_backtrace ["/a/b/c/d/e.rb:34:in `__instance_exec'"]
+        end
+  
+        def test_should_add_spacing_between_sections
+          error = Spec::Api::ExpectationNotMetError.new "message"
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "spec"
+          @reporter.dump
+          assert_match(/\nF\n\n1\)\nSpec::Api::ExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
+        end
+      
+        def test_should_end_with_line_break
+          error = Spec::Api::ExpectationNotMetError.new "message"
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "spec"
+          @reporter.dump
+          assert_match(/\n\z/, @io.string)
+        end
+    
+        def test_should_include_informational_header
+          error = Spec::Api::ExpectationNotMetError.new "message"
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "spec"
+          @reporter.dump
+          assert_match(/^Spec::Api::ExpectationNotMetError in 'context spec'/, @io.string)
+        end
+    
+        def test_should_include_context_and_spec_name_in_backtrace_if_error_in_spec
+          error = RuntimeError.new "message"
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "spec"
+          @reporter.dump
+          assert_match(/RuntimeError in 'context spec'/, @io.string)
+          assert_match(/:in `spec'/, @io.string)
+        end
+
+        def test_should_include_context_and_setup_in_backtrace_if_error_in_setup
+          error = RuntimeError.new
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "setup"
+          @reporter.dump
+          assert_match(/RuntimeError in 'context spec'/, @io.string)
+          assert_match(/in `setup'/, @io.string)
+        end
+
+        def test_should_include_context_and_teardown_in_backtrace_if_error_in_teardown
+          error = RuntimeError.new
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "teardown"
+          @reporter.dump
+          assert_match(/RuntimeError in 'context spec'/, @io.string)
+          assert_match(/in `teardown'/, @io.string)
+        end
+      
+      end
+    
+      class SpecdocFormatterFailureDumpTest < Test::Unit::TestCase
+
+        def setup
+          @io = StringIO.new
+          @reporter = Reporter.new(SpecdocFormatter.new(@io), QuietBacktraceTweaker.new)
+          @reporter.add_context "context"
+        end
+
+        def set_backtrace error
+          error.set_backtrace ["/a/b/c/d/e.rb:34:in `__instance_exec'"]
+        end
+
+        def test_spacing_between_sections
+          error = Spec::Api::ExpectationNotMetError.new "message"
+          set_backtrace error
+          @reporter.spec_finished "spec", error, "spec"
+          @reporter.dump
+          assert_match(/\ncontext\n- spec \(FAILED - 1\)\n\n1\)\nSpec::Api::ExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
+        end
+      
+      end
+    end 
+  end
+end

data/test/spec/runner/formatter/html_formatter_test.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+module Spec
+  module Runner
+    module Formatter
+      class HtmlFormatterTest < Test::Unit::TestCase
+
+        def setup
+          @io = StringIO.new
+          @formatter = HtmlFormatter.new(@io)
+        end
+
+        def test_should_push_header_on_start
+          @formatter.start(5)
+          assert_equal(HtmlFormatter::HEADER, @io.string)
+        end
+
+        def test_should_push_context_name
+          @formatter.add_context("fruit", true)
+          assert_equal("<div class=\"context\">\n  <div>fruit</div>\n  <ul>\n", @io.string)
+        end
+
+        def test_should_push_div_with_spec_passed_class
+          @formatter.spec_started("spec")
+          @formatter.spec_passed("spec")
+          assert_equal("<li class=\"spec passed\">spec</li>\n", @io.string)
+        end
+
+        def test_should_push_div_with_spec_failed_class
+          exception = StandardError.new("boo")
+          failure = Reporter::Failure.new("context_name", "spec_name", exception)
+          @formatter.spec_started("spec_name")
+          @formatter.spec_failed("spec_name", 98, failure)
+          assert_match(/<li class="spec failed"/, @io.string)
+        end
+
+        def test_should_close_html_on_dump_summary
+          @formatter.dump_summary(3,2,1)
+          assert_equal("</body></html>", @io.string)
+        end
+
+        def test_should_push_div_on_start_dump
+          @formatter.start_dump
+          assert_equal("</div>", @io.string.split.last)
+        end
+      end
+    end
+  end
+end

data/test/spec/runner/formatter/progress_bar_formatter_test.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+module Spec
+  module Runner
+    module Formatter
+      class ProgressBarFormatterTest < Test::Unit::TestCase
+
+        def setup
+          @io = StringIO.new
+          @formatter = ProgressBarFormatter.new(@io)
+        end
+      
+        def test_should_push_nothing_on_start
+          @formatter.start(4)
+          assert_equal("", @io.string)
+        end
+
+        def test_should_push_line_break_for_context
+          @formatter.add_context("context", :ignored)
+          assert_equal("\n", @io.string)
+        end
+
+        def test_should_push_dot_for_passing_spec
+          @formatter.spec_passed("spec")
+          assert_equal(".", @io.string)
+        end
+
+        def test_should_push_F_for_failing_spec
+          @formatter.spec_failed("spec", 98, nil)
+          assert_equal("F", @io.string)
+        end
+      
+        def test_should_produce_standard_summary
+          @formatter.dump_summary(3,2,1)
+          assert_equal("\nFinished in 3 seconds\n\n2 specifications, 1 failure\n", @io.string)
+        end
+
+        def test_should_produce_line_break_on_start_dump
+          @formatter.start_dump
+          assert_equal("\n", @io.string)
+        end
+      end
+
+      class ProgressBarFormatterDryRunTest < Test::Unit::TestCase
+        def setup
+          @io = StringIO.new
+          @formatter = ProgressBarFormatter.new(@io, true)
+        end
+      
+        def test_should_not_produce_summary_on_dry_run
+          @formatter.dump_summary(3,2,1)
+          assert_equal("", @io.string)
+        end
+      end
+    end
+  end
+end

data/test/spec/runner/formatter/rdoc_formatter_test.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+module Spec
+  module Runner
+    module Formatter
+      class RdocFormatterTest < Test::Unit::TestCase
+
+        def setup
+          @io = StringIO.new
+          @formatter = RdocFormatter.new(@io, true)
+        end
+
+        def test_should_push_out_context
+          @formatter.add_context("context", :ignored)
+          assert_equal("# context\n", @io.string)
+        end
+
+        def test_should_push_out_spec
+          @formatter.spec_passed("spec")
+          assert_equal("# * spec\n", @io.string)
+        end
+
+        def test_should_push_out_failed_spec
+          @formatter.spec_failed("spec", 98, nil)
+          assert_equal("# * spec [98 - FAILED]\n", @io.string)
+        end
+      
+        def test_should_produce_no_summary
+          @formatter.dump_summary(nil,nil,nil)
+          assert(@io.string.empty?)
+        end
+
+        def test_should_produce_nothing_on_start_dump
+          @formatter.start_dump
+          assert(@io.string.empty?)
+        end
+
+      end
+      class RdocFormatterDryRunTest < Test::Unit::TestCase
+        def setup
+          @io = StringIO.new
+          @formatter = RdocFormatter.new(@io, true)
+        end
+      
+        def test_should_not_produce_summary_on_dry_run
+          @formatter.dump_summary(3,2,1)
+          assert_equal("", @io.string)
+        end
+      end
+    end
+  end
+end

data/test/spec/runner/formatter/specdoc_formatter_test.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+module Spec
+  module Runner
+    module Formatter
+      class SpecdocFormatterTest < Test::Unit::TestCase
+
+        def setup
+          @io = StringIO.new
+          @formatter = SpecdocFormatter.new(@io)
+        end
+
+        def test_should_push_context_name
+          @formatter.add_context("context", :ignored)
+          assert_equal("\ncontext\n", @io.string)
+        end
+
+        def test_should_push_passing_spec_name
+          @formatter.spec_passed("spec")
+          assert_equal("- spec\n", @io.string)
+        end
+
+        def test_should_push_failing_spec_name_and_failure_number
+          @formatter.spec_failed("spec", 98, nil)
+          assert_equal("- spec (FAILED - 98)\n", @io.string)
+        end
+
+        def test_should_produce_standard_summary
+          @formatter.dump_summary(3,2,1)
+          assert_equal("\nFinished in 3 seconds\n\n2 specifications, 1 failure\n", @io.string)
+        end
+
+        def test_should_push_nothing_on_start
+          @formatter.start(5)
+          assert_equal("", @io.string)
+        end
+
+        def test_should_push_nothing_on_start_dump
+          @formatter.start_dump
+          assert_equal("", @io.string)
+        end
+
+      end
+
+      class SpecdocFormatterDryRunTest < Test::Unit::TestCase
+        def setup
+          @io = StringIO.new
+          @formatter = SpecdocFormatter.new(@io, true)
+        end
+      
+        def test_should_not_produce_summary_on_dry_run
+          @formatter.dump_summary(3,2,1)
+          assert_equal("", @io.string)
+        end
+      end
+    end
+  end
+end

data/test/spec/runner/kernel_ext_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../test_helper'
 module Spec
   module Runner
     class KernelExtTest < Test::Unit::TestCase
-      def test_create_context
+      def test_should_add_context_method_to_kernel
         assert_nothing_raised do
           context("") {}
         end

data/test/spec/runner/option_parser_test.rb

@@ -21,39 +21,49 @@ module Spec
         assert_match(/Usage: spec \[options\] \(FILE\|DIRECTORY\|GLOB\)\+/n, @out.read)
       end
       
-      def test_verbose_should_be_false_by_default
+      def test_should_not_be_verbose_by_default
         options = OptionParser.parse([], false, @err, @out)
         assert(!options.verbose)
       end
 
-      def test_dry_run_should_be_settable
+      def test_should_accept_dry_run_option
         options = OptionParser.parse(["--dry-run"], false, @err, @out)
         assert(options.dry_run)
       end
 
       def test_should_use_progress_bar_formatter_by_default
         options = OptionParser.parse([], false, @err, @out)
-        assert_equal(ProgressBarFormatter, options.formatter_type)
+        assert_equal(Formatter::ProgressBarFormatter, options.formatter_type)
       end
       
       def test_should_use_specdoc_formatter_when_format_is_specdoc
         options = OptionParser.parse(["--format","specdoc"], false, @err, @out)
-        assert_equal(SpecdocFormatter, options.formatter_type)
+        assert_equal(Formatter::SpecdocFormatter, options.formatter_type)
       end
 
       def test_should_use_specdoc_formatter_when_format_is_s
         options = OptionParser.parse(["--format","s"], false, @err, @out)
-        assert_equal(SpecdocFormatter, options.formatter_type)
+        assert_equal(Formatter::SpecdocFormatter, options.formatter_type)
       end
 
       def test_should_use_rdoc_formatter_when_format_is_rdoc
         options = OptionParser.parse(["--format","rdoc"], false, @err, @out)
-        assert_equal(RdocFormatter, options.formatter_type)
+        assert_equal(Formatter::RdocFormatter, options.formatter_type)
       end
       
       def test_should_use_rdoc_formatter_when_format_is_r
         options = OptionParser.parse(["--format","r"], false, @err, @out)
-        assert_equal(RdocFormatter, options.formatter_type)
+        assert_equal(Formatter::RdocFormatter, options.formatter_type)
+      end
+      
+      def test_should_use_html_formatter_when_format_is_html
+        options = OptionParser.parse(["--format","html"], false, @err, @out)
+        assert_equal(Formatter::HtmlFormatter, options.formatter_type)
+      end
+      
+      def test_should_use_html_formatter_when_format_is_h
+        options = OptionParser.parse(["--format","h"], false, @err, @out)
+        assert_equal(Formatter::HtmlFormatter, options.formatter_type)
       end
       
       def test_should_select_dry_run_for_rdoc_formatter
@@ -82,27 +92,27 @@ module Spec
         assert_match(/Usage: spec/, @err.string)
       end
       
-      def test_backtrace_tweaker_should_be_quiet_by_default
+      def test_should_use_quiet_backtrace_tweaker_by_default
         options = OptionParser.parse([], false, @err, @out)
         assert options.backtrace_tweaker.instance_of?(QuietBacktraceTweaker)
       end
       
-      def test_backtrace_tweaker_should_be_noisy_with_b
+      def test_should_use_noisy_backtrace_tweaker_with_b_option
         options = OptionParser.parse(["-b"], false, @err, @out)
         assert options.backtrace_tweaker.instance_of?(NoisyBacktraceTweaker)
       end
       
-      def test_backtrace_tweaker_should_be_noisy_with_backtrace
+      def test_should_use_noisy_backtrace_tweaker_with_backtrace_option
         options = OptionParser.parse(["--backtrace"], false, @err, @out)
         assert options.backtrace_tweaker.instance_of?(NoisyBacktraceTweaker)
       end
       
-      def test_should_support_single_spec_with_spec
+      def test_should_support_single_spec_with_spec_option
         options = OptionParser.parse(["--spec","something or other"], false, @err, @out)
         assert_equal "something or other", options.spec_name
       end
       
-      def test_should_support_single_spec_with_s
+      def test_should_support_single_spec_with_s_option
         options = OptionParser.parse(["-s","something or other"], false, @err, @out)
         assert_equal "something or other", options.spec_name
       end

data/test/spec/runner/reporter_test.rb

@@ -62,7 +62,7 @@ module Spec
         @reporter.dump
       end
       
-      def test_should_handle_multiple_contexts_same_name
+      def test_should_handle_multiple_contexts_with_same_name
         @formatter.should_receive(:add_context).exactly(3).times
         @formatter.should.receive(:spec_started).exactly(3).times
         @formatter.should.receive(:spec_passed).exactly(3).times

data/test/test_classes.rb

@@ -39,27 +39,27 @@ module Spec
         end
       end
 
-      class XxxMock
+      class HandCodedMock
         def initialize(return_val)
           @return_val = return_val
-          @xxx_called = false
+          @funny_called = false
         end
 
-        def xxx?
-          @xxx_called = true
+        def funny?
+          @funny_called = true
           @return_val
         end
 
-        def yyy?(a, b, c)
+        def hungry?(a, b, c)
           a.should.be 1
           b.should.be 2
           c.should.be 3
-          @xxx_called = true
+          @funny_called = true
           @return_val
         end
 
         def __verify
-          @xxx_called.should.be true
+          @funny_called.should.be true
         end
       end
     end