bunny 1.7.1 → 2.0.0.rc1

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -24,9 +24,9 @@ describe Bunny::Consumer, "#cancel" do
           delivered_data << payload
         end
 
-        consumer.consumer_tag.should_not be_nil
+        expect(consumer.consumer_tag).not_to be_nil
         cancel_ok = consumer.cancel
-        cancel_ok.consumer_tag.should == consumer.consumer_tag
+        expect(cancel_ok.consumer_tag).to eq consumer.consumer_tag
 
         ch.close
       end
@@ -37,7 +37,7 @@ describe Bunny::Consumer, "#cancel" do
       ch.default_exchange.publish("", :routing_key => queue_name)
 
       sleep 0.7
-      delivered_data.should be_empty
+      expect(delivered_data).to be_empty
     end
   end
 
@@ -70,7 +70,7 @@ describe Bunny::Consumer, "#cancel" do
       ch.default_exchange.publish("", :routing_key => queue_name)
 
       sleep 0.7
-      delivered_data.should be_empty
+      expect(delivered_data).to be_empty
     end
   end
 end

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -35,10 +35,10 @@ describe Bunny::Queue, "#subscribe" do
       x.publish("hello", :routing_key => queue_name)
 
       sleep 0.7
-      delivered_keys.should include(queue_name)
-      delivered_data.should include("hello")
+      expect(delivered_keys).to include(queue_name)
+      expect(delivered_data).to include("hello")
 
-      ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+      expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
       ch.close
     end
@@ -63,9 +63,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.0
-        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
         ch.close
       end
@@ -95,9 +95,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.5
-        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
         ch.close
       end
@@ -129,10 +129,10 @@ describe Bunny::Queue, "#subscribe" do
       x.publish("hello", :routing_key => queue_name)
 
       sleep 0.7
-      delivered_keys.should include(queue_name)
-      delivered_data.should include("hello")
+      expect(delivered_keys).to include(queue_name)
+      expect(delivered_data).to include("hello")
 
-      ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+      expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
       ch.close
     end
@@ -154,7 +154,7 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 0.7
-        q.message_count.should be > 50
+        expect(q.message_count).to be > 50
 
         t = Thread.new do
           ch = connection.create_channel
@@ -167,10 +167,10 @@ describe Bunny::Queue, "#subscribe" do
         t.abort_on_exception = true
         sleep 0.5
 
-        delivered_keys.should include(queue_name)
-        delivered_data.should include("hello")
+        expect(delivered_keys).to include(queue_name)
+        expect(delivered_data).to include("hello")
 
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
         ch.close
       end
@@ -212,10 +212,10 @@ describe Bunny::Queue, "#subscribe" do
       x.publish("hello", :routing_key => queue_name)
 
       sleep 0.7
-      delivered_keys.should include(queue_name)
-      delivered_data.should include("hello")
+      expect(delivered_keys).to include(queue_name)
+      expect(delivered_data).to include("hello")
 
-      ch.queue(queue_name).message_count.should == 0
+      expect(ch.queue(queue_name).message_count).to eq 0
 
       ch.queue_delete(queue_name)
       ch.close
@@ -249,7 +249,7 @@ describe Bunny::Queue, "#subscribe" do
         x.publish("hello", :routing_key => queue_name)
         sleep 0.5
 
-        caught.message.should == queue_name
+        expect(caught.message).to eq queue_name
 
         ch.close
       end
@@ -301,9 +301,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.0
-        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
         ch.close
       end
@@ -333,9 +333,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.5
-        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
         ch.close
       end

data/spec/higher_level_api/integration/basic_consume_with_objects_spec.rb

@@ -48,7 +48,7 @@ describe Bunny::Queue, "#subscribe_with" do
       sleep 2
       ch1.close
 
-      q2.message_count.should == 50
+      expect(q2.message_count).to eq 50
     end
   end
 end

data/spec/higher_level_api/integration/basic_get_spec.rb

@@ -30,7 +30,7 @@ describe Bunny::Queue, "#pop" do
       expect(get_ok.routing_key).to eq(q.name)
       expect(get_ok.delivery_tag).to be_kind_of(Bunny::VersionedDeliveryTag)
       expect(content).to eq(msg)
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       ch.close
     end
@@ -48,7 +48,7 @@ describe Bunny::Queue, "#pop" do
       expect(get_empty).to eq(nil)
       expect(properties).to eq(nil)
       expect(content).to eq(nil)
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       ch.close
     end

data/spec/higher_level_api/integration/basic_nack_spec.rb

@@ -22,12 +22,12 @@ describe Bunny::Channel, "#nack" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       delivery_info, _, content = q.pop(:manual_ack => true)
 
       subject.nack(delivery_info.delivery_tag, false, false)
       sleep(0.5)
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       subject.close
     end
@@ -42,14 +42,14 @@ q = subject.queue("bunny.basic.nack.with-requeue-true-multi-true", :exclusive =>
         x.publish("bunneth", :routing_key => q.name)
       end
       sleep(0.5)
-      q.message_count.should == 3
+      expect(q.message_count).to eq 3
       _, _, _ = q.pop(:manual_ack => true)
       _, _, _ = q.pop(:manual_ack => true)
       delivery_info, _, content = q.pop(:manual_ack => true)
 
       subject.nack(delivery_info.delivery_tag, true, true)
       sleep(0.5)
-      q.message_count.should == 3
+      expect(q.message_count).to eq 3
 
       subject.close
     end
@@ -63,7 +63,7 @@ q = subject.queue("bunny.basic.nack.with-requeue-true-multi-true", :exclusive =>
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.25)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       _, _, content = q.pop(:manual_ack => true)
 
       subject.on_error do |ch, channel_close|
@@ -73,7 +73,7 @@ q = subject.queue("bunny.basic.nack.with-requeue-true-multi-true", :exclusive =>
 
       sleep 0.5
 
-      @channel_close.reply_text.should == "PRECONDITION_FAILED - unknown delivery tag 82"
+      expect(@channel_close.reply_text).to eq "PRECONDITION_FAILED - unknown delivery tag 82"
     end
   end
 end

data/spec/higher_level_api/integration/basic_publish_spec.rb

@@ -15,7 +15,7 @@ if RUBY_VERSION <= "1.9"
 
     context "with all default delivery and message properties" do
       it "routes messages to a queue with the same name as the routing key" do
-        connection.should be_threaded
+        expect(connection).to be_threaded
         ch = connection.create_channel
 
         q  = ch.queue("", :exclusive => true)
@@ -27,7 +27,7 @@ if RUBY_VERSION <= "1.9"
           publish("xyzzy", :routing_key => q.name)
 
         sleep(1)
-        q.message_count.should == 4
+        expect(q.message_count).to eq 4
 
         ch.close
       end
@@ -36,7 +36,7 @@ if RUBY_VERSION <= "1.9"
 
     context "with all default delivery and message properties" do
       it "routes the messages and preserves all the metadata" do
-        connection.should be_threaded
+        expect(connection).to be_threaded
         ch = connection.create_channel
 
         q  = ch.queue("", :exclusive => true)
@@ -45,15 +45,15 @@ if RUBY_VERSION <= "1.9"
         x.publish("xyzzy", :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 == "xyzzy"
+        expect(payload).to eq "xyzzy"
 
-        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
@@ -68,7 +68,7 @@ if RUBY_VERSION <= "1.9"
       end
 
       it "routes messages to a queue with the same name as the routing key" do
-        connection.should_not be_threaded
+        expect(connection).not_to be_threaded
         ch = connection.create_channel
 
         q  = ch.queue("", :exclusive => true)
@@ -80,7 +80,7 @@ if RUBY_VERSION <= "1.9"
           publish("xyzzy", :routing_key => q.name)
 
         sleep(1)
-        q.message_count.should == 4
+        expect(q.message_count).to eq 4
 
         ch.close
       end
@@ -112,11 +112,11 @@ describe "Published message" do
       x.publish("xyzzy", :routing_key => rk, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       _, _, payload = q.pop
 
-      payload.should == "xyzzy"
+      expect(payload).to eq "xyzzy"
 
       ch.close
     end
@@ -134,11 +134,11 @@ describe "Published message" do
       x.publish("xyzzy", :routing_key => rk, :persistent => true)
 
       sleep(1)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       _, _, payload = q.pop
 
-      payload.should == "xyzzy"
+      expect(payload).to eq "xyzzy"
 
       ch.close
     end

data/spec/higher_level_api/integration/basic_qos_spec.rb

@@ -11,10 +11,19 @@ describe Bunny::Channel, "#prefetch" do
     connection.close
   end
 
-  context "with a positive integer" do
+  context "with a positive integer < 65535" do
     it "sets that prefetch level via basic.qos" do
       ch = connection.create_channel
-      ch.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
+      expect(ch.prefetch(10)).to be_instance_of(AMQ::Protocol::Basic::QosOk)
+    end
+  end
+
+  context "with a positive integer > 65535" do
+    it "raises an ArgumentError" do
+      ch = connection.create_channel
+      expect {
+        ch.prefetch(100_000)
+      }.to raise_error(ArgumentError)
     end
   end
 

data/spec/higher_level_api/integration/basic_recover_spec.rb

@@ -12,7 +12,7 @@ describe Bunny::Channel, "#recover" do
   end
 
   it "is supported" do
-    subject.recover(true).should be_instance_of(AMQ::Protocol::Basic::RecoverOk)
-    subject.recover(true).should be_instance_of(AMQ::Protocol::Basic::RecoverOk)
+    expect(subject.recover(true)).to be_instance_of(AMQ::Protocol::Basic::RecoverOk)
+    expect(subject.recover(true)).to be_instance_of(AMQ::Protocol::Basic::RecoverOk)
   end
 end

data/spec/higher_level_api/integration/basic_reject_spec.rb

@@ -19,12 +19,12 @@ describe Bunny::Channel, "#reject" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       delivery_info, _, _ = q.pop(:manual_ack => true)
 
       ch.reject(delivery_info.delivery_tag, true)
       sleep(0.5)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       ch.close
     end
@@ -38,12 +38,12 @@ describe Bunny::Channel, "#reject" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       delivery_info, _, _ = q.pop(:manual_ack => true)
 
       ch.reject(delivery_info.delivery_tag, false)
       sleep(0.5)
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       ch.close
     end
@@ -58,7 +58,7 @@ describe Bunny::Channel, "#reject" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.25)
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       _, _, content = q.pop(:manual_ack => true)
 
       ch.on_error do |ch, channel_close|
@@ -68,7 +68,7 @@ describe Bunny::Channel, "#reject" do
 
       sleep 0.5
 
-      @channel_close.reply_text.should == "PRECONDITION_FAILED - unknown delivery tag 82"
+      expect(@channel_close.reply_text).to eq "PRECONDITION_FAILED - unknown delivery tag 82"
     end
   end
 end

data/spec/higher_level_api/integration/basic_return_spec.rb

@@ -25,7 +25,7 @@ describe Bunny::Exchange, "#publish" do
       x.publish("xyzzy", :routing_key => rand.to_s, :mandatory => true)
       sleep 0.5
 
-      returned.should include("xyzzy")
+      expect(returned).to include("xyzzy")
 
       ch.close
     end

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -15,9 +15,9 @@ describe Bunny::Channel, "when closed" do
     ch = connection.create_channel
     n = ch.number
 
-    ch.should be_open
+    expect(ch).to be_open
     ch.close
-    ch.should be_closed
+    expect(ch).to be_closed
 
     # a new channel with the same id can be created
     connection.create_channel(n)

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -13,17 +13,17 @@ describe Bunny::Channel, "when opened" do
 
   context "without explicitly provided id" do
     it "gets an allocated id and is successfully opened" do
-      connection.should be_connected
+      expect(connection).to be_connected
       ch = connection.create_channel
-      ch.should be_open
+      expect(ch).to be_open
 
-      ch.id.should be > 0
+      expect(ch.id).to be > 0
     end
   end
 
   context "with an explicitly provided id = 0" do
     it "raises ArgumentError" do
-      connection.should be_connected
+      expect(connection).to be_connected
       expect {
         connection.create_channel(0)
       }.to raise_error(ArgumentError)
@@ -34,10 +34,10 @@ describe Bunny::Channel, "when opened" do
   context "with explicitly provided id" do
     it "uses that id and is successfully opened" do
       ch = connection.create_channel(767)
-      connection.should be_connected
-      ch.should be_open
+      expect(connection).to be_connected
+      expect(ch).to be_open
 
-      ch.id.should == 767
+      expect(ch.id).to eq 767
     end
   end
 
@@ -46,12 +46,12 @@ describe Bunny::Channel, "when opened" do
   context "with explicitly provided id that is already taken" do
     it "reuses the channel that is already opened" do
       ch = connection.create_channel(767)
-      connection.should be_connected
-      ch.should be_open
+      expect(connection).to be_connected
+      expect(ch).to be_open
 
-      ch.id.should == 767
+      expect(ch.id).to eq 767
 
-      connection.create_channel(767).should == ch
+      expect(connection.create_channel(767)).to eq ch
     end
   end
 end