bunny 1.7.1 → 2.0.0.rc1

data/spec/higher_level_api/integration/connection_stop_spec.rb

@@ -20,9 +20,9 @@ describe Bunny::Session do
     c.start
     ch = c.create_channel
 
-    c.should be_connected
+    expect(c).to be_connected
     c.stop
-    c.should be_closed
+    expect(c).to be_closed
   end
 
   it "can be closed twice (Session#close is idempotent)" do
@@ -30,11 +30,11 @@ describe Bunny::Session do
     c.start
     ch = c.create_channel
 
-    c.should be_connected
+    expect(c).to be_connected
     c.stop
-    c.should be_closed
+    expect(c).to be_closed
     c.stop
-    c.should be_closed
+    expect(c).to be_closed
   end
 
   describe "in a single threaded mode" do
@@ -43,9 +43,9 @@ describe Bunny::Session do
       c.start
       ch = c.create_channel
 
-      c.should be_connected
+      expect(c).to be_connected
       c.stop
-      c.should be_closed
+      expect(c).to be_closed
     end
   end
 
@@ -56,14 +56,14 @@ describe Bunny::Session do
       c.start
       ch = c.create_channel
 
-      c.should be_open
+      expect(c).to be_open
       close_connection(c.local_port)
       sleep 0.2
-      c.should_not be_open
+      expect(c).not_to be_open
 
       wait_for_recovery
-      c.should be_open
-      ch.should be_open
+      expect(c).to be_open
+      expect(ch).to be_open
 
       c.close
     end

data/spec/higher_level_api/integration/consistent_hash_exchange_spec.rb

@@ -41,8 +41,8 @@ unless ENV["CI"]
       end
 
       sleep 2.0
-      q1.message_count.should be > 100
-      q2.message_count.should be > 100
+      expect(q1.message_count).to be > 100
+      expect(q2.message_count).to be > 100
 
       ch.close
     end

data/spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb

@@ -34,7 +34,7 @@ describe Bunny::Channel do
       ch.queue(queue_name, :auto_delete => true).delete
 
       sleep 0.5
-      cancelled.should be_true
+      expect(cancelled).to eq true
 
       ch.close
     end
@@ -75,7 +75,7 @@ describe Bunny::Channel do
       ch.queue(queue_name, :auto_delete => true).delete
 
       sleep 0.5
-      consumer.should be_cancelled
+      expect(consumer).to be_cancelled
 
       ch.close
     end
@@ -120,7 +120,7 @@ describe Bunny::Channel do
       x.publish("abc", :routing_key => queue_name)
       sleep 0.5
       q = ch.queue("basic.consume.after_cancellation", :auto_delete => true)
-      xs.should == ["abc"]
+      expect(xs).to eq ["abc"]
 
       ch.close
     end

data/spec/higher_level_api/integration/dead_lettering_spec.rb

@@ -23,15 +23,15 @@ describe "A message" do
     sleep 0.2
 
     delivery_info, _, _ = q.pop(:manual_ack => true)
-    dlq.message_count.should be_zero
+    expect(dlq.message_count).to be_zero
     ch.nack(delivery_info.delivery_tag)
 
     sleep 0.2
-    q.message_count.should be_zero
+    expect(q.message_count).to be_zero
 
     delivery, properties, body = dlq.pop
     ds = properties.headers["x-death"]
-    ds.should_not be_empty
+    expect(ds).not_to be_empty
     expect(ds.first["reason"]).to eq("rejected")
 
     dlx.delete
@@ -48,8 +48,8 @@ describe "A message" do
     x.publish("")
     sleep 0.2
 
-    q.message_count.should be_zero
-    dlq.message_count.should == 1
+    expect(q.message_count).to be_zero
+    expect(dlq.message_count).to eq 1
 
     dlx.delete
   end
@@ -67,7 +67,7 @@ describe "A message" do
 
     delivery, properties, body = dlq.pop
     ds = properties.headers["x-death"]
-    ds.should_not be_empty
+    expect(ds).not_to be_empty
     expect(ds.first["reason"]).to eq("expired")
 
     dlx.delete

data/spec/higher_level_api/integration/exchange_bind_spec.rb

@@ -24,7 +24,7 @@ describe Bunny::Exchange do
     source.publish("")
     sleep 0.5
 
-    queue.message_count.should be > 0
+    expect(queue.message_count).to be > 0
 
     ch.close
   end

data/spec/higher_level_api/integration/exchange_declare_spec.rb

@@ -17,7 +17,7 @@ describe Bunny::Exchange do
 
       x = Bunny::Exchange.default(ch)
 
-      x.name.should == ''
+      expect(x.name).to eq ''
     end
   end
 
@@ -28,7 +28,7 @@ describe Bunny::Exchange do
 
         name = "bunny.tests.exchanges.fanout#{rand}"
         x    = ch.fanout(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         x.delete
         ch.close
@@ -41,7 +41,7 @@ describe Bunny::Exchange do
 
         name = "amq.fanout"
         x    = ch.fanout(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.close
       end
@@ -55,7 +55,7 @@ describe Bunny::Exchange do
           ch.fanout("amq.test")
         }.to raise_error(Bunny::AccessRefused)
 
-        ch.should be_closed
+        expect(ch).to be_closed
         expect {
           ch.fanout("amq.test")
         }.to raise_error(Bunny::ChannelAlreadyClosed)
@@ -68,9 +68,9 @@ describe Bunny::Exchange do
 
         name = "bunny.tests.exchanges.durable"
         x    = ch.fanout(name, :durable => true)
-        x.name.should == name
-        x.should be_durable
-        x.should_not be_auto_delete
+        expect(x.name).to eq name
+        expect(x).to be_durable
+        expect(x).not_to be_auto_delete
 
         x.delete
         ch.close
@@ -84,9 +84,9 @@ describe Bunny::Exchange do
 
         name = "bunny.tests.exchanges.auto-delete"
         x    = ch.fanout(name, :auto_delete => true)
-        x.name.should == name
-        x.should_not be_durable
-        x.should be_auto_delete
+        expect(x.name).to eq name
+        expect(x).not_to be_durable
+        expect(x).to be_auto_delete
 
         ch.exchange(name, :type => :fanout, :auto_delete => true)
 
@@ -106,7 +106,7 @@ describe Bunny::Exchange do
           ch.exchange_declare("bunny.tests.exchanges.fanout", :direct, :auto_delete => false, :durable => true)
         }.to raise_error(Bunny::PreconditionFailed)
 
-        ch.should be_closed
+        expect(ch).to be_closed
         expect {
           ch.fanout("bunny.tests.exchanges.fanout", :auto_delete => true, :durable => false)
         }.to raise_error(Bunny::ChannelAlreadyClosed)
@@ -121,7 +121,7 @@ describe Bunny::Exchange do
 
         name = "bunny.tests.exchanges.direct"
         x    = ch.direct(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.exchange(name, :type => :direct)
 
@@ -136,7 +136,7 @@ describe Bunny::Exchange do
 
         name = "amq.direct"
         x    = ch.direct(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.close
       end
@@ -150,7 +150,7 @@ describe Bunny::Exchange do
 
         name = "bunny.tests.exchanges.topic"
         x    = ch.topic(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.exchange(name, :type => :topic)
 
@@ -165,7 +165,7 @@ describe Bunny::Exchange do
 
         name = "amq.topic"
         x    = ch.topic(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.close
       end
@@ -179,7 +179,7 @@ describe Bunny::Exchange do
 
         name = "bunny.tests.exchanges.headers"
         x    = ch.headers(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         x.delete
         ch.close
@@ -192,7 +192,7 @@ describe Bunny::Exchange do
 
         name = "amq.match"
         x    = ch.headers(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.close
       end
@@ -204,7 +204,7 @@ describe Bunny::Exchange do
 
         name = "amq.headers"
         x    = ch.headers(name)
-        x.name.should == name
+        expect(x.name).to eq name
 
         ch.close
       end
@@ -216,7 +216,7 @@ describe Bunny::Exchange do
     it "can be declared" do
       ch = connection.create_channel
       x  = ch.fanout("bunny.tests.exchanges.internal", :internal => true)
-      x.should be_internal
+      expect(x).to be_internal
       x.delete
 
       ch.close
@@ -227,7 +227,7 @@ describe Bunny::Exchange do
     it "is not internal" do
       ch = connection.create_channel
       x  = ch.fanout("bunny.tests.exchanges.non-internal")
-      x.should_not be_internal
+      expect(x).not_to be_internal
       x.delete
 
       ch.close

data/spec/higher_level_api/integration/exchange_delete_spec.rb

@@ -21,7 +21,7 @@ describe Bunny::Exchange, "#delete" do
       # no exception as of RabbitMQ 3.2. MK.
       x.delete
 
-      ch.exchanges.size.should == 0
+      expect(ch.exchanges.size).to eq 0
     end
   end
 
@@ -43,7 +43,7 @@ describe Bunny::Exchange, "#delete" do
       ch = connection.create_channel
       x  = ch.direct('amq.direct')
 
-      x.delete.should == nil
+      expect(x.delete).to eq nil
     end
   end
 
@@ -52,7 +52,7 @@ describe Bunny::Exchange, "#delete" do
       ch = connection.create_channel
       x  = ch.fanout('amq.fanout')
 
-      x.delete.should == nil
+      expect(x.delete).to eq nil
     end
   end
 
@@ -61,7 +61,7 @@ describe Bunny::Exchange, "#delete" do
       ch = connection.create_channel
       x  = ch.topic('amq.topic')
 
-      x.delete.should == nil
+      expect(x.delete).to eq nil
     end
   end
 
@@ -70,7 +70,7 @@ describe Bunny::Exchange, "#delete" do
       ch = connection.create_channel
       x  = ch.headers('amq.headers')
 
-      x.delete.should == nil
+      expect(x.delete).to eq nil
     end
   end
 
@@ -79,7 +79,7 @@ describe Bunny::Exchange, "#delete" do
       ch = connection.create_channel
       x  = ch.headers('amq.match')
 
-      x.delete.should == nil
+      expect(x.delete).to eq nil
     end
   end
 
@@ -89,16 +89,16 @@ describe Bunny::Exchange, "#delete" do
       it "returns true" do
         ch = connection.create_channel
 
-        connection.exchange_exists?("amq.fanout").should be_true
-        connection.exchange_exists?("amq.direct").should be_true
-        connection.exchange_exists?("amq.topic").should be_true
-        connection.exchange_exists?("amq.match").should be_true
+        expect(connection.exchange_exists?("amq.fanout")).to eq true
+        expect(connection.exchange_exists?("amq.direct")).to eq true
+        expect(connection.exchange_exists?("amq.topic")).to eq true
+        expect(connection.exchange_exists?("amq.match")).to eq true
       end
     end
 
     context "when a exchange DOES NOT exist" do
       it "returns false" do
-        connection.exchange_exists?("suf89u9a4jo3ndnakls##{Time.now.to_i}").should be_false
+        expect(connection.exchange_exists?("suf89u9a4jo3ndnakls##{Time.now.to_i}")).to eq false
       end
     end
   end

data/spec/higher_level_api/integration/exchange_unbind_spec.rb

@@ -24,14 +24,14 @@ describe Bunny::Exchange do
     source.publish("")
     sleep 0.5
 
-    queue.message_count.should be == 1
+    expect(queue.message_count).to eq 1
     queue.pop(:manual_ack => true)
 
     destination.unbind(source)
     source.publish("")
     sleep 0.5
 
-    queue.message_count.should be == 0
+    expect(queue.message_count).to eq 0
 
     source.delete
     destination.delete

data/spec/higher_level_api/integration/merry_go_round_spec.rb

@@ -79,7 +79,7 @@ describe "A message that is proxied by multiple intermediate consumers" do
     puts "About to sleep for #{t} seconds..."
     sleep(t)
 
-    xs.size.should == n
-    xs.last.should == "msg #{n - 1}"
+    expect(xs.size).to eq n
+    expect(xs.last).to eq "msg #{n - 1}"
   end
 end

data/spec/higher_level_api/integration/message_properties_access_spec.rb

@@ -57,38 +57,38 @@ describe Bunny::Queue, "#subscribe" do
 
     sleep 0.7
 
-    metadata.content_type.should == "application/octet-stream"
-    metadata.priority.should     == 8
+    expect(metadata.content_type).to eq "application/octet-stream"
+    expect(metadata.priority).to     eq 8
 
     time = metadata.headers["time"]
-    time.year.should == @now.year
-    time.month.should == @now.month
-    time.day.should == @now.day
-    time.hour.should == @now.hour
-    time.min.should == @now.min
-    time.sec.should == @now.sec
+    expect(time.year).to eq @now.year
+    expect(time.month).to eq @now.month
+    expect(time.day).to eq @now.day
+    expect(time.hour).to eq @now.hour
+    expect(time.min).to eq @now.min
+    expect(time.sec).to eq @now.sec
 
-    metadata.headers["coordinates"]["latitude"].should == 59.35
-    metadata.headers["participants"].should == 11
-    metadata.headers["venue"].should == "Stockholm"
-    metadata.headers["true_field"].should == true
-    metadata.headers["false_field"].should == false
-    metadata.headers["nil_field"].should be_nil
-    metadata.headers["ary_field"].should == ["one", 2.0, 3, [{ "abc" => 123}]]
+    expect(metadata.headers["coordinates"]["latitude"]).to eq 59.35
+    expect(metadata.headers["participants"]).to eq 11
+    expect(metadata.headers["venue"]).to eq "Stockholm"
+    expect(metadata.headers["true_field"]).to eq true
+    expect(metadata.headers["false_field"]).to eq false
+    expect(metadata.headers["nil_field"]).to be_nil
+    expect(metadata.headers["ary_field"]).to eq ["one", 2.0, 3, [{ "abc" => 123}]]
 
-    metadata.timestamp.should == Time.at(@now.to_i)
-    metadata.type.should == "kinda.checkin"
-    metadata.reply_to.should == "a.sender"
-    metadata.correlation_id.should == "r-1"
-    metadata.message_id.should == "m-1"
-    metadata.app_id.should == "bunny.example"
+    expect(metadata.timestamp).to eq Time.at(@now.to_i)
+    expect(metadata.type).to eq "kinda.checkin"
+    expect(metadata.reply_to).to eq "a.sender"
+    expect(metadata.correlation_id).to eq "r-1"
+    expect(metadata.message_id).to eq "m-1"
+    expect(metadata.app_id).to eq "bunny.example"
 
-    envelope.consumer_tag.should_not be_nil
-    envelope.consumer_tag.should_not be_empty
-    envelope.should_not be_redelivered
-    envelope.delivery_tag.should == 1
-    envelope.routing_key.should  == queue_name
-    envelope.exchange.should == ""
+    expect(envelope.consumer_tag).not_to be_nil
+    expect(envelope.consumer_tag).not_to be_empty
+    expect(envelope).not_to be_redelivered
+    expect(envelope.delivery_tag).to eq 1
+    expect(envelope.routing_key).to  eq queue_name
+    expect(envelope.exchange).to eq ""
 
     ch.close
   end