bunny 1.7.1 → 2.0.0.rc1

data/spec/higher_level_api/integration/with_channel_spec.rb

@@ -20,6 +20,6 @@ describe Bunny::Channel, "#with_channel" do
       end
     rescue Exception
     end
-    ch.should be_closed
+    expect(ch).to be_closed
   end
 end

data/spec/issues/issue100_spec.rb

@@ -2,18 +2,17 @@ require "spec_helper"
 
 unless ENV["CI"]
   describe Bunny::Channel, "#basic_publish" do
-    let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-                    :password => "bunny_password",
-                    :vhost    => "bunny_testbed",
-                    :write_timeout => 0,
-                    :read_timeout => 0)
-      c.start
-      c
+    before :all do
+      @connection = Bunny.new(:user     => "bunny_gem",
+                              :password => "bunny_password",
+                              :vhost    => "bunny_testbed",
+                              :write_timeout => 0,
+                              :read_timeout => 0)
+      @connection.start
     end
 
     after :all do
-      connection.close if connection.open?
+      @connection.close if @connection.open?
     end
 
 
@@ -22,7 +21,7 @@ unless ENV["CI"]
       let(:m) { 10 }
 
       it "successfully publishers them all" do
-        ch = connection.create_channel
+        ch = @connection.create_channel
 
         q  = ch.queue("", :exclusive => true)
         x  = ch.default_exchange

data/spec/issues/issue141_spec.rb

@@ -1,22 +1,21 @@
 require "spec_helper"
 
 describe "Registering 2nd exclusive consumer on queue" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
+    before :all do
+    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection.start
   end
 
   after :each do
-    connection.close if connection.open?
+    @connection.close if @connection.open?
   end
 
 
   it "raises a meaningful exception" do
     xs  = []
 
-    ch1 = connection.create_channel
-    ch2 = connection.create_channel
+    ch1 = @connection.create_channel
+    ch2 = @connection.create_channel
     q1  = ch1.queue("", :auto_delete => true)
     q2  = ch2.queue(q1.name, :auto_delete => true, :passive => true)
 
@@ -25,19 +24,19 @@ describe "Registering 2nd exclusive consumer on queue" do
     end
     sleep 0.1
 
-    lambda do
+    expect do
       q2.subscribe(:exclusive => true) do |_, _, _|
       end
-    end.should raise_error(Bunny::AccessRefused)
+    end.to raise_error(Bunny::AccessRefused)
 
-    ch1.should be_open
-    ch2.should be_closed
+    expect(ch1).to be_open
+    expect(ch2).to be_closed
 
     q1.publish("abc")
     sleep 0.1
 
     # verify that the first consumer is fine
-    xs.should == ["abc"]
+    expect(xs).to eq ["abc"]
 
     q1.delete
   end

data/spec/issues/issue224_spec.rb

@@ -28,10 +28,10 @@ unless ENV["CI"]
         x.publish(as, :routing_key => q.name, :persistent => true)
 
         sleep(1)
-        q.message_count.should == 1
+        expect(q.message_count).to eq 1
 
         _, _, payload      = q.pop
-        payload.bytesize.should == as.bytesize
+        expect(payload.bytesize).to eq as.bytesize
 
         ch.close
       end

data/spec/issues/issue78_spec.rb

@@ -2,20 +2,16 @@ require "spec_helper"
 
 unless ENV["CI"]
   describe Bunny::Queue, "#subscribe" do
-    let(:connection1) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-      c.start
-      c
-    end
-    let(:connection2) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-      c.start
-      c
+    before :all do
+      @connection1 = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+      @connection1.start
+      @connection2 = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+      @connection2.start
     end
 
     after :all do
-      connection1.close if connection1.open?
-      connection2.close if connection2.open?
+      @connection1.close if @connection1.open?
+      @connection2.close if @connection2.open?
     end
 
 
@@ -23,8 +19,8 @@ unless ENV["CI"]
       it "consumes messages" do
         delivered_data = []
 
-        ch1 = connection1.create_channel
-        ch2 = connection1.create_channel
+        ch1 = @connection1.create_channel
+        ch2 = @connection1.create_channel
 
         q   = ch1.queue("", :exclusive => true)
         q.subscribe(:manual_ack => false, :block => false) do |delivery_info, properties, payload|
@@ -36,7 +32,7 @@ unless ENV["CI"]
         x.publish("abc", :routing_key => q.name)
         sleep 0.7
 
-        delivered_data.should == ["abc"]
+        expect(delivered_data).to eq ["abc"]
 
         ch1.close
         ch2.close
@@ -49,8 +45,8 @@ unless ENV["CI"]
       it "consumes messages" do
         delivered_data = []
 
-        ch1 = connection1.create_channel
-        ch2 = connection1.create_channel
+        ch1 = @connection1.create_channel
+        ch2 = @connection1.create_channel
 
         q   = ch1.queue(queue_name, :exclusive => true)
         x = ch2.default_exchange
@@ -58,14 +54,14 @@ unless ENV["CI"]
           x.publish("data#{i}", :routing_key => queue_name)
         end
         sleep 0.7
-        q.message_count.should == 3
+        expect(q.message_count).to eq 3
 
         q.subscribe(:manual_ack => false, :block => false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.7
 
-        delivered_data.should == ["data0", "data1", "data2"]
+        expect(delivered_data).to eq ["data0", "data1", "data2"]
 
         ch1.close
         ch2.close

data/spec/issues/issue83_spec.rb

@@ -1,19 +1,18 @@
 require "spec_helper"
 
 describe Bunny::Channel, "#open" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
+  before :all do
+    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection.start
   end
 
   after :all do
-    connection.close if connection.open?
+    @connection.close if @connection.open?
   end
 
 
   it "properly resets channel exception state" do
-    ch = connection.create_channel
+    ch = @connection.create_channel
 
     begin
       ch.queue("bunny.tests.does.not.exist", :passive => true)

data/spec/issues/issue97_spec.rb

@@ -1,24 +1,23 @@
 require "spec_helper"
 
 describe "Message framing implementation" do
-  let(:connection) do
-    c = Bunny.new(:user     => "bunny_gem",
+    before :all do
+    @connection = Bunny.new(:user     => "bunny_gem",
                   :password => "bunny_password",
                   :vhost    => "bunny_testbed",
                   :port     => ENV.fetch("RABBITMQ_PORT", 5672))
-    c.start
-    c
+    @connection.start
   end
 
   after :all do
-    connection.close if connection.open?
+    @connection.close if @connection.open?
   end
 
 
   unless ENV["CI"]
     context "with payload ~ 248K in size including non-ASCII characters" do
       it "successfully frames the message" do
-        ch = connection.create_channel
+        ch = @connection.create_channel
 
         q  = ch.queue("", :exclusive => true)
         x  = ch.default_exchange
@@ -27,7 +26,7 @@ describe "Message framing implementation" do
         x.publish(body, :routing_key => q.name, :persistent => true)
 
         sleep(1)
-        q.message_count.should == 1
+        expect(q.message_count).to eq 1
 
         q.purge
         ch.close
@@ -38,7 +37,7 @@ describe "Message framing implementation" do
 
   context "with payload of several MBs in size" do
     it "successfully frames the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -47,10 +46,10 @@ describe "Message framing implementation" do
       x.publish(as, :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       _, _, payload      = q.pop
-      payload.bytesize.should == as.bytesize
+      expect(payload.bytesize).to eq as.bytesize
 
       ch.close
     end
@@ -60,7 +59,7 @@ describe "Message framing implementation" do
 
   context "with empty message body" do
     it "successfully publishes the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -68,15 +67,15 @@ describe "Message framing implementation" do
       x.publish("", :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       envelope, headers, payload = q.pop
 
-      payload.should == ""
+      expect(payload).to eq ""
 
-      headers[:content_type].should == "application/octet-stream"
-      headers[:delivery_mode].should == 2
-      headers[:priority].should == 0
+      expect(headers[:content_type]).to eq "application/octet-stream"
+      expect(headers[:delivery_mode]).to eq 2
+      expect(headers[:priority]).to eq 0
 
       ch.close
     end
@@ -85,7 +84,7 @@ describe "Message framing implementation" do
 
   context "with payload being 2 bytes less than 128K bytes in size" do
     it "successfully frames the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -94,7 +93,7 @@ describe "Message framing implementation" do
       x.publish(as, :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       q.purge
       ch.close
@@ -103,7 +102,7 @@ describe "Message framing implementation" do
 
   context "with payload being 1 byte less than 128K bytes in size" do
     it "successfully frames the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -112,7 +111,7 @@ describe "Message framing implementation" do
       x.publish(as, :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       q.purge
       ch.close
@@ -121,7 +120,7 @@ describe "Message framing implementation" do
 
   context "with payload being exactly 128K bytes in size" do
     it "successfully frames the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -130,7 +129,7 @@ describe "Message framing implementation" do
       x.publish(as, :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       q.purge
       ch.close
@@ -140,7 +139,7 @@ describe "Message framing implementation" do
 
   context "with payload being 1 byte greater than 128K bytes in size" do
     it "successfully frames the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -149,7 +148,7 @@ describe "Message framing implementation" do
       x.publish(as, :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       q.purge
       ch.close
@@ -158,7 +157,7 @@ describe "Message framing implementation" do
 
   context "with payload being 2 bytes greater than 128K bytes in size" do
     it "successfully frames the message" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
@@ -167,7 +166,7 @@ describe "Message framing implementation" do
       x.publish(as, :routing_key => q.name, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       q.purge
       ch.close

data/spec/lower_level_api/integration/basic_cancel_spec.rb

@@ -1,27 +1,26 @@
 require "spec_helper"
 
 describe Bunny::Channel, "#basic_cancel" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
+  before(:all) do
+    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection.start
   end
 
   after :all do
-    connection.close if connection.open?
+    @connection.close if @connection.open?
   end
 
   let(:queue_name) { "bunny.queues.#{rand}" }
 
   it "returns basic.cancel-ok" do
-    ch = connection.create_channel
+    ch = @connection.create_channel
     q  = ch.queue("", :exclusive => true)
 
     consume_ok = ch.basic_consume(q, "")
     cancel_ok  = ch.basic_cancel(consume_ok.consumer_tag)
 
-    cancel_ok.should be_instance_of(AMQ::Protocol::Basic::CancelOk)
-    cancel_ok.consumer_tag.should == consume_ok.consumer_tag
+    expect(cancel_ok).to be_instance_of AMQ::Protocol::Basic::CancelOk
+    expect(cancel_ok.consumer_tag).to eq consume_ok.consumer_tag
 
     ch.close
   end
@@ -33,32 +32,32 @@ describe Bunny::Channel, "#basic_cancel" do
       delivered_data = []
 
       t = Thread.new do
-        ch         = connection.create_channel
+        ch         = @connection.create_channel
         q          = ch.queue(queue_name, :auto_delete => true, :durable => false)
         consume_ok = ch.basic_consume(q, "", true, false) do |_, _, payload|
           delivered_data << payload
         end
 
-        consume_ok.consumer_tag.should_not be_nil
+        expect(consume_ok.consumer_tag).not_to be_nil
         cancel_ok = ch.basic_cancel(consume_ok.consumer_tag)
-        cancel_ok.consumer_tag.should == consume_ok.consumer_tag
+        expect(cancel_ok.consumer_tag).to eq consume_ok.consumer_tag
 
         ch.close
       end
       t.abort_on_exception = true
       sleep 0.5
 
-      ch = connection.create_channel
+      ch = @connection.create_channel
       ch.default_exchange.publish("", :routing_key => queue_name)
 
       sleep 0.7
-      delivered_data.should be_empty
+      expect(delivered_data).to be_empty
     end
   end
 
   context "when the given consumer tag is invalid (was never registered)" do
     it "DOES NOT cause a channel error" do
-      ch = connection.create_channel
+      ch = @connection.create_channel
 
       # RabbitMQ 3.1 does not raise an exception w/ unknown consumer tag. MK.
       ch.basic_cancel("878798s7df89#{rand}#{Time.now.to_i}")
@@ -69,8 +68,8 @@ describe Bunny::Channel, "#basic_cancel" do
 
   context "when the given consumer tag belongs to a different channel" do
     it "DOES NOT cause a channel error" do
-      ch1 = connection.create_channel
-      ch2 = connection.create_channel
+      ch1 = @connection.create_channel
+      ch2 = @connection.create_channel
 
       q    = ch1.queue("", :exclusive => true)
       cons = q.subscribe do |_, _, _|