punchblock 2.5.2 → 2.5.3

data/spec/punchblock/event/answered_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   class Event
     describe Answered do
       it 'registers itself' do
-        RayoNode.class_from_registration(:answered, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:answered, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -25,19 +25,29 @@ module Punchblock
         it { should be_instance_of described_class }
 
         it_should_behave_like 'event'
-        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) { '<answered 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
       end
     end
   end

data/spec/punchblock/event/asterisk/ami/event_spec.rb

@@ -8,7 +8,7 @@ module Punchblock
       module AMI
         describe Event do
           it 'registers itself' do
-            RayoNode.class_from_registration(:event, 'urn:xmpp:rayo:asterisk:ami:1').should be == described_class
+            expect(RayoNode.class_from_registration(:event, 'urn:xmpp:rayo:asterisk:ami:1')).to eq(described_class)
           end
 
           describe "from a stanza" do
@@ -27,9 +27,20 @@ module Punchblock
 
             it_should_behave_like 'event'
 
-            its(:name)    { should be == 'Newchannel' }
-            its(:headers) { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
-            its(:attributes) { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} } # For BC
+            describe '#name' do
+              subject { super().name }
+              it { should be == 'Newchannel' }
+            end
+
+            describe '#headers' do
+              subject { super().headers }
+              it { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
+            end
+
+            describe '#attributes' do
+              subject { super().attributes }
+              it { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
+            end # For BC
           end
 
           describe "when setting options in initializer" do
@@ -38,17 +49,28 @@ module Punchblock
                                   headers: {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'}
             end
 
-            its(:name)    { should be == 'Newchannel' }
-            its(:headers) { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
-            its(:attributes) { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} } # For BC
+            describe '#name' do
+              subject { super().name }
+              it { should be == 'Newchannel' }
+            end
+
+            describe '#headers' do
+              subject { super().headers }
+              it { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
+            end
+
+            describe '#attributes' do
+              subject { super().attributes }
+              it { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
+            end # For BC
 
             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.name.should == 'Newchannel'
-                new_instance.headers.should == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'}
-                new_instance.attributes.should == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} # For BC
+                expect(new_instance).to be_instance_of described_class
+                expect(new_instance.name).to eq('Newchannel')
+                expect(new_instance.headers).to eq({'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'})
+                expect(new_instance.attributes).to eq({'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'}) # For BC
               end
 
               it "should render to a parent node if supplied" do
@@ -56,7 +78,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/event/complete_spec.rb

@@ -6,17 +6,18 @@ module Punchblock
   class Event
     describe Complete do
       it 'registers itself' do
-        RayoNode.class_from_registration(:complete, 'urn:xmpp:rayo:ext:1').should be == described_class
+        expect(RayoNode.class_from_registration(:complete, 'urn:xmpp:rayo:ext:1')).to eq(described_class)
       end
 
       describe "setting a reason" do
         let(:reason) { Complete::Stop.new }
 
-        subject { described_class.new }
-
-        before { subject.reason = reason }
-
-        its(:reason) { should == reason }
+        describe '#reason' do
+          it "should set the reason" do
+            subject.reason = reason
+            subject.reason.should == reason
+          end
+        end
       end
 
       describe "comparing for equality" do
@@ -38,7 +39,7 @@ module Punchblock
           let(:component_id)  { 'abcd' }
 
           it "should be equal" do
-            subject.should be == other_complete
+            expect(subject).to eq(other_complete)
           end
         end
 
@@ -48,7 +49,7 @@ module Punchblock
           let(:component_id)  { 'abcd' }
 
           it "should not be equal" do
-            subject.should_not be == other_complete
+            expect(subject).not_to eq(other_complete)
           end
         end
 
@@ -58,7 +59,7 @@ module Punchblock
           let(:component_id)  { 'abcd' }
 
           it "should not be equal" do
-            subject.should_not be == other_complete
+            expect(subject).not_to eq(other_complete)
           end
         end
 
@@ -68,7 +69,7 @@ module Punchblock
           let(:component_id)  { 'efgh' }
 
           it "should not be equal" do
-            subject.should_not be == other_complete
+            expect(subject).not_to eq(other_complete)
           end
         end
       end
@@ -88,7 +89,10 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:reason) { should be_instance_of Complete::Stop }
+        describe '#reason' do
+          subject { super().reason }
+          it { should be_instance_of Complete::Stop }
+        end
       end
     end
 
@@ -105,7 +109,10 @@ module Punchblock
 
       it { should be_instance_of Complete::Stop }
 
-      its(:name) { should be == :stop }
+      describe '#name' do
+        subject { super().name }
+        it { should be == :stop }
+      end
     end
 
     describe Complete::Hangup do
@@ -121,7 +128,10 @@ module Punchblock
 
       it { should be_instance_of Complete::Hangup }
 
-      its(:name) { should be == :hangup }
+      describe '#name' do
+        subject { super().name }
+        it { should be == :hangup }
+      end
     end
 
     describe Complete::Error do
@@ -139,15 +149,25 @@ module Punchblock
 
       it { should be_instance_of Complete::Error }
 
-      its(:name) { should be == :error }
-      its(:details) { should be == "Something really bad happened" }
+      describe '#name' do
+        subject { super().name }
+        it { should be == :error }
+      end
+
+      describe '#details' do
+        subject { super().details }
+        it { should be == "Something really bad happened" }
+      end
 
       describe "when setting options in initializer" do
         subject do
           Complete::Error.new :details => 'Ooops'
         end
 
-        its(:details) { should be == 'Ooops' }
+        describe '#details' do
+          subject { super().details }
+          it { should be == 'Ooops' }
+        end
       end
     end
 

data/spec/punchblock/event/dtmf_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   class Event
     describe DTMF do
       it 'registers itself' do
-        RayoNode.class_from_registration(:dtmf, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:dtmf, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -18,7 +18,10 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:signal) { should be == '#' }
+        describe '#signal' do
+          subject { super().signal }
+          it { should be == '#' }
+        end
       end
 
       describe "when setting options in initializer" do
@@ -26,7 +29,10 @@ module Punchblock
           described_class.new :signal => '#'
         end
 
-        its(:signal) { should be == '#' }
+        describe '#signal' do
+          subject { super().signal }
+          it { should be == '#' }
+        end
       end
     end
   end

data/spec/punchblock/event/end_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   class Event
     describe End do
       it 'registers itself' do
-        RayoNode.class_from_registration(:end, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:end, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -27,16 +27,38 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:reason) { should be == :timeout }
-        its(:platform_code) { should be == '18' }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#reason' do
+          subject { super().reason }
+          it { should be == :timeout }
+        end
+
+        describe '#platform_code' do
+          subject { super().platform_code }
+          it { should be == '18' }
+        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) { '<end xmlns="urn:xmpp:rayo:1"/>' }
 
-          its(:reason) { should be_nil}
-          its(:platform_code) { should be_nil }
-          its(:headers) { should == {} }
+          describe '#reason' do
+            subject { super().reason }
+            it { should be_nil}
+          end
+
+          describe '#platform_code' do
+            subject { super().platform_code }
+            it { should be_nil }
+          end
+
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {} }
+          end
         end
       end
 
@@ -47,9 +69,20 @@ module Punchblock
                               headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' }
         end
 
-        its(:reason) { should be == :hangup }
-        its(:platform_code) { should be == '18' }
-        its(:headers) { should be == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#reason' do
+          subject { super().reason }
+          it { should be == :hangup }
+        end
+
+        describe '#platform_code' do
+          subject { super().platform_code }
+          it { should be == '18' }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should be == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
       end
     end
   end

data/spec/punchblock/event/input_timers_started_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   class Event
     describe InputTimersStarted do
       it 'registers itself' do
-        RayoNode.class_from_registration(:'input-timers-started', 'urn:xmpp:rayo:prompt:1').should be == described_class
+        expect(RayoNode.class_from_registration(:'input-timers-started', 'urn:xmpp:rayo:prompt:1')).to eq(described_class)
       end
 
       describe "from a stanza" do

data/spec/punchblock/event/joined_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   class Event
     describe Joined do
       it 'registers itself' do
-        RayoNode.class_from_registration(:joined, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:joined, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -18,17 +18,39 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:call_uri)    { should be == 'b' }
-        its(:call_id)     { should be == 'b' }
-        its(:mixer_name)  { should be == 'm' }
+        describe '#call_uri' do
+          subject { super().call_uri }
+          it { should be == 'b' }
+        end
+
+        describe '#call_id' do
+          subject { super().call_id }
+          it { should be == 'b' }
+        end
+
+        describe '#mixer_name' do
+          subject { super().mixer_name }
+          it { should be == 'm' }
+        end
       end
 
       describe "when setting options in initializer" do
         subject { described_class.new :call_uri => 'abc123', :mixer_name => 'blah' }
 
-        its(:call_uri)    { should be == 'abc123' }
-        its(:call_id)     { should be == 'abc123' }
-        its(:mixer_name)  { should be == 'blah' }
+        describe '#call_uri' do
+          subject { super().call_uri }
+          it { should be == 'abc123' }
+        end
+
+        describe '#call_id' do
+          subject { super().call_id }
+          it { should be == 'abc123' }
+        end
+
+        describe '#mixer_name' do
+          subject { super().mixer_name }
+          it { should be == 'blah' }
+        end
       end
     end
   end

data/spec/punchblock/event/offer_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   class Event
     describe Offer do
       it 'registers itself' do
-        RayoNode.class_from_registration(:offer, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:offer, 'urn:xmpp:rayo:1')).to eq(described_class)
       end
 
       describe "from a stanza" do
@@ -28,14 +28,28 @@ module Punchblock
 
         it_should_behave_like 'event'
 
-        its(:to)      { should be == 'tel:+18003211212' }
-        its(:from)    { should be == 'tel:+13058881212' }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#to' do
+          subject { super().to }
+          it { should be == 'tel:+18003211212' }
+        end
+
+        describe '#from' do
+          subject { super().from }
+          it { should be == 'tel:+13058881212' }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         context "with no headers provided" do
           let(:stanza) { '<offer xmlns="urn:xmpp:rayo:1"/>' }
 
-          its(:headers) { should == {} }
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {} }
+          end
         end
 
         context "with multiple headers of the same name" do
@@ -51,7 +65,10 @@ module Punchblock
             MESSAGE
           end
 
-          its(:headers) { should == {'X-skill' => ['sales', 'complaints']} }
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {'X-skill' => ['sales', 'complaints']} }
+          end
         end
       end
 
@@ -62,16 +79,30 @@ module Punchblock
                               headers: { 'X-skill' => 'agent', 'X-customer-id' => '8877' }
         end
 
-        its(:to)    { should be == 'tel:+18003211212' }
-        its(:from)  { should be == 'tel:+13058881212' }
-        its(:headers) { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        describe '#to' do
+          subject { super().to }
+          it { should be == 'tel:+18003211212' }
+        end
+
+        describe '#from' do
+          subject { super().from }
+          it { should be == 'tel:+13058881212' }
+        end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should == { 'X-skill' => 'agent', 'X-customer-id' => '8877' } }
+        end
 
         context "with headers set to nil" do
           subject do
             described_class.new headers: nil
           end
 
-          its(:headers) { should == {} }
+          describe '#headers' do
+            subject { super().headers }
+            it { should == {} }
+          end
         end
       end
     end