rspec 0.5.3 → 0.5.4

data/test/spec/runner/context_runner_test.rb

@@ -4,37 +4,57 @@ module Spec
   module Runner
     class ContextRunnerTest < Test::Unit::TestCase
     
-      def test_should_call_run_doc_on_context
-        context1 = Api::Mock.new "context1"
-        context2 = Api::Mock.new "context2"
-        context1.should.receive(:run_docs)
-        context2.should.receive(:run_docs)
-        runner = ContextRunner.new ["-d"], false, StringIO.new
-        runner.add_context context1
-        runner.add_context context2        
-        runner.run
-        context1.__verify
-        context2.__verify
-      end
-
       def test_should_call_run_on_context
-        context1 = Api::Mock.new "context1"
-        context2 = Api::Mock.new "context2"
+        context1 = Api::Mock.new "context1", :null_object=>true
+        context2 = Api::Mock.new "context2", :null_object=>true
         context1.should.receive(:run)
+        context1.should.receive(:number_of_specs).and.return(0)
         context2.should.receive(:run)
-        runner = ContextRunner.new ["-o","stringio"], false, StringIO.new
+        context2.should.receive(:number_of_specs).and.return(0)
+        
+        reporter = Api::Mock.new 'reporter'
+        reporter.should_receive(:start).with(0)
+        reporter.should_receive(:end)
+        reporter.should_receive(:dump)
+
+        runner = ContextRunner.new(reporter, false, false)
         runner.add_context context1
         runner.add_context context2        
+
         runner.run
+
         context1.__verify
         context2.__verify
+        reporter.__verify
       end
+      
+      def test_should_support_single_spec
+        legal_context = Api::Mock.new "legal context"
+        legal_context.should_receive(:matches?).at_least(:once).and_return(true)
+        legal_context.should_receive(:run)
+        legal_context.should_receive(:isolate)
+        legal_context.should_receive(:number_of_specs).and_return(1)
+        
+        illegal_context = Api::Mock.new "illegal context"
+        illegal_context.should_receive(:matches?).and_return(false)
+        illegal_context.should_receive(:run).never
+        illegal_context.should_receive(:number_of_specs).never
+        
+        reporter = Api::Mock.new 'reporter'
 
-      def test_should_call_run_for_standalone
-        context1 = Api::Mock.new "context1"
-        context1.should.receive(:run)
-        runner = ContextRunner.standalone context1, ["-o","stringio"]
-        context1.__verify
+        runner = ContextRunner.new(reporter, false, false, "legal context legal spec")
+        runner.add_context legal_context
+        runner.add_context illegal_context
+        
+        reporter.should_receive(:start)
+        reporter.should_receive(:end)
+        reporter.should_receive(:dump)
+        
+        runner.run
+
+        legal_context.__verify
+        illegal_context.__verify
+        reporter.__verify
       end
       
     end

data/test/spec/runner/context_test.rb

@@ -5,63 +5,91 @@ module Spec
     class ContextTest < Test::Unit::TestCase
       
       def setup
-        @listener = Api::Mock.new "listener"
+        @formatter = Api::Mock.new "formatter"
         @context = Context.new("context") {}
       end
       
-      def test_should_add_itself_to_listener_on_run
-        @listener.should.receive(:add_context).with "context"
-        @context.run(@listener)
-        @listener.__verify
+      def test_should_add_itself_to_formatter_on_run
+        @formatter.should.receive(:add_context).with "context"
+        @context.run(@formatter)
+        @formatter.__verify
       end
       
-      def test_should_add_itself_to_listener_on_run_docs
-        @listener.should.receive(:add_context).with "context"
-        @context.run_docs(@listener)
-        @listener.__verify
-      end
-      
-      def test_spec
-        @listener.should.receive(:add_context).with :any_args
-        @listener.should.receive(:add_spec).with "test", :anything
+      def test_should_run_spec
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:add_spec).with "test", :anything, :anything
         $spec_ran = false
         @context.specify("test") {$spec_ran = true}
-        @context.run(@listener)
+        @context.run(@formatter)
         assert $spec_ran
-        @listener.__verify
+        @formatter.__verify
       end     
          
-      def test_spec_doc
-        @listener.should.receive(:add_context).with :any_args
-        @listener.should.receive(:add_spec).with "test"
-        @context.specify("test") {}
-        @context.run_docs(@listener)
-        assert $spec_ran
-        @listener.__verify
+      def test_should_run_spec_dry
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:add_spec).with "test"
+        $spec_ran = false
+        @context.specify("test") {$spec_ran = true}
+        @context.run(@formatter, true)
+        assert !$spec_ran
+        @formatter.__verify
       end
       
       def test_setup
-        @listener.should.receive(:add_context).with :any_args
-        @listener.should.receive(:add_spec).with :any_args
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:add_spec).with :any_args
         $setup_ran = false
         @context.setup {$setup_ran = true}
         @context.specify("test") {true}
-        @context.run(@listener)
+        @context.run(@formatter)
         assert $setup_ran
-        @listener.__verify
+        @formatter.__verify
       end
 
       def test_teardwown
-        @listener.should.receive(:add_context).with :any_args
-        @listener.should.receive(:add_spec).with :any_args
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:add_spec).with :any_args
         $teardwown_ran = false
         @context.teardown {$teardwown_ran = true}
         @context.specify("test") {true}
-        @context.run(@listener)
+        @context.run(@formatter)
         assert $teardwown_ran
-        @listener.__verify
+        @formatter.__verify
       end
-
+      
+      def test_spec_count_1
+        @context.specify("test") {}
+        assert_equal(1, @context.number_of_specs)
+      end
+      
+      def test_spec_count_4
+        @context.specify("one") {}
+        @context.specify("two") {}
+        @context.specify("three") {}
+        @context.specify("four") {}
+        assert_equal(4, @context.number_of_specs)
+      end
+      
+      def test_matches_should_pass_if_matches_context_and_spec
+        @context.specify("spec") {}
+        assert @context.matches? "context spec"
+      end
+      
+      def test_matches_should_fail_if_input_does_not_start_with_name
+        assert !@context.matches?("contextual spec")
+      end
+      
+      def test_matches_should_fail_if_input_does_not_include_valid_spec
+        assert !@context.matches?("context spec")
+      end
+      
+      def test_isolate_should_trim_specs
+        @context.specify("spec1") {}
+        @context.specify("spec2") {}
+        @context.isolate "context spec1"
+        assert_equal 1, @context.number_of_specs
+      end
+      
     end
   end
 end

data/test/spec/runner/execution_context_test.rb

@@ -3,11 +3,12 @@ require File.dirname(__FILE__) + '/../../test_helper'
 module Spec
   module Runner
     class ExecutionContextTest < Test::Unit::TestCase
+
       def test_should_add_new_mock_to_spec_when_mock_message_received
         spec = Api::Mock.new "spec"
         spec.should.receive(:add_mock) {|mock| mock.instance_of? Api::Mock}
         ec = ExecutionContext.new spec
-        mock = ec.mock("a mock")
+        mock = ec.mock("a mock", :null_object=>true)
       end
       
       def test_violated
@@ -19,8 +20,8 @@ module Spec
       def test_duck_type
         ec = ExecutionContext.new(Api::Mock.new("spec", :null_object => true))
         duck_type = ec.duck_type(:length)
-        assert(duck_type.is_a? Api::DuckType)
-        assert(duck_type.walks_like? [])
+        assert duck_type.is_a?(Api::DuckTypeArgConstraint)
+        assert duck_type.matches?([])
       end
     end
   end

data/test/spec/runner/failure_dump_test.rb

@@ -0,0 +1,92 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Runner
+    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_spacing_between_sections
+        error = Spec::Api::ExpectationNotMetError.new "message"
+        set_backtrace error
+        @reporter.add_spec "spec", error, "spec"
+        @reporter.dump
+        assert_match(/\nF\n\n1\)\nExpectationNotMetError 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.add_spec "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.add_spec "spec", error, "spec"
+        @reporter.dump
+        assert_match(/^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.add_spec "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.add_spec "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.add_spec "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.add_spec "spec", error, "spec"
+        @reporter.dump
+        assert_match(/\ncontext\n- spec \(FAILED - 1\)\n\n1\)\nExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
+      end
+      
+    end
+  end 
+end

data/test/spec/runner/kernel_ext_test.rb

@@ -5,9 +5,8 @@ module Spec
     class KernelExtTest < Test::Unit::TestCase
       def test_create_context
         assert_nothing_raised do
-          @cxt = context("") {}
+          context("") {}
         end
-        assert @cxt.instance_of? Spec::Runner::Context
       end
     end
   end

data/test/spec/runner/option_parser_test.rb

@@ -21,54 +21,74 @@ module Spec
         assert_match(/Usage: spec \[options\] \(FILE\|DIRECTORY\)\+/n, @out.read)
       end
       
-      def test_verbose_should_be_true_by_default
+      def test_verbose_should_be_false_by_default
         options = OptionParser.parse([], false, @err, @out)
         assert(!options.verbose)
       end
 
-      def test_out_should_be_stdout_by_default
-        options = OptionParser.parse([], false, @err)
-        assert_equal(STDOUT, options.out)
+      def test_dry_run_should_be_settable
+        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)
+      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)
+      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)
+      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)
       end
       
-      def test_verbose_should_be_settable_with_v
-        options = OptionParser.parse(["-v"], false, @err, @out)
-        assert(options.verbose)
+      def test_should_use_rdoc_formatter_when_format_is_r
+        options = OptionParser.parse(["--format","r"], false, @err, @out)
+        assert_equal(RdocFormatter, options.formatter_type)
       end
       
-      def test_verbose_should_be_settable_with_verbose
-        options = OptionParser.parse(["--verbose"], false, @err, @out)
-        assert(options.verbose)
+      def test_should_select_dry_run_for_rdoc_formatter
+        options = OptionParser.parse(["--format","rdoc"], false, @err, @out)
+        assert(options.dry_run)
       end
       
-      def test_doc_should_be_false_by_default
+      def test_should_print_usage_to_err_if_no_dir_specified
         options = OptionParser.parse([], false, @err, @out)
-        assert(!options.doc)
+        assert_match(/Usage: spec/, @err.string)
       end
       
-      def test_doc_should_be_settable_with_d
-        options = OptionParser.parse(["-d"], false, @err, @out)
-        assert(options.doc)
+      def test_backtrace_tweaker_should_be_quiet_by_default
+        options = OptionParser.parse([], false, @err, @out)
+        assert options.backtrace_tweaker.instance_of?(QuietBacktraceTweaker)
       end
       
-      def test_out_should_be_settable_with_o
-        options = OptionParser.parse(["-o","test.txt"], false, @err, @out)
-        assert_equal("test.txt", options.out)
+      def test_backtrace_tweaker_should_be_noisy_with_b
+        options = OptionParser.parse(["-b"], false, @err, @out)
+        assert options.backtrace_tweaker.instance_of?(NoisyBacktraceTweaker)
       end
       
-      def test_out_should_be_settable_with_of
-        options = OptionParser.parse(["--of","test.txt"], false, @err, @out)
-        assert_equal("test.txt", options.out)
+      def test_backtrace_tweaker_should_be_noisy_with_backtrace
+        options = OptionParser.parse(["--backtrace"], false, @err, @out)
+        assert options.backtrace_tweaker.instance_of?(NoisyBacktraceTweaker)
       end
-
-      def test_should_print_usage_to_err_if_no_dir_specified
-        options = OptionParser.parse([], false, @err, @out)
-        assert_match(/Usage: spec/, @err.string)
+      
+      def test_should_support_single_spec_with_spec
+        options = OptionParser.parse(["--spec","something or other"], false, @err, @out)
+        assert_equal "something or other", options.spec_name
       end
       
-      def test_out_should_be_stringio_if_set_to_stringio
-        options = OptionParser.parse(["-o","stringio"], false, @err, @out)
-        options.out.should.be.an.instance.of StringIO
+      def test_should_support_single_spec_with_s
+        options = OptionParser.parse(["-s","something or other"], false, @err, @out)
+        assert_equal "something or other", options.spec_name
       end
     end
   end

data/test/spec/runner/progress_bar_formatter_test.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+module Spec
+  module Runner
+    class ProgressBarFormatterTest < Test::Unit::TestCase
+
+      def setup
+        @io = StringIO.new
+        @formatter = ProgressBarFormatter.new(@io)
+      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)
+        assert_equal("F", @io.string)
+      end
+      
+      def test_should_produce_standard_summary
+        @formatter.dump_summary(4,3,2,1)
+        assert_equal("\nFinished in 4 seconds\n\n3 contexts, 2 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(4,3,2,1)
+        assert_equal("", @io.string)
+      end
+    end
+  end
+end