punchblock 2.5.2 → 2.5.3

data/spec/punchblock/command/unmute_spec.rb

@@ -6,7 +6,7 @@ module Punchblock
   module Command
     describe Unmute do
       it 'registers itself' do
-        RayoNode.class_from_registration(:unmute, 'urn:xmpp:rayo:1').should be == described_class
+        expect(RayoNode.class_from_registration(:unmute, '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_node_spec.rb

@@ -6,12 +6,19 @@ module Punchblock
   module Command
     describe CommandNode do
       let(:args) { [] }
-      subject do
+      subject(:command) do
         Class.new(described_class) { register 'foo'}.new(*args)
       end
 
-      its(:state_name) { should be == :new }
-      its(:request_id) { should be == @uuid }
+      describe '#state_name' do
+        subject { super().state_name }
+        it { should be == :new }
+      end
+
+      describe '#request_id' do
+        subject { super().request_id }
+        it { should be == @uuid }
+      end
 
       describe "#new" do
         describe "with a call/component ID" do
@@ -19,62 +26,78 @@ module Punchblock
           let(:component_id)  { 'abc123' }
           let(:args)          { [{:target_call_id => call_id, :component_id => component_id}] }
 
-          its(:target_call_id)  { should be == call_id }
-          its(:component_id)    { should be == component_id }
+          describe '#target_call_id' do
+            subject { super().target_call_id }
+            it { should be == call_id }
+          end
+
+          describe '#component_id' do
+            subject { super().component_id }
+            it { should be == component_id }
+          end
         end
       end
 
       describe "#request!" do
-        before { subject.request! }
+        before { command.request! }
 
-        its(:state_name) { should be == :requested }
+        describe '#state_name' do
+          subject { command.state_name }
+          it { should be == :requested }
+        end
 
         it "should raise a StateMachine::InvalidTransition when received a second time" do
-          lambda { subject.request! }.should raise_error(StateMachine::InvalidTransition)
+          expect { command.request! }.to raise_error(StateMachine::InvalidTransition)
         end
       end
 
       describe "#execute!" do
         describe "without sending" do
           it "should raise a StateMachine::InvalidTransition" do
-            lambda { subject.execute! }.should raise_error(StateMachine::InvalidTransition)
+            expect { subject.execute! }.to raise_error(StateMachine::InvalidTransition)
           end
         end
 
         describe "after sending" do
           before do
-            subject.request!
-            subject.execute!
+            command.request!
+            command.execute!
           end
 
-          its(:state_name) { should be == :executing }
+          describe '#state_name' do
+            subject { super().state_name }
+            it { should be == :executing }
+          end
         end
       end
 
       describe "#complete!" do
         before do
-          subject.request!
-          subject.execute!
-          subject.complete!
+          command.request!
+          command.execute!
+          command.complete!
         end
 
-        its(:state_name) { should be == :complete }
+        describe '#state_name' do
+          subject { super().state_name }
+          it { should be == :complete }
+        end
 
         it "should raise a StateMachine::InvalidTransition when received a second time" do
-          lambda { subject.complete! }.should raise_error(StateMachine::InvalidTransition)
+          expect { subject.complete! }.to raise_error(StateMachine::InvalidTransition)
         end
       end # #complete!
 
       describe "#response=" do
         it "should set the command to executing status" do
-          subject.should_receive(:execute!).once
+          expect(subject).to receive(:execute!).once
           subject.response = :foo
         end
 
         it "should be a no-op if the response has already been set" do
-          subject.should_receive(:execute!).once
+          expect(subject).to receive(:execute!).once
           subject.response = :foo
-          lambda { subject.response = :bar }.should_not raise_error
+          expect { subject.response = :bar }.not_to raise_error
         end
       end
     end # CommandNode

data/spec/punchblock/component/asterisk/agi/command_spec.rb

@@ -8,7 +8,7 @@ module Punchblock
       module AGI
         describe Command do
           it 'registers itself' do
-            RayoNode.class_from_registration(:command, 'urn:xmpp:rayo:asterisk:agi:1').should be == described_class
+            expect(RayoNode.class_from_registration(:command, 'urn:xmpp:rayo:asterisk:agi:1')).to eq(described_class)
           end
 
           describe "from a stanza" do
@@ -26,8 +26,15 @@ module Punchblock
 
             it_should_behave_like 'event'
 
-            its(:name)    { should be == 'GET VARIABLE' }
-            its(:params)  { should be == ['UNIQUEID'] }
+            describe '#name' do
+              subject { super().name }
+              it { should be == 'GET VARIABLE' }
+            end
+
+            describe '#params' do
+              subject { super().params }
+              it { should be == ['UNIQUEID'] }
+            end
           end
 
           describe "when setting options in initializer" do
@@ -36,8 +43,15 @@ module Punchblock
                                   params: ['UNIQUEID']
             end
 
-            its(:name)    { should be == 'GET VARIABLE' }
-            its(:params)  { should be == ['UNIQUEID'] }
+            describe '#name' do
+              subject { super().name }
+              it { should be == 'GET VARIABLE' }
+            end
+
+            describe '#params' do
+              subject { super().params }
+              it { should be == ['UNIQUEID'] }
+            end
           end
 
           class Command
@@ -58,19 +72,45 @@ module Punchblock
 
               it { should be_instance_of described_class }
 
-              its(:name)    { should be == :success }
-              its(:code)    { should be == 200 }
-              its(:result)  { should be == 0 }
-              its(:data)    { should be == '1187188485.0' }
+              describe '#name' do
+                subject { super().name }
+                it { should be == :success }
+              end
+
+              describe '#code' do
+                subject { super().code }
+                it { should be == 200 }
+              end
+
+              describe '#result' do
+                subject { super().result }
+                it { should be == 0 }
+              end
+
+              describe '#data' do
+                subject { super().data }
+                it { should be == '1187188485.0' }
+              end
 
               describe "when setting options in initializer" do
                 subject do
                   Complete::Success.new code: 200, result: 0, data: '1187188485.0'
                 end
 
-                its(:code)    { should be == 200 }
-                its(:result)  { should be == 0 }
-                its(:data)    { should be == '1187188485.0' }
+                describe '#code' do
+                  subject { super().code }
+                  it { should be == 200 }
+                end
+
+                describe '#result' do
+                  subject { super().result }
+                  it { should be == 0 }
+                end
+
+                describe '#data' do
+                  subject { super().data }
+                  it { should be == '1187188485.0' }
+                end
               end
             end
           end

data/spec/punchblock/component/asterisk/ami/action_spec.rb

@@ -8,7 +8,7 @@ module Punchblock
       module AMI
         describe Action do
           it 'registers itself' do
-            RayoNode.class_from_registration(:action, 'urn:xmpp:rayo:asterisk:ami:1').should be == described_class
+            expect(RayoNode.class_from_registration(:action, 'urn:xmpp:rayo:asterisk:ami:1')).to eq(described_class)
           end
 
           describe "from a stanza" do
@@ -33,8 +33,14 @@ module Punchblock
 
             it_should_behave_like 'event'
 
-            its(:name)    { should be == 'Originate' }
-            its(:params)  { should be == { 'Channel'   => 'SIP/101test',
+            describe '#name' do
+              subject { super().name }
+              it { should be == 'Originate' }
+            end
+
+            describe '#params' do
+              subject { super().params }
+              it { should be == { 'Channel'   => 'SIP/101test',
                                            'Context'   => 'default',
                                            'Exten'     => '8135551212',
                                            'Priority'  => '1',
@@ -42,24 +48,25 @@ module Punchblock
                                            'Timeout'   => '30000',
                                            'Variable'  => 'var1=23|var2=24|var3=25',
                                            'Async'     => '1'} }
+            end
           end
 
           describe "testing equality" do
             context "with the same name and params" do
               it "should be equal" do
-                Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' }).should be == Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' })
+                expect(Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' })).to eq(Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' }))
               end
             end
 
             context "with the same name and different params" do
               it "should be equal" do
-                Action.new(:name => 'Originate', :params => { :channel => 'SIP/101' }).should_not be == Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' })
+                expect(Action.new(:name => 'Originate', :params => { :channel => 'SIP/101' })).not_to eq(Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' }))
               end
             end
 
             context "with a different name and the same params" do
               it "should be equal" do
-                Action.new(:name => 'Hangup', :params => { :channel => 'SIP/101test' }).should_not be == Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' })
+                expect(Action.new(:name => 'Hangup', :params => { :channel => 'SIP/101test' })).not_to eq(Action.new(:name => 'Originate', :params => { :channel => 'SIP/101test' }))
               end
             end
           end
@@ -70,15 +77,22 @@ module Punchblock
                                   :params => { 'Channel' => 'SIP/101test' }
             end
 
-            its(:name)    { should be == 'Originate' }
-            its(:params)  { should be == { 'Channel' => 'SIP/101test' } }
+            describe '#name' do
+              subject { super().name }
+              it { should be == 'Originate' }
+            end
+
+            describe '#params' do
+              subject { super().params }
+              it { should be == { 'Channel' => 'SIP/101test' } }
+            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.name.should == 'Originate'
-                new_instance.params.should == { 'Channel' => 'SIP/101test' }
+                expect(new_instance).to be_instance_of described_class
+                expect(new_instance.name).to eq('Originate')
+                expect(new_instance.params).to eq({ 'Channel' => 'SIP/101test' })
               end
 
               it "should render to a parent node if supplied" do
@@ -86,7 +100,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
@@ -111,21 +125,55 @@ module Punchblock
 
                 it { should be_instance_of described_class }
 
-                its(:name)    { should be == :success }
-                its(:message) { should be == "Originate successfully queued" }
-                its(:text_body) { should be == 'Some thing happened' }
-                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 == :success }
+                end
+
+                describe '#message' do
+                  subject { super().message }
+                  it { should be == "Originate successfully queued" }
+                end
+
+                describe '#text_body' do
+                  subject { super().text_body }
+                  it { should be == 'Some thing happened' }
+                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 "when setting options in initializer" do
                   subject do
                     described_class.new message: 'Originate successfully queued', text_body: 'Some thing happened', headers: {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'}
                   end
 
-                  its(:message) { should be == 'Originate successfully queued' }
-                  its(:text_body) { should be == 'Some thing happened' }
-                  its(:headers) { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} }
-                  its(:attributes) { should be == {'Channel' => 'SIP/101-3f3f', 'State' => 'Ring'} } # For BC
+                  describe '#message' do
+                    subject { super().message }
+                    it { should be == 'Originate successfully queued' }
+                  end
+
+                  describe '#text_body' do
+                    subject { super().text_body }
+                    it { should be == 'Some thing happened' }
+                  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
               end
             end

data/spec/punchblock/component/component_node_spec.rb

@@ -24,11 +24,11 @@ module Punchblock
         describe "with a complete event" do
           it "should set the complete event resource" do
             add_event
-            subject.complete_event(0.5).should be == event
+            expect(subject.complete_event(0.5)).to eq(event)
           end
 
           it "should call #complete!" do
-            subject.should_receive(:complete!).once
+            expect(subject).to receive(:complete!).once
             add_event
           end
         end
@@ -38,7 +38,7 @@ module Punchblock
 
           it "should not set the complete event resource" do
             add_event
-            subject.should_not be_complete
+            expect(subject).not_to be_complete
           end
         end
       end # #add_event
@@ -55,7 +55,7 @@ module Punchblock
           let(:handler) { double 'Response' }
 
           before do
-            handler.should_receive(:call).once.with(event)
+            expect(handler).to receive(:call).once.with(event)
             subject.register_event_handler { |event| handler.call event }
           end
 
@@ -79,9 +79,9 @@ module Punchblock
 
         it "should set the component ID from the ref" do
           subject.response = ref
-          subject.component_id.should be == 'abc123'
-          subject.source_uri.should be == uri
-          subject.client.find_component_by_uri(uri).should be subject
+          expect(subject.component_id).to eq('abc123')
+          expect(subject.source_uri).to eq(uri)
+          expect(subject.client.find_component_by_uri(uri)).to be subject
         end
       end
 
@@ -90,23 +90,23 @@ module Punchblock
           subject.request!
           subject.client = Client.new
           subject.response = Ref.new uri: 'abc'
-          subject.client.find_component_by_uri('abc').should be subject
+          expect(subject.client.find_component_by_uri('abc')).to be subject
         end
 
         it "should set the command to executing status" do
           subject.complete_event = :foo
-          subject.should be_complete
+          expect(subject).to be_complete
         end
 
         it "should be a no-op if the response has already been set" do
           subject.complete_event = :foo
-          lambda { subject.complete_event = :bar }.should_not raise_error
-          subject.complete_event(0.5).should be == :foo
+          expect { subject.complete_event = :bar }.not_to raise_error
+          expect(subject.complete_event(0.5)).to eq(:foo)
         end
 
         it "should remove the component from the registry" do
           subject.complete_event = :foo
-          subject.client.find_component_by_uri('abc').should be_nil
+          expect(subject.client.find_component_by_uri('abc')).to be_nil
         end
       end
     end # ComponentNode