Merge pull request #33 from Fatsoma/ENG-549-log-channel-error-amends

Move open_channel test block instance var to class instance

Author: brentfatsoma

spec/hutch/channel_broker_spec.rb

@@ -11,8 +11,9 @@
     Hutch::Config.instance_variable_set(:@config, nil)
     Hutch::Config.initialize
   end
-  let(:connection) { double('Connection') }
-  let(:channel) { double('Channel') }
+  let(:connection) { double(:connection) }
+  let(:channel) { double(:channel) }
+
   subject(:channel_broker) { Hutch::ChannelBroker.new(connection, config) }
 
   shared_examples 'an empty channel broker' do
@@ -46,8 +47,8 @@
   end
 
   describe '#reconnect' do
-    let(:new_channel) { double('Channel') }
-    let(:new_exchange) { double('Exchange') }
+    let(:new_channel) { double(:new_channel) }
+    let(:new_exchange) { double(:new_exchange) }
 
     before do
       allow(channel_broker).to receive(:disconnect)
@@ -97,8 +98,8 @@
   describe '#declare_wait_exchange' do
     let(:expiration) { rand(1000..1_000_000) }
     let(:suffix) { expiration.to_s }
-    let(:new_exchange) { double('Exchange') }
-    let(:new_queue) { double('Queue') }
+    let(:new_exchange) { double(:new_exchange) }
+    let(:new_queue) { double(:new_queue) }
     let(:exchange_name) { "wait-exchange_#{suffix}" }
     let(:queue_name) { "wait-queue_#{suffix}" }
     let(:main_exchange_name) { 'main-exchange' }
@@ -131,6 +132,17 @@
   end
 
   describe '#open_channel' do
+    let(:channel) do
+      Class.new do
+        def on_error(&block)
+          @on_error = block
+        end
+        def test_on_error(*args)
+          @on_error.call(*args)
+        end
+        def confirm_select; end
+      end.new
+    end
     let(:honey_badger) { double(:honey_badger) }
     let(:config) { {} }
     let(:method) { Class.new }
@@ -142,9 +154,6 @@
       allow(connection).to receive(:create_channel).and_return(channel)
       allow(connection).to receive(:prefetch_channel)
       allow(channel).to receive(:confirm_select)
-      allow(channel).to receive(:on_error) do |&blk|
-        @captured_block = blk
-      end
     end
 
     subject { channel_broker.open_channel }
@@ -183,8 +192,8 @@
       let(:method_id) { 'test-method-id' }
 
       subject do
-        channel_broker.open_channel.tap do
-          @captured_block.call(channel, method)
+        channel_broker.open_channel.tap do |channel|
+          channel.test_on_error(channel, method)
         end
       end
 
@@ -201,7 +210,6 @@
 
         it do
           is_expected.to eq(channel)
-          expect(@captured_block).to be_a(Proc)
           expect(honey_badger).to have_received(:notify)
             .with(
               error_class: 'Hutch::ChannelBroker::OnError',
@@ -223,7 +231,6 @@
 
         it do
           is_expected.to eq(channel)
-          expect(@captured_block).to be_a(Proc)
           expect(honey_badger).to have_received(:notify)
             .with(
               error_class: 'Hutch::ChannelBroker::OnError',