shared_should 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/shared_should.rb

@@ -42,11 +42,12 @@ class Test::Unit::TestCase
     return context_or_test_class.kind_of?(Shoulda::Context) ? context_or_test_class : Test::Unit::TestCase
   end
 
-  alias_method :initialize_without_shared_setup_execute, :initialize
-  def initialize(test_name)
-    initialize_without_shared_setup_execute(test_name)
-    (@@setup_blocks[self.class] || []).each do |setup_block|
-      setup_block.bind(self).call
+  def execute_class_shared_setups_if_not_executed
+    if !@shared_setups_executed
+      @shared_setups_executed = true
+      (@@setup_blocks[self.class] || []).each do |setup_block|
+        setup_block.bind(self).call
+      end
     end
   end
 
@@ -61,6 +62,7 @@ class Test::Unit::TestCase
   end
   
   def call_block_with_shared_value(test_block)
+    execute_class_shared_setups_if_not_executed
     if test_block.arity == 1
       # check arity of 1 before checking if value is an array. If one parameter, never treat the shared_value as variable args
       test_block.bind(self).call(self.shared_value)

data/shared_should.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shared_should}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   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

@@ -10,6 +10,29 @@ class TestSharedShould < Test::Unit::TestCase
     assert @setup_instance_method_executed
   end
   
+  # test class as context
+  share_setup "for a true value in class" do
+    assert @setup_instance_method_executed # setup instance method should have been called first
+    @class_value = true
+  end
+  
+  share_should "be a valid should test in class" do
+    assert @class_value
+  end
+  
+  share_context "for a valid context test in class" do
+    should "have a true value" do
+      assert @class_value
+    end
+  end
+  
+  use_setup "for a true value in class"
+  
+  use_should "be a valid should test in class"
+  
+  use_context "for a valid context test in class"
+  
+  
   context ".share_context" do
     context "without params" do
       share_context "for a valid value" do
@@ -380,28 +403,7 @@ class TestSharedShould < Test::Unit::TestCase
     use_context "for a valid context test"
   end
   
-  # test class as context
-  share_setup "for a true value in class" do
-    @class_value = true
-  end
-  
-  share_should "be a valid should test in class" do
-    assert @class_value
-  end
-  
-  share_context "for a valid context test in class" do
-    should "have a true value" do
-      assert @class_value
-    end
-  end
-  
-  use_setup "for a true value in class"
-  
-  use_should "be a valid should test in class"
-  
-  use_context "for a valid context test in class"
-  
-  
+
   # ensure should macros work
   def self.should_be_a_valid_macro
     should "be a valid macro" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shared_should
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Michael Pearce