punchblock 2.5.2 → 2.5.3

data/spec/punchblock/translator/asterisk/component/asterisk/agi_command_spec.rb

@@ -32,7 +32,7 @@ module Punchblock
               before { original_command.request! }
 
               it 'should send the appropriate action' do
-                ami_client.should_receive(:send_action).once.with('AGI', 'Channel' => channel, 'Command' => 'EXEC ANSWER', 'CommandID' => component_id).and_return(response)
+                expect(ami_client).to receive(:send_action).once.with('AGI', 'Channel' => channel, 'Command' => 'EXEC ANSWER', 'CommandID' => component_id).and_return(response)
                 subject.execute
               end
 
@@ -44,7 +44,7 @@ module Punchblock
                 end
 
                 it 'should send the appropriate action' do
-                  ami_client.should_receive(:send_action).once.with('AGI', 'Channel' => channel, 'Command' => 'WAIT FOR DIGIT "1000" "foo"', 'CommandID' => component_id).and_return(response)
+                  expect(ami_client).to receive(:send_action).once.with('AGI', 'Channel' => channel, 'Command' => 'WAIT FOR DIGIT "1000" "foo"', 'CommandID' => component_id).and_return(response)
                   subject.execute
                 end
               end
@@ -65,9 +65,9 @@ module Punchblock
               end
 
               it 'should send the component node a ref with the action ID' do
-                ami_client.should_receive(:send_action).once.and_return response
+                expect(ami_client).to receive(:send_action).once.and_return response
                 subject.execute
-                original_command.response(1).should == expected_response
+                expect(original_command.response(1)).to eq(expected_response)
               end
 
               context 'with an error' do
@@ -76,11 +76,11 @@ module Punchblock
                   RubyAMI::Error.new.tap { |e| e.message = message }
                 end
 
-                before { ami_client.should_receive(:send_action).once.and_raise response }
+                before { expect(ami_client).to receive(:send_action).once.and_raise response }
 
                 it 'should send the component node false' do
                   subject.execute
-                  original_command.response(1).should be_false
+                  expect(original_command.response(1)).to be_false
                 end
 
                 context "which is 'No such channel'" do
@@ -88,7 +88,7 @@ module Punchblock
 
                   it "should return an :item_not_found error for the command" do
                     subject.execute
-                    original_command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{mock_call.id}", mock_call.id)
+                    expect(original_command.response(0.5)).to eq(ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{mock_call.id}", mock_call.id))
                   end
                 end
 
@@ -97,7 +97,7 @@ module Punchblock
 
                   it "should return an :item_not_found error for the command" do
                     subject.execute
-                    original_command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{mock_call.id}", mock_call.id)
+                    expect(original_command.response(0.5)).to eq(ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{mock_call.id}", mock_call.id))
                   end
                 end
               end
@@ -132,10 +132,10 @@ module Punchblock
 
                   complete_event = original_command.complete_event 0.5
 
-                  original_command.should be_complete
+                  expect(original_command).to be_complete
 
-                  complete_event.component_id.should be == component_id.to_s
-                  complete_event.reason.should be == expected_complete_reason
+                  expect(complete_event.component_id).to eq(component_id.to_s)
+                  expect(complete_event.reason).to eq(expected_complete_reason)
                 end
 
                 context "when the command was ASYNCAGI BREAK" do
@@ -147,12 +147,12 @@ module Punchblock
 
                   before do
                     response = RubyAMI::Response.new 'Value' => chan_var
-                    ami_client.should_receive(:send_action).once.with('GetVar', 'Channel' => channel, 'Variable' => 'PUNCHBLOCK_END_ON_ASYNCAGI_BREAK').and_return response
+                    expect(ami_client).to receive(:send_action).once.with('GetVar', 'Channel' => channel, 'Variable' => 'PUNCHBLOCK_END_ON_ASYNCAGI_BREAK').and_return response
                   end
 
                   it 'should not send an end (hangup) event to the translator' do
-                    translator.should_receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
-                    translator.should_receive(:handle_pb_event).never.with kind_of(Punchblock::Event::End)
+                    expect(translator).to receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
+                    expect(translator).to receive(:handle_pb_event).never.with kind_of(Punchblock::Event::End)
                     subject.handle_ami_event ami_event
                   end
 
@@ -164,8 +164,8 @@ module Punchblock
                                                                       platform_code: 16,
                                                                       target_call_id: mock_call.id
 
-                      translator.should_receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
-                      translator.should_receive(:handle_pb_event).once.with expected_end_event
+                      expect(translator).to receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
+                      expect(translator).to receive(:handle_pb_event).once.with expected_end_event
                       subject.handle_ami_event ami_event
                     end
 
@@ -185,8 +185,8 @@ module Punchblock
                                                                         platform_code: 16,
                                                                         target_call_id: mock_call.id,
                                                                         timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
-                        translator.should_receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
-                        translator.should_receive(:handle_pb_event).once.with expected_end_event
+                        expect(translator).to receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
+                        expect(translator).to receive(:handle_pb_event).once.with expected_end_event
 
                         subject.handle_ami_event ami_event
                       end

data/spec/punchblock/translator/asterisk/component/asterisk/ami_action_spec.rb

@@ -33,9 +33,9 @@ module Punchblock
               before { stub_uuids component_id }
 
               it 'should send the appropriate RubyAMI::Action and send the component node a ref' do
-                ami_client.should_receive(:send_action).once.with('ExtensionStatus', 'Context' => 'default', 'Exten' => 'idonno').and_return(RubyAMI::Response.new)
+                expect(ami_client).to receive(:send_action).once.with('ExtensionStatus', 'Context' => 'default', 'Exten' => 'idonno').and_return(RubyAMI::Response.new)
                 subject.execute
-                original_command.response(1).should == expected_response
+                expect(original_command.response(1)).to eq(expected_response)
               end
             end
 
@@ -57,8 +57,8 @@ module Punchblock
 
               context 'for a non-causal action' do
                 it 'should send a complete event to the component node' do
-                  ami_client.should_receive(:send_action).once.and_return response
-                  subject.should_receive(:send_complete_event).once.with expected_complete_reason
+                  expect(ami_client).to receive(:send_action).once.and_return response
+                  expect(subject).to receive(:send_complete_event).once.with expected_complete_reason
                   subject.execute
                 end
               end
@@ -105,7 +105,7 @@ module Punchblock
                   Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new message: 'Channel status will follow', text_body: 'Some text body', headers: {'Exten' => "idonno", 'Context' => "default", 'Hint' => "", 'Status' => "-1", 'EventList' => 'Complete', 'ListItems' => '3'}
                 end
 
-                before { ami_client.should_receive(:send_action).once.and_return response }
+                before { expect(ami_client).to receive(:send_action).once.and_return response }
 
                 it 'should send events to the component node' do
                   event_node
@@ -114,7 +114,7 @@ module Punchblock
                   end
                   response.events << event << terminating_event
                   subject.execute
-                  @event.should be == event_node
+                  expect(@event).to eq(event_node)
                 end
 
                 it 'should send a complete event to the component node' do
@@ -122,7 +122,7 @@ module Punchblock
 
                   subject.execute
 
-                  original_command.complete_event(0.5).reason.should be == expected_complete_reason
+                  expect(original_command.complete_event(0.5).reason).to eq(expected_complete_reason)
                 end
               end
 
@@ -136,10 +136,10 @@ module Punchblock
                 end
 
                 it 'should send a complete event to the component node' do
-                  ami_client.should_receive(:send_action).once.and_raise error
+                  expect(ami_client).to receive(:send_action).once.and_raise error
                   expected_complete_reason
                   subject.execute
-                  original_command.complete_event(0.5).reason.should be == expected_complete_reason
+                  expect(original_command.complete_event(0.5).reason).to eq(expected_complete_reason)
                 end
               end
             end

data/spec/punchblock/translator/asterisk/component/composed_prompt_spec.rb

@@ -72,7 +72,7 @@ module Punchblock
 
           before do
             call.stub answered?: true, execute_agi_command: true
-            call.stub(:channel_var).with('PLAYBACKSTATUS').and_return playbackstatus
+            allow(call).to receive(:channel_var).with('PLAYBACKSTATUS').and_return playbackstatus
             original_command.request!
           end
 
@@ -92,9 +92,9 @@ module Punchblock
             context '#barge_in' do
               context 'true' do
                 it "should execute an output component on the call and return a ref" do
-                  call.should_receive(:execute_agi_command).once.with('EXEC Playback', 'tt-monkeys')
+                  expect(call).to receive(:execute_agi_command).once.with('EXEC Playback', 'tt-monkeys')
                   subject.execute
-                  original_command.response(0.1).should be_a Ref
+                  expect(original_command.response(0.1)).to be_a Ref
                 end
 
                 context "if output fails to start" do
@@ -116,9 +116,9 @@ module Punchblock
 
               context 'false' do
                 it "should execute an output component on the call" do
-                  call.should_receive(:execute_agi_command).once.with('EXEC Playback', 'tt-monkeys')
+                  expect(call).to receive(:execute_agi_command).once.with('EXEC Playback', 'tt-monkeys')
                   subject.execute
-                  original_command.response(0.1).should be_a Ref
+                  expect(original_command.response(0.1)).to be_a Ref
                 end
 
                 context "if output fails to start" do
@@ -132,7 +132,7 @@ module Punchblock
 
                   it "should return the error returned by output" do
                     subject.execute
-                    original_command.response(0.1).should == output_response
+                    expect(original_command.response(0.1)).to eq(output_response)
                   end
                 end
 
@@ -166,10 +166,10 @@ module Punchblock
                   it "should return a match complete event" do
                     expected_event
                     subject.execute
-                    original_command.response(0.1).should be_a Ref
+                    expect(original_command.response(0.1)).to be_a Ref
                     send_ami_events_for_dtmf 1
 
-                    connection.events.should include(expected_event)
+                    expect(connection.events).to include(expected_event)
                   end
                 end
 
@@ -187,7 +187,7 @@ module Punchblock
               before { command.request! }
               it "returns a ProtocolError response" do
                 subject.execute_command command
-                command.response(0.1).should be_a ProtocolError
+                expect(command.response(0.1)).to be_a ProtocolError
               end
             end
 
@@ -207,9 +207,9 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                call.should_receive(:redirect_back).once
+                expect(call).to receive(:redirect_back).once
                 subject.execute_command command
-                command.response(0.1).should be == true
+                expect(command.response(0.1)).to eq(true)
               end
 
               it "sends the correct complete event" do
@@ -219,14 +219,14 @@ module Punchblock
                   source_uri: subject.id,
                   target_call_id: call.id
 
-                call.should_receive(:redirect_back)
+                expect(call).to receive(:redirect_back)
                 subject.execute_command command
-                original_command.should_not be_complete
+                expect(original_command).not_to be_complete
                 call.process_ami_event ami_event
 
                 sleep 0.2
 
-                connection.events.should include(expected_event)
+                expect(connection.events).to include(expected_event)
               end
             end
           end

data/spec/punchblock/translator/asterisk/component/input_spec.rb

@@ -40,11 +40,11 @@ module Punchblock
             before { original_command.request! }
 
             it "calls send_progress on the call" do
-              call.should_receive(:send_progress)
+              expect(call).to receive(:send_progress)
               subject.execute
             end
 
-            before { call.stub :send_progress }
+            before { allow(call).to receive :send_progress }
 
             let(:original_command_opts) { {} }
 
@@ -92,16 +92,16 @@ module Punchblock
                 end
 
                 it "should send a success complete event with the relevant data" do
-                  reason.should be == expected_event
+                  expect(reason).to eq(expected_event)
                 end
 
                 it "should not process further dtmf events" do
-                  subject.should_receive(:process_dtmf).never
+                  expect(subject).to receive(:process_dtmf).never
                   send_ami_events_for_dtmf 3
                 end
 
                 it "should not leave the recognizer running" do
-                  Celluloid::Actor.all.map { |a| a.class }.should_not include(Punchblock::Translator::DTMFRecognizer)
+                  expect(Celluloid::Actor.all.map { |a| a.class }).not_to include(Punchblock::Translator::DTMFRecognizer)
                 end
               end
 
@@ -116,7 +116,28 @@ module Punchblock
                 end
 
                 it "should send a nomatch complete event" do
-                  reason.should be == expected_event
+                  expect(reason).to eq(expected_event)
+                end
+              end
+
+              context "dtmf event received after recognizer has terminated" do
+                before do
+                  send_ami_events_for_dtmf 1
+                  send_ami_events_for_dtmf '#'
+                  subject.execute
+                end
+
+                let :expected_event do
+                  Punchblock::Component::Input::Complete::NoMatch.new
+                end
+
+                it "should not crash the translator if the recognizer is dead" do
+                  expect(Celluloid::Actor.all.map { |a| a.class }).to include(Punchblock::Translator::DTMFRecognizer)
+                  recognizer = Celluloid::Actor.all.find { |a| a.class == Punchblock::Translator::DTMFRecognizer }
+                  recognizer.terminate if recognizer
+                  expect(Celluloid::Actor.all.map { |a| a.class }).not_to include(Punchblock::Translator::DTMFRecognizer)
+                  subject.process_dtmf 1 # trigger failure
+                  expect(Celluloid::Actor.all.map { |a| a.class }).to include(translator.class)
                 end
               end
             end
@@ -127,7 +148,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A grammar document is required.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
 
@@ -154,7 +175,7 @@ module Punchblock
                 end
 
                 it "should use RubySpeech builtin grammar" do
-                  reason.should be == expected_event
+                  expect(reason).to eq(expected_event)
                 end
               end
 
@@ -181,7 +202,7 @@ module Punchblock
                 end
 
                 it "should use RubySpeech builtin grammar" do
-                  reason.should be == expected_event
+                  expect(reason).to eq(expected_event)
                 end
               end
 
@@ -190,7 +211,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'Only a single grammar is supported.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
             end
@@ -201,7 +222,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A mode value other than DTMF is unsupported.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
 
@@ -210,7 +231,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A mode value other than DTMF is unsupported.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
 
@@ -219,7 +240,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A mode value other than DTMF is unsupported.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
             end
@@ -266,11 +287,11 @@ module Punchblock
                   end
 
                   it "should send a match complete event with the relevant data" do
-                    reason.should be == expected_event
+                    expect(reason).to eq(expected_event)
                   end
 
                   it "should not process further dtmf events" do
-                    subject.should_receive(:process_dtmf).never
+                    expect(subject).to receive(:process_dtmf).never
                     send_ami_events_for_dtmf 3
                   end
                 end
@@ -285,7 +306,7 @@ module Punchblock
                   end
 
                   it "should send a nomatch complete event with the relevant data" do
-                    reason.should be == expected_event
+                    expect(reason).to eq(expected_event)
                   end
                 end
 
@@ -300,7 +321,7 @@ module Punchblock
                   end
 
                   it "should send a nomatch complete event with the relevant data" do
-                    reason.should be == expected_event
+                    expect(reason).to eq(expected_event)
                   end
                 end
               end
@@ -319,7 +340,7 @@ module Punchblock
                   send_ami_events_for_dtmf 1
                   sleep 1.5
                   send_ami_events_for_dtmf 2
-                  reason.should be_a Punchblock::Component::Input::Complete::Match
+                  expect(reason).to be_a Punchblock::Component::Input::Complete::Match
                 end
 
                 it "should cause a NoInput complete event to be sent after the timeout" do
@@ -327,7 +348,7 @@ module Punchblock
                   sleep 1.5
                   send_ami_events_for_dtmf 1
                   send_ami_events_for_dtmf 2
-                  reason.should be_a Punchblock::Component::Input::Complete::NoInput
+                  expect(reason).to be_a Punchblock::Component::Input::Complete::NoInput
                 end
               end
 
@@ -335,7 +356,7 @@ module Punchblock
                 let(:original_command_opts) { { :initial_timeout => -1 } }
 
                 it "should not start a timer" do
-                  subject.should_receive(:begin_initial_timer).never
+                  expect(subject).to receive(:begin_initial_timer).never
                   subject.execute
                 end
               end
@@ -344,7 +365,7 @@ module Punchblock
                 let(:original_command_opts) { { :initial_timeout => nil } }
 
                 it "should not start a timer" do
-                  subject.should_receive(:begin_initial_timer).never
+                  expect(subject).to receive(:begin_initial_timer).never
                   subject.execute
                 end
               end
@@ -355,7 +376,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'An initial timeout value that is negative (and not -1) is invalid.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
             end
@@ -370,7 +391,7 @@ module Punchblock
                   send_ami_events_for_dtmf 1
                   sleep 0.5
                   send_ami_events_for_dtmf 2
-                  reason.should be_a Punchblock::Component::Input::Complete::Match
+                  expect(reason).to be_a Punchblock::Component::Input::Complete::Match
                 end
 
                 it "should cause a NoMatch complete event to be sent after the timeout" do
@@ -379,7 +400,7 @@ module Punchblock
                   send_ami_events_for_dtmf 1
                   sleep 1.5
                   send_ami_events_for_dtmf 2
-                  reason.should be_a Punchblock::Component::Input::Complete::NoMatch
+                  expect(reason).to be_a Punchblock::Component::Input::Complete::NoMatch
                 end
 
                 context "with a trailing range repeat" do
@@ -399,7 +420,7 @@ module Punchblock
                       sleep 1.5
                       send_ami_events_for_dtmf 1
                       sleep 1.5
-                      reason.should be_a Punchblock::Component::Input::Complete::NoMatch
+                      expect(reason).to be_a Punchblock::Component::Input::Complete::NoMatch
                     end
                   end
 
@@ -410,7 +431,7 @@ module Punchblock
                           instance "dtmf-1 dtmf-1"
                           input '11', mode: :dtmf
                         end
-                      end.root
+                      end
                     end
 
                     it "should fire a match on timeout" do
@@ -420,8 +441,8 @@ module Punchblock
                       sleep 0.5
                       send_ami_events_for_dtmf 1
                       sleep 1.5
-                      reason.should be_a Punchblock::Component::Input::Complete::Match
-                      reason.nlsml.should == expected_nlsml
+                      expect(reason).to be_a Punchblock::Component::Input::Complete::Match
+                      expect(reason.nlsml).to eq(expected_nlsml)
                     end
 
                     context "on the first keypress" do
@@ -442,8 +463,8 @@ module Punchblock
                         sleep 0.5
                         send_ami_events_for_dtmf 1
                         sleep 1.5
-                        reason.should be_a Punchblock::Component::Input::Complete::Match
-                        reason.nlsml.should == expected_nlsml
+                        expect(reason).to be_a Punchblock::Component::Input::Complete::Match
+                        expect(reason.nlsml).to eq(expected_nlsml)
                       end
                     end
                   end
@@ -454,7 +475,7 @@ module Punchblock
                 let(:original_command_opts) { { :inter_digit_timeout => -1 } }
 
                 it "should not start a timer" do
-                  subject.should_receive(:begin_inter_digit_timer).never
+                  expect(subject).to receive(:begin_inter_digit_timer).never
                   subject.execute
                 end
               end
@@ -463,7 +484,7 @@ module Punchblock
                 let(:original_command_opts) { { :inter_digit_timeout => nil } }
 
                 it "should not start a timer" do
-                  subject.should_receive(:begin_inter_digit_timer).never
+                  expect(subject).to receive(:begin_inter_digit_timer).never
                   subject.execute
                 end
               end
@@ -474,7 +495,7 @@ module Punchblock
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'An inter-digit timeout value that is negative (and not -1) is invalid.'
-                  original_command.response(0.1).should be == error
+                  expect(original_command.response(0.1)).to eq(error)
                 end
               end
             end
@@ -500,7 +521,7 @@ module Punchblock
 
               it "returns a ProtocolError response" do
                 subject.execute_command command
-                command.response(0.1).should be_a ProtocolError
+                expect(command.response(0.1)).to be_a ProtocolError
               end
             end
 
@@ -516,8 +537,8 @@ module Punchblock
 
               it "sets the command response to true" do
                 subject.execute_command command
-                command.response(0.1).should be == true
-                reason.should be_a Punchblock::Event::Complete::Stop
+                expect(command.response(0.1)).to eq(true)
+                expect(reason).to be_a Punchblock::Event::Complete::Stop
               end
             end
           end