punchblock 2.5.2 → 2.5.3

data/spec/punchblock/command/hangup_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   module Command
     describe Hangup do
       it 'registers itself' do
-        RayoNode.class_from_registration(:hangup, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:hangup, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -22,25 +22,35 @@ module Punchblock
         subject { RayoNode.from_xml parse_stanza(stanza).root, '9f00061', '1' }
 
         it { should be_instance_of described_class }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         context "with no headers provided" do
           let(:stanza) { '<hangup xmlns="urn:xmpp:rayo:1"/>' }
 
-          its(:headers) { should == {} }
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {} }
+          end
         end
       end
 
       describe "when setting options in initializer" do
         subject { described_class.new headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
 
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml subject.to_rayo
-            new_instance.should be_instance_of described_class
-            new_instance.headers.should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' }
+            expect(new_instance).to be_instance_of described_class
+            expect(new_instance.headers).to eq({ 'X-skill' => 'agent', 'X-customer-id' => '8877' })
           end
 
           it "should render to a parent node if supplied" do
@@ -48,7 +58,7 @@ module Punchblock
             parent = Nokogiri::XML::Node.new 'foo', doc
             doc.root = parent
             rayo_doc = subject.to_rayo(parent)
-            rayo_doc.should == parent
+            expect(rayo_doc).to eq(parent)
           end
         end
       end

data/spec/punchblock/command/join_spec.rb

@@ -6,31 +6,49 @@ module Punchblock
   module Command
     describe Join do
       it 'registers itself' do
-        RayoNode.class_from_registration(:join, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:join, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "when setting options in initializer" do
         subject { described_class.new :call_uri => 'abc123', :mixer_name => 'blah', :direction => :duplex, :media => :bridge }
 
-        its(:call_uri)    { should be == 'abc123' }
-        its(:mixer_name)  { should be == 'blah' }
-        its(:direction)   { should be == :duplex }
-        its(:media)       { should be == :bridge }
+        describe '#call_uri' do
+          subject { super().call_uri }
+          it { should be == 'abc123' }
+        end
+
+        describe '#mixer_name' do
+          subject { super().mixer_name }
+          it { should be == 'blah' }
+        end
+
+        describe '#direction' do
+          subject { super().direction }
+          it { should be == :duplex }
+        end
+
+        describe '#media' do
+          subject { super().media }
+          it { should be == :bridge }
+        end
 
         context "with old call_id attribute" do
           subject { described_class.new call_id: 'abc123' }
 
-          its(:call_uri)  { should be == 'abc123' }
+          describe '#call_uri' do
+            subject { super().call_uri }
+            it { should be == 'abc123' }
+          end
         end
 
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml subject.to_rayo
-            new_instance.should be_instance_of described_class
-            new_instance.call_uri.should == 'abc123'
-            new_instance.mixer_name.should == 'blah'
-            new_instance.direction.should == :duplex
-            new_instance.media.should == :bridge
+            expect(new_instance).to be_instance_of described_class
+            expect(new_instance.call_uri).to eq('abc123')
+            expect(new_instance.mixer_name).to eq('blah')
+            expect(new_instance.direction).to eq(:duplex)
+            expect(new_instance.media).to eq(:bridge)
           end
 
           it "should render to a parent node if supplied" do
@@ -38,15 +56,15 @@ module Punchblock
             parent = Nokogiri::XML::Node.new 'foo', doc
             doc.root = parent
             rayo_doc = subject.to_rayo(parent)
-            rayo_doc.should == parent
+            expect(rayo_doc).to eq(parent)
           end
 
           context "when attributes are not set" do
             subject { described_class.new call_uri: 'abc123' }
 
             it "should not include them in the XML representation" do
-              subject.to_rayo['call-uri'].should == 'abc123'
-              subject.to_rayo['mixer-name'].should be_nil
+              expect(subject.to_rayo['call-uri']).to eq('abc123')
+              expect(subject.to_rayo['mixer-name']).to be_nil
             end
           end
         end
@@ -67,18 +85,48 @@ module Punchblock
 
         it { should be_instance_of described_class }
 
-        its(:call_uri)    { should be == 'abc123' }
-        its(:mixer_name)  { should be == 'blah' }
-        its(:direction)   { should be == :duplex }
-        its(:media)       { should be == :bridge }
+        describe '#call_uri' do
+          subject { super().call_uri }
+          it { should be == 'abc123' }
+        end
+
+        describe '#mixer_name' do
+          subject { super().mixer_name }
+          it { should be == 'blah' }
+        end
+
+        describe '#direction' do
+          subject { super().direction }
+          it { should be == :duplex }
+        end
+
+        describe '#media' do
+          subject { super().media }
+          it { should be == :bridge }
+        end
 
         context "when no attributes are set" do
           let(:stanza) { '<join xmlns="urn:xmpp:rayo:1" />' }
 
-          its(:call_uri)    { should be_nil }
-          its(:mixer_name)  { should be_nil }
-          its(:direction)   { should be_nil }
-          its(:media)       { should be_nil }
+          describe '#call_uri' do
+            subject { super().call_uri }
+            it { should be_nil }
+          end
+
+          describe '#mixer_name' do
+            subject { super().mixer_name }
+            it { should be_nil }
+          end
+
+          describe '#direction' do
+            subject { super().direction }
+            it { should be_nil }
+          end
+
+          describe '#media' do
+            subject { super().media }
+            it { should be_nil }
+          end
         end
       end
 
@@ -87,14 +135,20 @@ module Punchblock
           describe direction do
             subject { described_class.new :direction => direction }
 
-            its(:direction) { should be == direction }
+            describe '#direction' do
+              subject { super().direction }
+              it { should be == direction }
+            end
           end
         end
 
         describe "no direction" do
           subject { described_class.new }
 
-          its(:direction) { should be_nil }
+          describe '#direction' do
+            subject { super().direction }
+            it { should be_nil }
+          end
         end
 
         describe "blahblahblah" do

data/spec/punchblock/command/mute_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   module Command
     describe Mute do
       it 'registers itself' do
-        RayoNode.class_from_registration(:mute, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:mute, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -20,7 +20,7 @@ module Punchblock
       describe "exporting to Rayo" do
         it "should export to XML that can be understood by its parser" do
           new_instance = RayoNode.from_xml subject.to_rayo
-          new_instance.should be_instance_of described_class
+          expect(new_instance).to be_instance_of described_class
         end
 
         it "should render to a parent node if supplied" do
@@ -28,7 +28,7 @@ module Punchblock
           parent = Nokogiri::XML::Node.new 'foo', doc
           doc.root = parent
           rayo_doc = subject.to_rayo(parent)
-          rayo_doc.should == parent
+          expect(rayo_doc).to eq(parent)
         end
       end
     end

data/spec/punchblock/command/redirect_spec.rb

@@ -6,21 +6,28 @@ module Punchblock
   module Command
     describe Redirect do
       it 'registers itself' do
-        RayoNode.class_from_registration(:redirect, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:redirect, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "when setting options in initializer" do
         subject { described_class.new to: 'tel:+14045551234', headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
 
-        its(:to) { should be == 'tel:+14045551234' }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#to' do
+          subject { super().to }
+          it { should be == 'tel:+14045551234' }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml subject.to_rayo
-            new_instance.should be_instance_of described_class
-            new_instance.to.should == 'tel:+14045551234'
-            new_instance.headers.should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' }
+            expect(new_instance).to be_instance_of described_class
+            expect(new_instance.to).to eq('tel:+14045551234')
+            expect(new_instance.headers).to eq({ 'X-skill' => 'agent', 'X-customer-id' => '8877' })
           end
 
           it "should render to a parent node if supplied" do
@@ -28,14 +35,14 @@ module Punchblock
             parent = Nokogiri::XML::Node.new 'foo', doc
             doc.root = parent
             rayo_doc = subject.to_rayo(parent)
-            rayo_doc.should == parent
+            expect(rayo_doc).to eq(parent)
           end
 
           context "when attributes are not set" do
             subject { described_class.new }
 
             it "should not include them in the XML representation" do
-              subject.to_rayo['to'].should be_nil
+              expect(subject.to_rayo['to']).to be_nil
             end
           end
         end
@@ -57,14 +64,28 @@ module Punchblock
 
         it { should be_instance_of described_class }
 
-        its(:to) { should be == 'tel:+14045551234' }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#to' do
+          subject { super().to }
+          it { should be == 'tel:+14045551234' }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         context "with no headers or to provided" do
           let(:stanza) { '<redirect xmlns="urn:xmpp:rayo:1"/>' }
 
-          its(:to) { should be_nil }
-          its(:headers) { should == {} }
+          describe '#to' do
+            subject { super().to }
+            it { should be_nil }
+          end
+
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {} }
+          end
         end
       end
     end # Redirect

data/spec/punchblock/command/reject_spec.rb

@@ -6,21 +6,28 @@ module Punchblock
   module Command
     describe Reject do
       it 'registers itself' do
-        RayoNode.class_from_registration(:reject, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:reject, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "when setting options in initializer" do
         subject { described_class.new reason: :busy, headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
 
-        its(:reason) { should be == :busy }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#reason' do
+          subject { super().reason }
+          it { should be == :busy }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml subject.to_rayo
-            new_instance.should be_instance_of described_class
-            new_instance.reason.should == :busy
-            new_instance.headers.should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' }
+            expect(new_instance).to be_instance_of described_class
+            expect(new_instance.reason).to eq(:busy)
+            expect(new_instance.headers).to eq({ 'X-skill' => 'agent', 'X-customer-id' => '8877' })
           end
 
           it "should render to a parent node if supplied" do
@@ -28,14 +35,14 @@ module Punchblock
             parent = Nokogiri::XML::Node.new 'foo', doc
             doc.root = parent
             rayo_doc = subject.to_rayo(parent)
-            rayo_doc.should == parent
+            expect(rayo_doc).to eq(parent)
           end
 
           context "when attributes are not set" do
             subject { described_class.new }
 
             it "should not include them in the XML representation" do
-              subject.to_rayo.children.count.should == 0
+              expect(subject.to_rayo.children.count).to eq(0)
             end
           end
         end
@@ -57,14 +64,28 @@ module Punchblock
 
         it { should be_instance_of described_class }
 
-        its(:reason) { should be == :busy }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#reason' do
+          subject { super().reason }
+          it { should be == :busy }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         context "with no headers or reason provided" do
           let(:stanza) { '<reject xmlns="urn:xmpp:rayo:1"/>' }
 
-          its(:reason) { should be_nil }
-          its(:headers) { should == {} }
+          describe '#reason' do
+            subject { super().reason }
+            it { should be_nil }
+          end
+
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {} }
+          end
         end
       end
 
@@ -73,14 +94,20 @@ module Punchblock
           describe reason do
             subject { described_class.new :reason => reason }
 
-            its(:reason) { should be == reason }
+            describe '#reason' do
+              subject { super().reason }
+              it { should be == reason }
+            end
           end
         end
 
         describe "no reason" do
           subject { described_class.new }
 
-          its(:reason) { should be_nil }
+          describe '#reason' do
+            subject { super().reason }
+            it { should be_nil }
+          end
         end
 
         describe "blahblahblah" do

data/spec/punchblock/command/unjoin_spec.rb

@@ -6,27 +6,37 @@ module Punchblock
   module Command
     describe Unjoin do
       it 'registers itself' do
-        RayoNode.class_from_registration(:unjoin, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:unjoin, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "when setting options in initializer" do
         subject { Unjoin.new :call_uri => 'abc123', :mixer_name => 'blah' }
 
-        its(:call_uri)    { should be == 'abc123' }
-        its(:mixer_name)  { should be == 'blah' }
+        describe '#call_uri' do
+          subject { super().call_uri }
+          it { should be == 'abc123' }
+        end
+
+        describe '#mixer_name' do
+          subject { super().mixer_name }
+          it { should be == 'blah' }
+        end
 
         context "with old call_id attribute" do
           subject { described_class.new call_id: 'abc123' }
 
-          its(:call_uri)  { should be == 'abc123' }
+          describe '#call_uri' do
+            subject { super().call_uri }
+            it { should be == 'abc123' }
+          end
         end
 
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml subject.to_rayo
-            new_instance.should be_instance_of described_class
-            new_instance.call_uri.should == 'abc123'
-            new_instance.mixer_name.should == 'blah'
+            expect(new_instance).to be_instance_of described_class
+            expect(new_instance.call_uri).to eq('abc123')
+            expect(new_instance.mixer_name).to eq('blah')
           end
 
           it "should render to a parent node if supplied" do
@@ -34,15 +44,15 @@ module Punchblock
             parent = Nokogiri::XML::Node.new 'foo', doc
             doc.root = parent
             rayo_doc = subject.to_rayo(parent)
-            rayo_doc.should == parent
+            expect(rayo_doc).to eq(parent)
           end
 
           context "when attributes are not set" do
             subject { described_class.new call_uri: 'abc123' }
 
             it "should not include them in the XML representation" do
-              subject.to_rayo['call-uri'].should == 'abc123'
-              subject.to_rayo['mixer-name'].should be_nil
+              expect(subject.to_rayo['call-uri']).to eq('abc123')
+              expect(subject.to_rayo['mixer-name']).to be_nil
             end
           end
         end
@@ -61,8 +71,15 @@ module Punchblock
 
         it { should be_instance_of described_class }
 
-        its(:call_uri)    { should be == 'abc123' }
-        its(:mixer_name)  { should be == 'blah' }
+        describe '#call_uri' do
+          subject { super().call_uri }
+          it { should be == 'abc123' }
+        end
+
+        describe '#mixer_name' do
+          subject { super().mixer_name }
+          it { should be == 'blah' }
+        end
       end
     end
   end