bunny 1.7.1 → 2.0.0.rc1

data/spec/higher_level_api/integration/predeclared_exchanges_spec.rb

@@ -16,7 +16,7 @@ describe "amq.* exchanges" do
 
     ["amq.fanout", "amq.direct", "amq.topic", "amq.match", "amq.headers"].each do |e|
       x = ch.exchange(e)
-      x.should be_predeclared
+      expect(x).to be_predeclared
     end
 
     ch.close

data/spec/higher_level_api/integration/publisher_confirms_spec.rb

@@ -11,10 +11,10 @@ describe Bunny::Channel do
     context "when publishing with confirms enabled" do
       it "increments delivery index" do
         ch = connection.create_channel
-        ch.should_not be_using_publisher_confirmations
+        expect(ch).not_to be_using_publisher_confirmations
 
         ch.confirm_select
-        ch.should be_using_publisher_confirmations
+        expect(ch).to be_using_publisher_confirmations
 
         q  = ch.queue("", :exclusive => true)
         x  = ch.default_exchange
@@ -23,11 +23,11 @@ describe Bunny::Channel do
           x.publish("xyzzy", :routing_key => q.name)
         end
 
-        ch.next_publish_seq_no.should == n + 1
-        ch.wait_for_confirms.should be_true
+        expect(ch.next_publish_seq_no).to eq n + 1
+        expect(ch.wait_for_confirms).to eq true
         sleep 0.25
 
-        q.message_count.should == n
+        expect(q.message_count).to eq n
         q.purge
 
         ch.close
@@ -36,10 +36,10 @@ describe Bunny::Channel do
       describe "#wait_for_confirms" do
         it "should not hang when all the publishes are confirmed" do
           ch = connection.create_channel
-          ch.should_not be_using_publisher_confirmations
+          expect(ch).not_to be_using_publisher_confirmations
 
           ch.confirm_select
-          ch.should be_using_publisher_confirmations
+          expect(ch).to be_using_publisher_confirmations
 
           q  = ch.queue("", :exclusive => true)
           x  = ch.default_exchange
@@ -48,14 +48,14 @@ describe Bunny::Channel do
             x.publish("xyzzy", :routing_key => q.name)
           end
 
-          ch.next_publish_seq_no.should == n + 1
-          ch.wait_for_confirms.should be_true
+          expect(ch.next_publish_seq_no).to eq n + 1
+          expect(ch.wait_for_confirms).to eq true
 
           sleep 0.25
 
           expect {
             Bunny::Timeout.timeout(2) do
-              ch.wait_for_confirms.should be_true
+              expect(ch.wait_for_confirms).to eq true
             end
           }.not_to raise_error
 
@@ -65,10 +65,10 @@ describe Bunny::Channel do
       context "when some of the messages get nacked" do
         it "puts the nacks in the nacked_set" do
           ch = connection.create_channel
-          ch.should_not be_using_publisher_confirmations
+          expect(ch).not_to be_using_publisher_confirmations
 
           ch.confirm_select
-          ch.should be_using_publisher_confirmations
+          expect(ch).to be_using_publisher_confirmations
 
           q  = ch.queue("", :exclusive => true)
           x  = ch.default_exchange
@@ -85,17 +85,17 @@ describe Bunny::Channel do
             ch.handle_ack_or_nack(nacked_tag, false, true)
           end
 
-          ch.nacked_set.should_not be_empty
-          ch.nacked_set.should include(nacked_tag)
+          expect(ch.nacked_set).not_to be_empty
+          expect(ch.nacked_set).to include(nacked_tag)
 
-          ch.next_publish_seq_no.should == n + 1
-          ch.wait_for_confirms.should be_false
+          expect(ch.next_publish_seq_no).to eq n + 1
+          expect(ch.wait_for_confirms).to eq false
 
-          ch.nacked_set.should_not be_empty
-          ch.nacked_set.should include(nacked_tag)
+          expect(ch.nacked_set).not_to be_empty
+          expect(ch.nacked_set).to include(nacked_tag)
 
           sleep 0.25
-          q.message_count.should == n
+          expect(q.message_count).to eq n
           q.purge
 
           ch.close

data/spec/higher_level_api/integration/publishing_edge_cases_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
@@ -49,10 +49,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
@@ -70,15 +70,15 @@ unless ENV["CI"]
         x.publish("", :routing_key => q.name, :persistent => false, :mandatory => true)
 
         sleep(0.5)
-        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 == 1
-        headers[:priority].should == 0
+        expect(headers[:content_type]).to eq "application/octet-stream"
+        expect(headers[:delivery_mode]).to eq 1
+        expect(headers[:priority]).to eq 0
 
         ch.close
       end

data/spec/higher_level_api/integration/queue_bind_spec.rb

@@ -10,9 +10,9 @@ describe "A client-named", Bunny::Queue do
   it "can be bound to a pre-declared exchange" do
     ch = connection.create_channel
     q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
-    q.should_not be_server_named
+    expect(q).not_to be_server_named
 
-    q.bind("amq.fanout").should == q
+    expect(q.bind("amq.fanout")).to eq q
 
     ch.close
   end
@@ -20,10 +20,10 @@ describe "A client-named", Bunny::Queue do
   it "can be unbound from a pre-declared exchange" do
     ch = connection.create_channel
     q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
-    q.should_not be_server_named
+    expect(q).not_to be_server_named
 
     q.bind("amq.fanout")
-    q.unbind("amq.fanout").should == q
+    expect(q.unbind("amq.fanout")).to eq q
 
     ch.close
   end
@@ -33,7 +33,7 @@ describe "A client-named", Bunny::Queue do
     q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
 
     x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
-    q.bind(x).should == q
+    expect(q.bind(x)).to eq q
 
     x.delete
     ch.close
@@ -42,12 +42,12 @@ describe "A client-named", Bunny::Queue do
   it "can be unbound from a custom exchange" do
     ch = connection.create_channel
     q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
-    q.should_not be_server_named
+    expect(q).not_to be_server_named
 
     x  = ch.fanout("bunny.tests.fanout", :auto_delete => true, :durable => false)
 
     q.bind(x)
-    q.unbind(x).should == q
+    expect(q.unbind(x)).to eq q
 
     ch.close
   end
@@ -65,9 +65,9 @@ describe "A server-named", Bunny::Queue do
   it "can be bound to a pre-declared exchange" do
     ch = connection.create_channel
     q  = ch.queue("", :exclusive => true)
-    q.should be_server_named
+    expect(q).to be_server_named
 
-    q.bind("amq.fanout").should == q
+    expect(q.bind("amq.fanout")).to eq q
 
     ch.close
   end
@@ -75,10 +75,10 @@ describe "A server-named", Bunny::Queue do
   it "can be unbound from a pre-declared exchange" do
     ch = connection.create_channel
     q  = ch.queue("", :exclusive => true)
-    q.should be_server_named
+    expect(q).to be_server_named
 
     q.bind("amq.fanout")
-    q.unbind("amq.fanout").should == q
+    expect(q.unbind("amq.fanout")).to eq q
 
     ch.close
   end
@@ -88,7 +88,7 @@ describe "A server-named", Bunny::Queue do
     q  = ch.queue("", :exclusive => true)
 
     x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
-    q.bind(x).should == q
+    expect(q.bind(x)).to eq q
 
     x.delete
     ch.close
@@ -101,7 +101,7 @@ describe "A server-named", Bunny::Queue do
     name = "bunny.tests.exchanges.fanout#{rand}"
     x    = ch.fanout(name)
     q.bind(x)
-    q.unbind(name).should == q
+    expect(q.unbind(name)).to eq q
 
     x.delete
     ch.close

data/spec/higher_level_api/integration/queue_declare_spec.rb

@@ -18,7 +18,7 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q    = ch.queue(name)
-      q.name.should == name
+      expect(q.name).to eq name
 
       q.delete
       ch.close
@@ -28,7 +28,7 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q = ch.queue(name)
-      ch.queue(name).object_id.should == q.object_id
+      expect(ch.queue(name).object_id).to eq q.object_id
 
       q.delete
       ch.close
@@ -41,9 +41,9 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q = ch.queue("")
-      q.name.should_not be_empty
-      q.name.should =~ /^amq.gen.+/
-      q.should be_server_named
+      expect(q.name).not_to be_empty
+      expect(q.name).to match /^amq.gen.+/
+      expect(q).to be_server_named
       q.delete
 
       ch.close
@@ -56,10 +56,10 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q = ch.queue("bunny.tests.queues.durable", :durable => true)
-      q.should be_durable
-      q.should_not be_auto_delete
-      q.should_not be_exclusive
-      q.arguments.should be_nil
+      expect(q).to be_durable
+      expect(q).not_to be_auto_delete
+      expect(q).not_to be_exclusive
+      expect(q.arguments).to be_nil
       q.delete
 
       ch.close
@@ -72,8 +72,8 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q = ch.queue("bunny.tests.queues.exclusive", :exclusive => true)
-      q.should be_exclusive
-      q.should_not be_durable
+      expect(q).to be_exclusive
+      expect(q).not_to be_durable
       q.delete
 
       ch.close
@@ -86,9 +86,9 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q = ch.queue("bunny.tests.queues.auto-delete", :auto_delete => true)
-      q.should be_auto_delete
-      q.should_not be_exclusive
-      q.should_not be_durable
+      expect(q).to be_auto_delete
+      expect(q).not_to be_exclusive
+      expect(q).not_to be_durable
       q.delete
 
       ch.close
@@ -107,7 +107,7 @@ describe Bunny::Queue do
         ch.queue_declare("bunny.tests.queues.auto-delete", :auto_delete => false, :durable => true)
       }.to raise_error(Bunny::PreconditionFailed)
 
-      ch.should be_closed
+      expect(ch).to be_closed
     end
   end
 
@@ -122,14 +122,14 @@ describe Bunny::Queue do
       ch   = connection.create_channel
 
       q = ch.queue("bunny.tests.queues.with-arguments.ttl", :arguments => args, :exclusive => true)
-      q.arguments.should == args
+      expect(q.arguments).to eq args
 
       q.publish("xyzzy")
       sleep 0.1
 
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       sleep 1.5
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       ch.close
     end
@@ -142,13 +142,13 @@ describe Bunny::Queue do
         ch = connection.create_channel
         q  = ch.queue("", :exlusive => true)
 
-        connection.queue_exists?(q.name).should be_true
+        expect(connection.queue_exists?(q.name)).to eq true
       end
     end
 
     context "when a queue DOES NOT exist" do
       it "returns false" do
-        connection.queue_exists?("suf89u9a4jo3ndnakls##{Time.now.to_i}").should be_false
+        expect(connection.queue_exists?("suf89u9a4jo3ndnakls##{Time.now.to_i}")).to eq false
       end
     end
   end
@@ -169,18 +169,18 @@ describe Bunny::Queue do
         ch   = connection.create_channel
 
         q = ch.queue("bunny.tests.queues.with-arguments.max-length", :arguments => args, :exclusive => true)
-        q.arguments.should == args
+        expect(q.arguments).to eq args
 
         (n * 10).times do
           q.publish("xyzzy")
         end
 
-        q.message_count.should == n
+        expect(q.message_count).to eq n
         (n * 5).times do
           q.publish("xyzzy")
         end
 
-        q.message_count.should == n
+        expect(q.message_count).to eq n
         q.delete
 
         ch.close

data/spec/higher_level_api/integration/queue_delete_spec.rb

@@ -22,7 +22,7 @@ describe Bunny::Queue, "#delete" do
       # no exception as of RabbitMQ 3.2. MK.
       q.delete
 
-      ch.queues.size.should == 0
+      expect(ch.queues.size).to eq 0
     end
   end
 

data/spec/higher_level_api/integration/queue_purge_spec.rb

@@ -21,9 +21,9 @@ describe Bunny::Queue do
     x.publish("xyzzy", :routing_key => q.name)
     sleep(0.5)
 
-    q.message_count.should == 1
+    expect(q.message_count).to eq 1
     q.purge
-    q.message_count.should == 0
+    expect(q.message_count).to eq 0
 
     ch.close
   end

data/spec/higher_level_api/integration/queue_unbind_spec.rb

@@ -19,12 +19,12 @@ describe Bunny::Queue, "bound to an exchange" do
 
     x.publish("")
     sleep 0.3
-    q.message_count.should == 1
+    expect(q.message_count).to eq 1
 
     q.unbind(x)
 
     x.publish("")
-    q.message_count.should == 1
+    expect(q.message_count).to eq 1
   end
 end
 

data/spec/higher_level_api/integration/read_only_consumer_spec.rb

@@ -49,10 +49,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

data/spec/higher_level_api/integration/sender_selected_distribution_spec.rb

@@ -26,10 +26,10 @@ describe "Sender-selected distribution" do
 
     sleep 0.5
 
-    q1.message_count.should == n
-    q2.message_count.should == n
-    q3.message_count.should == n
-    q4.message_count.should be_zero
+    expect(q1.message_count).to eq n
+    expect(q2.message_count).to eq n
+    expect(q3.message_count).to eq n
+    expect(q4.message_count).to be_zero
 
     x.delete
   end

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 unless ENV["CI"]
   shared_examples_for "successful TLS connection" do
     it "succeeds" do
-      connection.should be_tls
+      expect(connection).to be_tls
       ch = connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
@@ -16,15 +16,15 @@ unless ENV["CI"]
         publish("xyzzy", :routing_key => q.name)
 
       sleep 0.5
-      q.message_count.should == 4
+      expect(q.message_count).to eq 4
 
       i = 0
       q.subscribe do |delivery_info, _, payload|
         i += 1
       end
       sleep 1.0
-      i.should == 4
-      q.message_count.should == 0
+      expect(i).to eq 4
+      expect(q.message_count).to eq 0
 
       ch.close
     end
@@ -150,7 +150,7 @@ unless ENV["CI"]
     include_examples "successful TLS connection"
 
     it "connects using TLSv1" do
-      connection.transport.socket.ssl_version.should == "TLSv1"
+      expect(connection.transport.socket.ssl_version).to eq "TLSv1"
     end
   end
 end