message-driver 0.2.2 → 0.3.0

data/spec/integration/bunny/amqp_integration_spec.rb

@@ -1,18 +1,13 @@
 require 'spec_helper'
 
 describe "AMQP Integration", :bunny, type: :integration do
-  before(:each) do
-    MessageDriver.configure BrokerConfig.config
-  end
-  after(:each) do
-    MessageDriver::Broker.stop
-  end
+  let!(:broker) { MessageDriver::Broker.configure BrokerConfig.config }
 
   context "when a queue can't be found" do
     let(:queue_name) { "my.lost.queue" }
     it "raises a MessageDriver::QueueNotFound error" do
       expect {
-        MessageDriver::Broker.dynamic_destination(queue_name, passive: true)
+        broker.dynamic_destination(queue_name, passive: true)
       }.to raise_error(MessageDriver::QueueNotFound) do |err|
         expect(err.queue_name).to eq(queue_name)
         expect(err.nested).to be_a Bunny::NotFound
@@ -23,16 +18,16 @@ describe "AMQP Integration", :bunny, type: :integration do
   context "when a channel level exception occurs" do
     it "raises a MessageDriver::WrappedError error" do
       expect {
-        MessageDriver::Broker.dynamic_destination("not.a.queue", passive: true)
+        broker.dynamic_destination("not.a.queue", passive: true)
       }.to raise_error(MessageDriver::WrappedError) { |err| err.nested.should be_a Bunny::ChannelLevelException }
     end
 
     it "reestablishes the channel transparently" do
       expect {
-        MessageDriver::Broker.dynamic_destination("not.a.queue", passive: true)
+        broker.dynamic_destination("not.a.queue", passive: true)
       }.to raise_error(MessageDriver::WrappedError)
       expect {
-        MessageDriver::Broker.dynamic_destination("", exclusive: true)
+        broker.dynamic_destination("", exclusive: true)
       }.to_not raise_error
     end
 
@@ -40,14 +35,14 @@ describe "AMQP Integration", :bunny, type: :integration do
       it "sets the channel_context as rollback-only until the transaction is finished" do
         MessageDriver::Client.with_message_transaction do
           expect {
-            MessageDriver::Broker.dynamic_destination("not.a.queue", passive: true)
+            broker.dynamic_destination("not.a.queue", passive: true)
           }.to raise_error(MessageDriver::WrappedError)
           expect {
-            MessageDriver::Broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination("", exclusive: true)
           }.to raise_error(MessageDriver::TransactionRollbackOnly)
         end
         expect {
-          MessageDriver::Broker.dynamic_destination("", exclusive: true)
+          broker.dynamic_destination("", exclusive: true)
         }.to_not raise_error
       end
     end
@@ -56,11 +51,11 @@ describe "AMQP Integration", :bunny, type: :integration do
   context "when the broker connection fails", pending: "these spec are busted" do
     def disrupt_connection
       #yes, this is very implementation specific
-      MessageDriver::Broker.adapter.connection.instance_variable_get(:@transport).close
+      broker.adapter.connection.instance_variable_get(:@transport).close
     end
 
     def create_destination(queue_name)
-      MessageDriver::Broker.dynamic_destination(queue_name, exclusive: true)
+      broker.dynamic_destination(queue_name, exclusive: true)
     end
 
     it "raises a MessageDriver::ConnectionError" do
@@ -91,7 +86,7 @@ describe "AMQP Integration", :bunny, type: :integration do
         expect {
           MessageDriver::Client.with_message_transaction do
             disrupt_connection
-            MessageDriver::Broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination("", exclusive: true)
           end
         }.to raise_error(MessageDriver::ConnectionError)
       end
@@ -100,21 +95,21 @@ describe "AMQP Integration", :bunny, type: :integration do
         MessageDriver::Client.with_message_transaction do
           disrupt_connection
           expect {
-            MessageDriver::Broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination("", exclusive: true)
           }.to raise_error(MessageDriver::ConnectionError)
           expect {
-            MessageDriver::Broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination("", exclusive: true)
           }.to raise_error(MessageDriver::TransactionRollbackOnly)
         end
         expect {
-          MessageDriver::Broker.dynamic_destination("", exclusive: true)
+          broker.dynamic_destination("", exclusive: true)
         }.to_not raise_error
       end
     end
   end
 
   context "when an unhandled expection occurs in a transaction" do
-    let(:destination) { MessageDriver::Broker.dynamic_destination("", exclusive: true) }
+    let(:destination) { broker.dynamic_destination("", exclusive: true) }
 
     it "rolls back the transaction" do
       expect {

data/spec/integration/bunny/bunny_adapter_spec.rb

@@ -9,12 +9,13 @@ module MessageDriver::Adapters
 
     describe "#initialize" do
       context "differing bunny versions" do
+        let(:broker) { double("broker") }
         shared_examples "raises an error" do
           it "raises an error" do
             stub_const("Bunny::VERSION", version)
             expect {
-              described_class.new(valid_connection_attrs)
-            }.to raise_error MessageDriver::Error, "bunny 0.10.8 or later is required for the bunny adapter"
+              described_class.new(broker, valid_connection_attrs)
+            }.to raise_error MessageDriver::Error, "bunny 1.1.3 or later is required for the bunny adapter"
           end
         end
         shared_examples "doesn't raise an error" do
@@ -22,17 +23,17 @@ module MessageDriver::Adapters
             stub_const("Bunny::VERSION", version)
             adapter = nil
             expect {
-              adapter = described_class.new(valid_connection_attrs)
+              adapter = described_class.new(broker, valid_connection_attrs)
             }.to_not raise_error
           end
         end
-        %w(0.8.0 0.9.0.pre11 0.9.0.rc1 0.9.0 0.9.2 0.9.8 0.10.7).each do |v|
+        %w(0.8.0 0.9.0.pre11 0.9.0.rc1 0.9.0 0.9.8 0.10.7 1.0.3 1.1.2).each do |v|
           context "bunny version #{v}" do
             let(:version) { v }
             include_examples "raises an error"
           end
         end
-        %w(0.10.8 1.0.0 1.0.3).each do |v|
+        %w(1.1.3 1.1.5).each do |v|
           context "bunny version #{v}" do
             let(:version) { v }
             include_examples "doesn't raise an error"
@@ -41,27 +42,26 @@ module MessageDriver::Adapters
       end
 
       it "connects to the rabbit broker" do
-        adapter = described_class.new(valid_connection_attrs)
+        broker = double(:broker)
+        adapter = described_class.new(broker, valid_connection_attrs)
 
         expect(adapter.connection).to be_a Bunny::Session
         expect(adapter.connection).to be_open
       end
 
       it "connects to the rabbit broker lazily" do
-        adapter = described_class.new(valid_connection_attrs)
+        broker = double(:broker)
+        adapter = described_class.new(broker, valid_connection_attrs)
 
-        expect(adapter.connection(false)).to_not be_open
+        expect(adapter.connection(false)).to be_nil
       end
     end
 
     shared_context "a connected bunny adapter" do
-      subject(:adapter) { described_class.new(valid_connection_attrs) }
+      let(:broker) { MessageDriver::Broker.configure(valid_connection_attrs) }
+      subject(:adapter) { broker.adapter }
       let(:connection) { adapter.connection }
 
-      before do
-        MessageDriver::Broker.configure(adapter: adapter)
-      end
-
       after do
         adapter.stop
       end

data/spec/integration/in_memory/in_memory_adapter_spec.rb

@@ -4,7 +4,8 @@ require 'message_driver/adapters/in_memory_adapter'
 
 module MessageDriver::Adapters
   describe InMemoryAdapter, :in_memory, type: :integration do
-    subject(:adapter) { described_class.new }
+    let(:broker) { double("broker") }
+    subject(:adapter) { described_class.new(broker) }
 
     describe "#new_context" do
       it "returns a InMemoryAdapter::InMemoryContext" do

data/spec/integration/stomp/stomp_adapter_spec.rb

@@ -9,13 +9,14 @@ module MessageDriver::Adapters
 
     describe "#initialize" do
       let(:connection_attrs) { valid_connection_attrs }
+      let(:broker) { double("broker") }
 
       context "differing stomp versions" do
         shared_examples "raises a stomp error" do
           it "raises an error" do
             stub_const("Stomp::Version::STRING", version)
             expect {
-              described_class.new(connection_attrs)
+              described_class.new(broker, connection_attrs)
             }.to raise_error MessageDriver::Error, "stomp 1.3.1 or a later version of the 1.3.x series is required for the stomp adapter"
           end
         end
@@ -24,7 +25,7 @@ module MessageDriver::Adapters
             stub_const("Stomp::Version::STRING", version)
             adapter = nil
             expect {
-              adapter = described_class.new(connection_attrs)
+              adapter = described_class.new(broker, connection_attrs)
             }.to_not raise_error
           end
         end
@@ -44,7 +45,7 @@ module MessageDriver::Adapters
 
       describe "the resulting config" do
         let(:connection_attrs) { {hosts: [{host: "my_host"}]} }
-        subject(:config) { described_class.new(connection_attrs).config }
+        subject(:config) { described_class.new(broker, connection_attrs).config }
 
         its([:connect_headers]) { should eq(:"accept-version" => "1.1,1.2") }
         its([:hosts]) { should eq(connection_attrs[:hosts]) }
@@ -71,11 +72,8 @@ module MessageDriver::Adapters
     end
 
     shared_context "a connected stomp adapter" do
-      subject(:adapter) { described_class.new(valid_connection_attrs) }
-
-      before do
-        MessageDriver::Broker.configure(adapter: adapter)
-      end
+      let(:broker) { MessageDriver::Broker.configure(valid_connection_attrs) }
+      subject(:adapter) { broker.adapter }
 
       after do
         adapter.stop

data/spec/spec_helper.rb

@@ -11,6 +11,15 @@ RSpec.configure do |c|
 
   c.reporter.message("Acceptance Tests running with broker config: #{BrokerConfig.config}")
 
+  spec_logger = Logger.new(STDOUT).tap { |l| l.level = Logger::FATAL }
+  c.before(:each) do
+    MessageDriver.logger = spec_logger
+  end
+
+  c.after(:each) do
+    MessageDriver::Broker.reset
+  end
+
   c.filter_run_excluding :no_ci if ENV['CI']=='true' && ENV['ADAPTER'] && ENV['ADAPTER'].start_with?('bunny')
   if c.inclusion_filter[:all_adapters] == true
     BrokerConfig.unconfigured_adapters.each do |a|

data/spec/support/shared/adapter_examples.rb

@@ -14,4 +14,10 @@ shared_examples "an adapter" do
       expect(ctx2).to_not be_valid
     end
   end
+
+  describe "#broker" do
+    it "returns the broker associated with the adapter" do
+      expect(subject.broker).to be(broker)
+    end
+  end
 end

data/spec/support/shared/context_examples.rb

@@ -1,6 +1,8 @@
 shared_examples "an adapter context" do
   it { should be_a MessageDriver::Adapters::ContextBase }
 
+  its(:adapter) { should be adapter }
+
   it "is initially valid" do
     should be_valid
   end

data/spec/support/shared/destination_examples.rb

@@ -1,4 +1,6 @@
 shared_examples "a destination" do
+  its(:adapter) { should be adapter }
+
   describe "#pop_message" do
     let(:body) { "The message body" }
     let(:headers) { { "foo" => "bar", "bar" => "baz"} }

data/spec/units/message_driver/adapters/base_spec.rb

@@ -16,14 +16,6 @@ module MessageDriver::Adapters
       end
     end
 
-    describe "#stop" do
-      it "raises an error", pending: "maybe we don't want to do this" do
-        expect {
-          subject.stop
-        }.to raise_error "Must be implemented in subclass"
-      end
-    end
-
     describe ContextBase do
       class TestContext < ContextBase
       end