Dereferenceable shared specs now called from IVar shared specs.

Author: jdantonio

lib/concurrent/ivar.rb

@@ -39,7 +39,6 @@ module Concurrent
   #   ivar.get #=> 14
   #   ivar.set 2 # would now be an error
   class IVar
-
     include Obligation
     include Observable
 

lib/concurrent/promise.rb

@@ -398,8 +398,6 @@ def self.any?(*promises)
       aggregate(:any?, *promises)
     end
 
-    protected :complete
-
     protected
 
     # Aggregate a collection of zero or more promises under a composite promise,
@@ -464,6 +462,7 @@ def complete(success, value, reason)
       end
 
       children_to_notify.each { |child| notify_child(child) }
+      observers.notify_and_delete_observers{ [Time.now, self.value, reason] }
     end
 
     # @!visibility private

spec/concurrent/future_spec.rb

@@ -1,4 +1,3 @@
-require_relative 'dereferenceable_shared'
 require_relative 'ivar_shared'
 require_relative 'observable_shared'
 require_relative 'thread_arguments_shared'
@@ -32,21 +31,7 @@ module Concurrent
     end
 
     it_should_behave_like :ivar do
-      subject { Future.new(executor: :immediate){ nil } }
-    end
-
-    it_should_behave_like :thread_arguments do
-
-      def get_ivar_from_no_args
-        Concurrent::Future.execute{|*args| args }
-      end
-
-      def get_ivar_from_args(opts)
-        Concurrent::Future.execute(opts){|*args| args }
-      end
-    end
-
-    it_should_behave_like :dereferenceable do
+      subject { Future.new(executor: :immediate){ value } }
 
       def dereferenceable_subject(value, opts = {})
         opts = opts.merge(executor: executor)
@@ -64,6 +49,17 @@ def execute_dereferenceable(subject)
       end
     end
 
+    it_should_behave_like :thread_arguments do
+
+      def get_ivar_from_no_args
+        Concurrent::Future.execute{|*args| args }
+      end
+
+      def get_ivar_from_args(opts)
+        Concurrent::Future.execute(opts){|*args| args }
+      end
+    end
+
     it_should_behave_like :observable do
 
       subject{ Future.new{ nil } }

spec/concurrent/ivar_shared.rb

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

spec/concurrent/ivar_spec.rb

@@ -1,4 +1,3 @@
-require_relative 'dereferenceable_shared'
 require_relative 'ivar_shared'
 require_relative 'observable_shared'
 
@@ -32,9 +31,6 @@ module Concurrent
 
     it_should_behave_like :ivar do
       subject{ IVar.new }
-    end
-
-    it_should_behave_like :dereferenceable do
 
       def dereferenceable_subject(value, opts = {})
         IVar.new(value, opts)

spec/concurrent/promise_spec.rb

@@ -5,6 +5,7 @@ module Concurrent
 
   describe Promise do
 
+    let!(:value) { 10 }
     let(:executor) { PerThreadExecutor.new }
 
     let(:empty_root) { Promise.new(executor: executor){ nil } }
@@ -24,7 +25,22 @@ module Concurrent
     end
 
     it_should_behave_like :ivar do
-      subject{ Promise.new(executor: :immediate) }
+      subject{ Promise.new(executor: :immediate){ value } }
+
+      def dereferenceable_subject(value, opts = {})
+        opts = opts.merge(executor: executor)
+        Promise.new(opts){ value }.execute.tap{ sleep(0.1) }
+      end
+
+      def dereferenceable_observable(opts = {})
+        opts = opts.merge(executor: executor)
+        Promise.new(opts){ 'value' }
+      end
+
+      def execute_dereferenceable(subject)
+        subject.execute
+        sleep(0.1)
+      end
     end
 
     it_should_behave_like :thread_arguments do
@@ -38,11 +54,6 @@ def get_ivar_from_args(opts)
       end
     end
 
-    it 'includes Dereferenceable' do
-      promise = Promise.new{ nil }
-      expect(promise).to be_a(Dereferenceable)
-    end
-
     context 'initializers' do
       describe '.fulfill' do