rspec 0.5.1 → 0.5.2

data/lib/spec/runner/kernel_ext.rb

@@ -1,6 +1,5 @@
 module Kernel
   def context(name, &block)
-    Spec::Runner::Context.new(name, &block) unless $generating_docs
-    Spec::Runner::DocumentationContext.new(name, &block) if $generating_docs
+    Spec::Runner::Context.new(name, &block)
   end
 end

data/lib/spec/runner/option_parser.rb

@@ -4,11 +4,11 @@ module Spec
   module Runner
     class OptionParser
 
-      def self.parse(args, standalone=false, err=$stderr)
+      def self.parse(args, standalone=false, err=$stderr, out=$stdout)
         options = OpenStruct.new
-        options.out = $stdout
-        options.verbose = false;
-        options.doc = false;
+        options.out = out
+        options.verbose = false
+        options.doc = false
 
         opts = ::OptionParser.new do |opts|
           opts.banner = "Usage: spec [options] (FILE|DIRECTORY)+"
@@ -19,17 +19,22 @@ module Spec
             exit if outfile.nil?
           end
 
-          opts.on("-v", "--verbose") do
+          opts.on("-v", "--verbose", "Verbose output") do
             options.verbose = true
           end
 
-          opts.on("-d", "--doc", "Generate documentation") do
+          opts.on("-d", "--doc", "Output specdoc only") do
             options.doc = true
           end
 
+          opts.on("--version", "Show version") do
+            out.puts ::Spec::VERSION::DESCRIPTION
+            exit if out == $stdout
+          end
+
           opts.on_tail("-h", "--help", "Show this message") do
             err.puts opts
-            exit if err == $stderr
+            exit if out == $stdout
           end
 
         end

data/lib/spec/version.rb

@@ -1,13 +1,16 @@
 module Spec
   module VERSION
-    MAJOR = 0
-    MINOR = 5
-    TINY  = 1
+    unless defined? MAJOR
+      MAJOR = 0
+      MINOR = 5
+      TINY  = 2
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+      STRING = [MAJOR, MINOR, TINY].join('.')
 
-    NAME = "RSCM"
-    FULLNAME = "RSpec"
-    URL = "http://rspec.rubyforge.org/"  
+      NAME = "RSpec"
+      URL = "http://rspec.rubyforge.org/"  
+    
+      DESCRIPTION = "#{NAME}-#{STRING} - BDD for Ruby\n#{URL}"
+    end
   end
 end

data/test/spec/api/helper/raising_test.rb

@@ -44,6 +44,18 @@ module Spec
             proc { ''.to_s }.should.not.raise NoMethodError
           end
         end
+
+        def test_should_not_raise_without_exception_should_pass_when_no_exception_is_raised
+          assert_nothing_raised do
+            proc { ''.to_s }.should.not.raise
+          end
+        end
+        
+        def TODOtest_should_understand_raised_with_message_matching
+          lambda do
+            raise 'Hello'
+          end.should.raise(StandardError).with.message.matching /ello/
+        end
       end
     end
   end

data/test/spec/api/helper/should_satisfy_test.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/../../../test_helper'
 
+
+
 module Spec
   module Api
     module Helper
@@ -7,27 +9,27 @@ module Spec
 
         def test_should_raise_exception_when_block_yields_false
           assert_raise(ExpectationNotMetError) do
-            5.should.satisfy { false }
+            5.should.satisfy {|target| false }
           end
         end
   
         def test_should_not_raise_exception_when_block_yields_true
           assert_nothing_raised do
-            5.should.satisfy { true }
+            5.should.satisfy {|target| true }
           end
         end
 
         # should.not.satisfy
   
-        def test_should_raise_exception_when_block_yields_false
+        def test_should_raise_exception_when_block_yields_false_again
           assert_raise(ExpectationNotMetError) do
-            5.should.not.satisfy { true }
+            5.should.not.satisfy {|target| true }
           end
         end
   
-        def test_should_not_raise_exception_when_block_yields_true
+        def test_should_not_raise_exception_when_block_yields_true_again
           assert_nothing_raised do
-            5.should.not.satisfy { false }
+            5.should.not.satisfy {|target| false }
           end
         end
 

data/test/spec/api/mock_arg_constraints_test.rb

@@ -8,16 +8,7 @@ module Spec
         @mock = Mock.new("test mock")
       end
 
-      def test_should_handle_anything
-        @mock.should.receive(:random_call).at.least(:once).with(:anything)
-        @mock.random_call()
-        @mock.random_call(1)
-        @mock.random_call("a", 2)
-        @mock.random_call([], {}, "joe", 7)
-        @mock.__verify
-      end
-      
-      def test_should_handle_anything_in_multi_args
+      def test_should_handle_any_arg
         @mock.should.receive(:random_call).with("a", :anything, "c")
         @mock.random_call("a", "whatever", "c")
         @mock.__verify

data/test/spec/api/mock_test.rb

@@ -92,14 +92,14 @@ module Spec
       end
   
       def test_two_return_values
-        @mock.should.receive(:multi_call).twice.with(:nothing).and.return([1, 2])
+        @mock.should.receive(:multi_call).twice.with(:no_args).and.return([1, 2])
         assert_equal(1, @mock.multi_call)
         assert_equal(2, @mock.multi_call)
         @mock.__verify
       end
   
       def test_repeating_final_return_value
-        @mock.should.receive(:multi_call).at.least(:once).with(:nothing).and.return([1, 2])
+        @mock.should.receive(:multi_call).at.least(:once).with(:no_args).and.return([1, 2])
         assert_equal(1, @mock.multi_call)
         assert_equal(2, @mock.multi_call)
         assert_equal(2, @mock.multi_call)
@@ -221,6 +221,50 @@ module Spec
         @mock.random_call
         @mock.__verify
       end
+      
+      def test_should_raise_if_exactly_3_times_method_is_not_called
+        @mock.should.receive(:random_call).exactly(3).times
+        assert_raise(MockExpectationError) do
+          @mock.__verify
+        end
+      end
+      
+      def test_should_raise_if_exactly_3_times_method_is_called_once
+        @mock.should.receive(:random_call).exactly(3).times
+        @mock.random_call
+        assert_raise(MockExpectationError) do
+          @mock.__verify
+        end
+      end
+      
+      def test_should_raise_if_exactly_3_times_method_is_called_twice
+        @mock.should.receive(:random_call).exactly(3).times
+        @mock.random_call
+        @mock.random_call
+        assert_raise(MockExpectationError) do
+          @mock.__verify
+        end
+      end
+      
+      def test_should_not_raise_if_exactly_3_times_method_is_called_3_times
+        @mock.should.receive(:random_call).exactly(3).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        assert_nothing_raised do
+          @mock.__verify
+        end
+      end
+      
+      def test_should_raise_if_exactly_3_times_method_is_called_4_times
+        @mock.should.receive(:random_call).exactly(3).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        assert_nothing_raised do
+          @mock.random_call
+        end
+      end
 
       def test_raising
         @mock.should.receive(:random_call).and.raise(RuntimeError)
@@ -235,7 +279,32 @@ module Spec
           @mock.random_call
         end
       end
+      
+      def TODO_test_should_use_past_tense
+        @mock.should.have.received(:hello)
+      end
+
+      def TODO_test_should_sent
+        cut.should.have.sent(:hello)
+        cut.should.have.sent(:hello).to(@mock)
+      end
      
+      def test_should_ignore_args_on_any_args
+        @mock.should.receive(:random_call).at.least(:once).with(:any_args)
+        @mock.random_call()
+        @mock.random_call(1)
+        @mock.random_call("a", 2)
+        @mock.random_call([], {}, "joe", 7)
+        @mock.__verify
+      end
+      
+      def test_should_throw_on_no_args_if_any_args_received
+        @mock.should.receive(:random_call).with(:no_args)
+        assert_raise(MockExpectationError) do
+          @mock.random_call(1)
+        end
+      end
+      
     end
   end
 end

data/test/spec/runner/context_runner_test.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../../test_helper'
 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"
@@ -14,6 +15,28 @@ module Spec
         context1.__verify
         context2.__verify
       end
+
+      def test_should_call_run_on_context
+        context1 = Api::Mock.new "context1"
+        context2 = Api::Mock.new "context2"
+        context1.should.receive(:run)
+        context2.should.receive(:run)
+        runner = ContextRunner.new [], false, StringIO.new
+        runner.add_context context1
+        runner.add_context context2        
+        runner.run
+        context1.__verify
+        context2.__verify
+      end
+      
+
+      def test_should_call_run_for_standalone
+        context1 = Api::Mock.new "context1"
+        context1.should.receive(:run)
+        runner = ContextRunner.standalone context1
+        context1.__verify
+      end
+      
     end
   end
 end

data/test/spec/runner/context_test.rb

@@ -20,6 +20,47 @@ module Spec
         @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, :anything
+        $spec_ran = false
+        @context.specify("test") {$spec_ran = true}
+        @context.run(@listener)
+        assert $spec_ran
+        @listener.__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
+      end
+      
+      def test_setup
+        @listener.should.receive(:add_context).with :any_args
+        @listener.should.receive(:add_spec).with :any_args
+        $setup_ran = false
+        @context.setup {$setup_ran = true}
+        @context.specify("test") {true}
+        @context.run(@listener)
+        assert $setup_ran
+        @listener.__verify
+      end
+
+      def test_teardwown
+        @listener.should.receive(:add_context).with :any_args
+        @listener.should.receive(:add_spec).with :any_args
+        $teardwown_ran = false
+        @context.teardown {$teardwown_ran = true}
+        @context.specify("test") {true}
+        @context.run(@listener)
+        assert $teardwown_ran
+        @listener.__verify
+      end
 
     end
   end

data/test/spec/runner/execution_context_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../test_helper'
+
 module Spec
   module Runner
     class ExecutionContextTest < Test::Unit::TestCase
@@ -8,6 +9,12 @@ module Spec
         ec = ExecutionContext.new spec
         mock = ec.mock("a mock")
       end
+      
+      def test_violated
+        assert_raise(Spec::Api::ExpectationNotMetError) do
+          ExecutionContext.new(nil).violated
+        end
+      end
     end
   end
 end

data/test/spec/runner/kernel_ext_test.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Runner
+    class KernelExtTest < Test::Unit::TestCase
+      def test_create_context
+        assert_nothing_raised do
+          @cxt = context("") {}
+        end
+        assert @cxt.instance_of? Spec::Runner::Context
+      end
+    end
+  end
+end

data/test/spec/runner/option_parser_test.rb

@@ -6,11 +6,18 @@ module Spec
     class OptionParserTest < Test::Unit::TestCase
 
       def setup
+        @out = StringIO.new
         @err = StringIO.new
       end
 
+      def test_should_print_version
+        options = OptionParser.parse(["--version"], false, @err, @out)
+        @out.rewind
+        assert_match(/RSpec-\d+\.\d+\.\d+ - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n, @out.read)
+      end
+      
       def test_verbose_should_be_true_by_default
-        options = OptionParser.parse([], false, @err)
+        options = OptionParser.parse([], false, @err, @out)
         assert(!options.verbose)
       end
 
@@ -20,37 +27,37 @@ module Spec
       end
       
       def test_verbose_should_be_settable_with_v
-        options = OptionParser.parse(["-v"], false, @err)
+        options = OptionParser.parse(["-v"], false, @err, @out)
         assert(options.verbose)
       end
       
       def test_verbose_should_be_settable_with_verbose
-        options = OptionParser.parse(["--verbose"], false, @err)
+        options = OptionParser.parse(["--verbose"], false, @err, @out)
         assert(options.verbose)
       end
       
       def test_doc_should_be_false_by_default
-        options = OptionParser.parse([], false, @err)
+        options = OptionParser.parse([], false, @err, @out)
         assert(!options.doc)
       end
       
       def test_doc_should_be_settable_with_d
-        options = OptionParser.parse(["-d"], false, @err)
+        options = OptionParser.parse(["-d"], false, @err, @out)
         assert(options.doc)
       end
       
       def test_out_should_be_settable_with_o
-        options = OptionParser.parse(["-o","test.txt"], false, @err)
+        options = OptionParser.parse(["-o","test.txt"], false, @err, @out)
         assert_equal("test.txt", options.out)
       end
       
       def test_out_should_be_settable_with_of
-        options = OptionParser.parse(["--of","test.txt"], false, @err)
+        options = OptionParser.parse(["--of","test.txt"], false, @err, @out)
         assert_equal("test.txt", options.out)
       end
-      
-      def test_should_print_usage_if_no_dir_specified
-        options = OptionParser.parse([], false, @err)
+
+      def test_should_print_usage_to_err_if_no_dir_specified
+        options = OptionParser.parse([], false, @err, @out)
         assert_match(/Usage: spec/, @err.string)
       end
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2006-04-08 00:00:00 -05:00
+  version: 0.5.2
+date: 2006-04-09 00:00:00 -05:00
 summary: Behaviour Specification Framework for Ruby
 require_paths: 
 - lib
@@ -30,6 +30,7 @@ authors:
 files: 
 - CHANGES
 - Rakefile
+- README
 - lib/spec.rb
 - lib/spec/api.rb
 - lib/spec/runner.rb
@@ -80,6 +81,7 @@ files:
 - test/spec/runner/context_runner_test.rb
 - test/spec/runner/context_test.rb
 - test/spec/runner/execution_context_test.rb
+- test/spec/runner/kernel_ext_test.rb
 - test/spec/runner/option_parser_test.rb
 - test/spec/runner/rdoc_formatter_test.rb
 - test/spec/runner/simple_text_reporter_test.rb
@@ -89,17 +91,16 @@ files:
 - test/spec/tool/test_unit_api_test.rb
 - test/spec/tool/test_unit_translator_test.rb
 - examples/airport_spec.rb
+- examples/empty_stack_spec.rb
 - examples/mocking_spec.rb
 - examples/spec_framework_spec.rb
 - examples/stack.rb
 - examples/stack_spec.rb
 - doc/config.yaml
-- doc/output
 - doc/plugin
 - doc/README
 - doc/reference
 - doc/src
-- doc/output/rdoc
 - doc/plugin/syntax.rb
 - doc/reference/rspec reference.page
 - doc/src/community.page
@@ -110,20 +111,19 @@ files:
 - doc/src/examples.page
 - doc/src/images
 - doc/src/index.page
+- doc/src/meta.info
 - doc/src/tools
 - doc/src/ul.gif
 - doc/src/why_rspec.page
 - doc/src/documentation/api.page
 - doc/src/documentation/index.page
+- doc/src/documentation/meta.info
 - doc/src/documentation/mocks.page
-- doc/src/documentation/specs.page
 - doc/src/images/ul.gif
 - doc/src/tools/index.page
+- doc/src/tools/meta.info
 - doc/src/tools/rails.page
 - doc/src/tools/rake.page
-- doc/src/tools/rcov.page
-- doc/src/tools/spec_runner.page
-- doc/src/tools/specdoc.page
 - doc/src/tools/test2rspec.page
 test_files: []