rspec-unit 0.9.22 → 0.9.23

data/Gemfile

@@ -1,11 +1,11 @@
 source :gemcutter
 
 # gem 'bundler', '>= 0.9.16'
-gem 'rspec', '= 2.0.0.beta.22'
+gem 'rspec', '= 2.0.0.rc'
 
 group :test do
   gem 'rake',        '>= 0.8.7'
-  gem 'rcov',        '>= 0.9.9'
+  #gem 'rcov',        '>= 0.9.9'
 end
 
 group :release do

data/Gemfile.lock

@@ -10,25 +10,24 @@ GEM
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
     rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.0.rc)
+      rspec-core (= 2.0.0.rc)
+      rspec-expectations (= 2.0.0.rc)
+      rspec-mocks (= 2.0.0.rc)
+    rspec-core (2.0.0.rc)
+    rspec-expectations (2.0.0.rc)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec-mocks (2.0.0.rc)
+      rspec-core (= 2.0.0.rc)
+      rspec-expectations (= 2.0.0.rc)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   jeweler (>= 1.4.0)
   rake (>= 0.8.7)
-  rcov (>= 0.9.9)
-  rspec (= 2.0.0.beta.22)
+  rspec (= 2.0.0.rc)

data/README.md

@@ -58,7 +58,7 @@ in many ways.
 
 Currently, test/unit compatibility is much more limited than in 
 RSpec 1.  The goal is not to make RSpec 2 a drop-in replacement for
-test/unit; rather, we have two more limited goals:
+test/unit; rather, I have three more limited goals:
 
 1. to allow RSpec 2 examples to easily make use of test/unit assertions
    in cases where those assertions are valuable, or where assertions
@@ -66,8 +66,9 @@ test/unit; rather, we have two more limited goals:
 2. to make it *easy* for a project to switch an existing test/unit
    suite over to run under RSpec, as the start of a gradual, piecemeal
    conversion to RSpec.
+3. to demonstrate how to extend RSpec 2.
    
-As such, there are some things we don''t support:
+As such, there are some things that are not supported:
 
 * The top-level module name is different.  For example, one requires 
   `rspec/unit` rather than `test/unit`, and extends `RSpec::Unit::TestCase` 
@@ -79,37 +80,8 @@ As such, there are some things we don''t support:
 * All test output and summaries are in RSpec style; test/unit-compatible
   output is not supported.
   
-We will certainly consider supporting those things if there is demand.
-
-I originally wrote this test/unit compatibility gem for Micronaut, a
-lightweight RSpec clone by Chad Humphries.  Micronaut has been rolled
-into RSpec as the core of RSpec 2, and I was able to move the test/unit
-compatibility over with minimal changes.
-
-The point of this gem is not that I think test/unit is a better way
-to write tests than the RSpec style.  I admit that I'm a TDD oldtimer
-who sees RSpec as mostly a cosmetic (rather than fundamental) change,
-but that doesn't mean it's not an important change.  My curmudgeonly
-nature has its limits, and I do find specs a big improvement.
-
-So why rspec-unit?  Three reasons:
-
-1. I wanted to show off the generality of Micronaut's (and now RSpec's)
-   architecture.  I hope rspec-unit can serve as an example for anyone 
-   who wants to experiment with new ways of expressing tests and specs 
-   on top of RSpec.
-2. Many projects with existing test/unit test suites might want to
-   benefit from the [metadata goodness][metadata] in RSpec 2, or begin
-   a gradual, piecemeal change to an RSpec style.  That's pretty
-   easy to do with rspec-unit.
-3. Even when writing specs and examples, I frequently encounter
-   cases where an assertion is more expressive than a `should`
-   expression.  It's nice just to have assertions supported within
-   RSpec examples.
+I will certainly consider supporting those things if there is demand.
       
-[uth]: http://blog.thinkrelevance.com/2009/4/1/micronaut-innovation-under-the-hood
-[metadata]: http://blog.thinkrelevance.com/2009/3/26/introducing-micronaut-a-lightweight-bdd-framework
-
 ## To Do
 
 It would be nice to try using the assertion code from minitest,

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.rubyforge_project = "rspec-unit"
     gem.add_dependency('rspec', '~> 2.0')
     gem.has_rdoc = false
-    gem.files =  FileList["[A-Z]*", "{bin,lib,spec}/**/*"] 
+    gem.files =  FileList["[A-Z]*", "{bin,lib,spec}/**/*"].exclude('**/*.rbc')
     gem.rubyforge_project = 'glv' 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 9
-:patch: 22
+:patch: 23

data/lib/rspec/unit/assertions.rb

@@ -366,7 +366,8 @@ EOT
         end
       end
 
-      UncaughtThrow = {NameError => /^uncaught throw \`(.+)\'$/,
+      UncaughtThrow = {ArgumentError => /^uncaught throw :?(.+)$/,
+                       NameError => /^uncaught throw \`(.+)\'$/,
                        ThreadError => /^uncaught throw \`(.+)\' in thread /} #`
 
       ##
@@ -390,11 +391,11 @@ EOT
             end
             full_message = build_message(message, "<?> should have been thrown.", expected_symbol)
             assert_block(full_message){caught}
-          rescue NameError, ThreadError => error
+          rescue ArgumentError, NameError, ThreadError => error
             if UncaughtThrow[error.class] !~ error.message
               raise error
             end
-            full_message = build_message(message, "<?> expected to be thrown but\n<?> was thrown.", expected_symbol, $1.intern)
+            full_message = build_message(message, "<?> expected to be thrown but\n<?> was thrown.", expected_symbol, $1.to_sym)
             flunk(full_message)
           end
         end
@@ -414,11 +415,11 @@ EOT
           assert(block_given?, "Should have passed a block to assert_nothing_thrown")
           begin
             proc.call
-          rescue NameError, ThreadError => error
+          rescue ArgumentError, NameError, ThreadError => error
             if UncaughtThrow[error.class] !~ error.message
               raise error
             end
-            full_message = build_message(message, "<?> was thrown when nothing was expected", $1.intern)
+            full_message = build_message(message, "<?> was thrown when nothing was expected", $1.to_sym)
             flunk(full_message)
           end
           assert(true, "Expected nothing to be thrown")

data/lib/rspec/unit/test_case.rb

@@ -85,7 +85,7 @@ module RSpec
       end
               
       def self.test_methods
-        public_instance_methods(true).select{|m| test_method?(m)}
+        public_instance_methods(true).select{|m| test_method?(m)}.map{|m| m.to_s}
       end
       
       def self.number_of_tests

data/spec/test_case_spec.rb

@@ -229,7 +229,7 @@ describe "RSpec::Unit::TestCase" do
     
     it "sets :caller" do
       @foo.metadata[:example_group][:caller].first.should =~ Regexp.new(Regexp.escape(@foo.metadata[:example_group][:location]))
-      @foo.metadata[:example_group][:caller].size.should == @caller_at_foo_definition.size + 3
+      @foo.metadata[:example_group][:caller].size.should be_>(@caller_at_foo_definition.size)
     end
     
     it "has nil for :block and :describes" do
@@ -302,15 +302,14 @@ describe "RSpec::Unit::TestCase" do
         def test_baz; end
       end
       test_baz_metadata[:example_group].should == @foo.metadata[:example_group]
-      test_baz_metadata[:behaviour].should == @foo.metadata[:example_group]
     end
     
     it "sets :caller" do
       @foo.class_eval do
         def test_baz; end
       end
-      test_baz_metadata[:caller].first.should == @foo.examples.first.metadata[:location]
-      test_baz_metadata[:caller].size.should == caller.size + 3
+      test_baz_metadata[:caller].first.should match(/^#{Regexp.escape(@foo.examples.first.metadata[:location])}/)
+      test_baz_metadata[:caller].size.should be_>(caller.size)
     end        
   
     it "records test_info metadata for next test method" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-unit
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 23
+  version: 0.9.23
 platform: ruby
 authors: 
 - Glenn Vanderburg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -05:00
+date: 2010-10-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency