spec/lib/adapters/rabbitmq_adapter_spec.rb in basquiat-1.1.1 vs spec/lib/adapters/rabbitmq_adapter_spec.rb in basquiat-1.2.0

@@ -1,79 +1,69 @@
 require 'spec_helper'
 require 'basquiat/adapters/rabbitmq_adapter'
 
 describe Basquiat::Adapters::RabbitMq do
-  subject { Basquiat::Adapters::RabbitMq.new }
+  subject(:adapter) { Basquiat::Adapters::RabbitMq.new }
 
-  it_behaves_like 'a Basquiat::Adapter'
-
   let(:base_options) do
-    { servers: [{ host: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' },
-                  port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } }] }
+    { servers:   [{ host: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' },
+                    port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } }],
+      publisher: { persistent: true } }
   end
 
-  before(:each) do
-    subject.adapter_options(base_options)
-  end
-
-  after(:each) do
-    remove_queues_and_exchanges
-  end
-
-  context 'failover' do
-    let(:failover_settings) do
-      base_options[:servers].unshift({ host: 'localhost', port: 1234 })
-      base_options.merge(failover: { default_timeout: 0.2, max_retries: 2 })
+  context 'RabbitMQ interactions' do
+    before(:each) do
+      adapter.adapter_options(base_options)
+      adapter.reset_connection
     end
 
-    it 'tries a reconnection after a few seconds' do
-      subject.adapter_options(servers:  [host: 'localhost', port: 1234],
-                              failover: { default_timeout: 0.2, max_retries: 1 })
-      expect { subject.connect }.to raise_exception(Bunny::TCPConnectionFailed)
+    after(:each) do
+      remove_queues_and_exchanges
     end
 
-    it 'uses another server after all retries on a single one' do
-      subject.adapter_options(failover_settings)
-      expect { subject.connect }.to_not raise_error
-      expect(subject.connection_uri).to match(/5672/)
+    context 'publisher' do
+      it '#publish [enqueue a message]' do
+        expect do
+          adapter.publish('messages.welcome', data: 'A Nice Welcome Message')
+        end.to_not raise_error
+      end
     end
-  end
 
-  it '#connected?' do
-    expect(subject.connected?).to be_nil
-    subject.connect
-    expect(subject.connected?).to_not be_nil
-  end
+    context 'listener' do
+      it '#subscribe_to some event' do
+        message = ''
+        adapter.subscribe_to('some.event',
+                             ->(msg) { message << msg[:data].upcase! })
+        adapter.listen(block: false)
+        adapter.publish('some.event', data: 'coisa')
+        sleep 0.7 # Wait for the listening thread
 
-  context 'publisher' do
-    it '#publish [enqueue a message]' do
-      expect do
-        subject.publish('messages.welcome', data: 'A Nice Welcome Message')
-      end.to_not raise_error
+        expect(message).to eq('COISA')
+      end
     end
-  end
 
-  context 'listener' do
-    it '#subscribe_to some event' do
+    it '#subscribe_to other event with #' do
       message_received = ''
-      subject.subscribe_to('some.event', lambda do |msg|
-                                         msg[:data].upcase!
-                                         message_received = msg
-                                       end)
+      subject.subscribe_to('other.event.#',
+                           lambda do |msg|
+                             msg[:data].upcase!
+                             message_received = msg
+                           end)
       subject.listen(block: false)
 
-      subject.publish('some.event', data: 'coisa')
-      sleep 0.1 # Wait for the listening thread.
+      subject.publish('other.event.extra.info', data: 'some stuff')
+      sleep 0.3 # Wait for the listening thread.
 
-      expect(message_received).to eq(data: 'COISA')
+      expect(message_received).to eq(data: 'SOME STUFF')
     end
+
   end
 
   def remove_queues_and_exchanges
-    subject.send(:queue).delete
-    subject.send(:exchange).delete
+    adapter.session.queue.delete
+    adapter.session.exchange.delete
   rescue Bunny::TCPConnectionFailed
     true
   ensure
-    subject.send(:disconnect)
+    adapter.send(:disconnect)
   end
 end