Observable shared specs now called from IVar shared specs.

Author: jdantonio

spec/concurrent/future_spec.rb

@@ -1,5 +1,4 @@
 require_relative 'ivar_shared'
-require_relative 'observable_shared'
 require_relative 'thread_arguments_shared'
 
 module Concurrent
@@ -47,6 +46,11 @@ def execute_dereferenceable(subject)
         subject.execute
         sleep(0.1)
       end
+
+      def trigger_observable(observable)
+        observable.execute
+        sleep(0.1)
+      end
     end
 
     it_should_behave_like :thread_arguments do
@@ -60,16 +64,6 @@ def get_ivar_from_args(opts)
       end
     end
 
-    it_should_behave_like :observable do
-
-      subject{ Future.new{ nil } }
-
-      def trigger_observable(observable)
-        observable.execute
-        sleep(0.1)
-      end
-    end
-
     context '#initialize' do
 
       let(:executor) { ImmediateExecutor.new }

spec/concurrent/ivar_shared.rb

@@ -1,10 +1,12 @@
 require_relative 'dereferenceable_shared'
 require_relative 'obligation_shared'
+require_relative 'observable_shared'
 
 shared_examples :ivar do
 
   it_should_behave_like :obligation
   it_should_behave_like :dereferenceable
+  it_should_behave_like :observable
 
   context 'initialization' do
 

spec/concurrent/ivar_spec.rb

@@ -1,5 +1,4 @@
 require_relative 'ivar_shared'
-require_relative 'observable_shared'
 
 module Concurrent
 
@@ -43,11 +42,6 @@ def dereferenceable_observable(opts = {})
       def execute_dereferenceable(subject)
         subject.set('value')
       end
-    end
-
-    it_should_behave_like :observable do
-
-      subject{ IVar.new }
 
       def trigger_observable(observable)
         observable.set('value')

spec/concurrent/promise_spec.rb

@@ -41,6 +41,11 @@ def execute_dereferenceable(subject)
         subject.execute
         sleep(0.1)
       end
+
+      def trigger_observable(observable)
+        observable.execute
+        sleep(0.1)
+      end
     end
 
     it_should_behave_like :thread_arguments do