shared_should 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/shared_should.rb

@@ -1,16 +1,16 @@
 require 'shoulda'
 
 class Shoulda::Context
+  alias :method_mission_without_shared_method_check :method_missing
   def method_missing(method, *args, &blk)
     current_context = self
     while current_context && (current_context.kind_of?(Shoulda::Context) || current_context < Test::Unit::TestCase) do
       if Test::Unit::TestCase.shared_context_block_owner(current_context).shared_context_blocks[method.to_s]
-        current_context.send(method, args[0], self, &blk)
-        return
+        return current_context.send(method, args[0], self, &blk)
       end
       current_context = current_context.parent
     end
-    super
+    method_mission_without_shared_method_check(method, *args, &blk)
   end
 end
 

data/shared_should.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shared_should}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Pearce"]

data/test/test_shared_should.rb

@@ -1,6 +1,7 @@
 require 'helper'
 
 class TestSharedShould < Test::Unit::TestCase
+  # check that setup instance method is executed
   def setup
     super
     @setup_instance_method_executed = true
@@ -10,24 +11,6 @@ class TestSharedShould < Test::Unit::TestCase
     assert @setup_instance_method_executed
   end
   
-  begin
-    invalid_method do
-    end
-    raise "Should have raised a NoMethodError"
-  rescue NoMethodError
-    # successfully raised NoMethodError
-  end
-  
-  context "NoMethodError check" do
-    begin
-      invalid_method do
-      end
-      raise "Should have raised a NoMethodError"
-    rescue NoMethodError
-      # successfully raised NoMethodError
-    end
-  end
-  
   context ".shared_context_for" do
     context "without params" do
       shared_context_for "a valid value" do
@@ -379,12 +362,38 @@ class TestSharedShould < Test::Unit::TestCase
   should_be("a valid context test in class")
   
   
-  # ensure test methods are created
-  test_method_names = suite.tests.inject({}) do |test_method_names, test_case|
-    test_method_names[test_case.method_name] = true
-    test_method_names
+  # ensure should macros work
+  def self.should_be_a_valid_macro
+    should "be a valid macro" do
+      assert true
+    end
+  end
+  
+  context "shoulda macro" do
+    should_be_a_valid_macro
+  end
+  
+  # ensure NoMethodError called when method not found
+  begin
+    invalid_method do
+    end
+    raise "Should have raised a NoMethodError"
+  rescue NoMethodError
+    # successfully raised NoMethodError
   end
-  [
+  
+  context "NoMethodError check" do
+    begin
+      invalid_method do
+      end
+      raise "Should have raised a NoMethodError"
+    rescue NoMethodError
+      # successfully raised NoMethodError
+    end
+  end
+  
+  # ensure test methods are created
+  expected_method_names = [
     "test: .shared_context_for with params when true for a valid specified value should call setup in shared context. ",
     "test: .shared_context_for with params when true for a valid specified value should call setup in shared context. ",
     "test: .shared_context_for with params when true for a valid specified value should have specified value. ",
@@ -417,8 +426,21 @@ class TestSharedShould < Test::Unit::TestCase
     "test: parameterized block with an array should be be valid with shared should. ",
     "test:  should be a valid should test in class. ",
     "test: for a valid context test in class should have a true value. ",
-    "test: SharedShould should execute setup instance method. "
-  ].each do |method_name|
-    raise "Test method not found: '#{method_name}'" unless test_method_names.include?(method_name)
+    "test: SharedShould should execute setup instance method. ",
+    "test: shoulda macro should be a valid macro. "
+  ].inject({}) do |hash, expected_method_name|
+    hash[expected_method_name] = true
+    hash
+  end
+  actual_method_names = suite.tests.inject({}) do |hash, test_case|
+    hash[test_case.method_name] = true
+    hash
+  end
+  
+  expected_method_names.each do |method_name, value|
+    raise "Test method not found: '#{method_name}'" unless actual_method_names.include?(method_name)
+  end
+  actual_method_names.each do |method_name, value|
+    raise "Unexpected test method: '#{method_name}'" unless expected_method_names.include?(method_name)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shared_should
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Michael Pearce