punchblock 1.6.1 → 1.7.0

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

@@ -7,11 +7,8 @@ module Punchblock
     class Freeswitch
       module Component
         describe Input do
-          let(:connection) do
-            mock_connection_with_event_handler do |event|
-              original_command.add_event event
-            end
-          end
+          include HasMockCallbackConnection
+
           let(:id)          { Punchblock.new_uuid }
           let(:translator)  { Punchblock::Translator::Freeswitch.new connection }
           let(:mock_stream) { mock('RubyFS::Stream') }
@@ -74,6 +71,7 @@ module Punchblock
                 before do
                   send_dtmf 1
                   send_dtmf 2
+                  sleep 0.5
                 end
 
                 let :expected_event do
@@ -90,7 +88,7 @@ module Punchblock
                 end
 
                 it "should not process further dtmf events" do
-                  subject.expects(:process_dtmf!).never
+                  subject.should_receive(:process_dtmf!).never
                   send_dtmf 3
                 end
               end
@@ -185,7 +183,7 @@ module Punchblock
                 let(:original_command_opts) { { :initial_timeout => -1 } }
 
                 it "should not start a timer" do
-                  subject.wrapped_object.expects(:begin_initial_timer).never
+                  subject.wrapped_object.should_receive(:begin_initial_timer).never
                   subject.execute
                 end
               end
@@ -194,7 +192,7 @@ module Punchblock
                 let(:original_command_opts) { { :initial_timeout => nil } }
 
                 it "should not start a timer" do
-                  subject.wrapped_object.expects(:begin_initial_timer).never
+                  subject.wrapped_object.should_receive(:begin_initial_timer).never
                   subject.execute
                 end
               end
@@ -237,7 +235,7 @@ module Punchblock
                 let(:original_command_opts) { { :inter_digit_timeout => -1 } }
 
                 it "should not start a timer" do
-                  subject.wrapped_object.expects(:begin_inter_digit_timer).never
+                  subject.wrapped_object.should_receive(:begin_inter_digit_timer).never
                   subject.execute
                 end
               end
@@ -246,7 +244,7 @@ module Punchblock
                 let(:original_command_opts) { { :inter_digit_timeout => nil } }
 
                 it "should not start a timer" do
-                  subject.wrapped_object.expects(:begin_inter_digit_timer).never
+                  subject.wrapped_object.should_receive(:begin_inter_digit_timer).never
                   subject.execute
                 end
               end

data/spec/punchblock/translator/freeswitch/component/output_spec.rb

@@ -7,11 +7,8 @@ module Punchblock
     class Freeswitch
       module Component
         describe Output do
-          let(:connection) do
-            mock_connection_with_event_handler do |event|
-              original_command.add_event event
-            end
-          end
+          include HasMockCallbackConnection
+
           let(:translator)  { Punchblock::Translator::Freeswitch.new connection }
           let(:mock_call)   { Punchblock::Translator::Freeswitch::Call.new 'foo', translator }
 
@@ -34,7 +31,7 @@ module Punchblock
           describe '#execute' do
             before { original_command.request! }
             def expect_playback(filename = audio_filename)
-              subject.wrapped_object.expects(:application).once.with 'playback', "file_string://#{filename}"
+              subject.wrapped_object.should_receive(:application).once.with 'playback', "file_string://#{filename}"
             end
 
             let(:audio_filename) { 'http://foo.com/bar.mp3' }
@@ -105,7 +102,7 @@ module Punchblock
                 end
 
                 it 'should send a complete event when the file finishes playback' do
-                  expect_playback.yields true
+                  expect_playback
                   subject.execute
                   subject.handle_es_event RubyFS::Event.new(nil, :event_name => "CHANNEL_EXECUTE_COMPLETE", :application_response => 'FILE PLAYED')
                   original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
@@ -116,7 +113,7 @@ module Punchblock
                   let(:complete_reason) { original_command.complete_event(0.1).reason }
 
                   it "sends a complete event with an error reason" do
-                    expect_playback.yields true
+                    expect_playback
                     subject.execute
                     subject.handle_es_event fs_event
                     complete_reason.should be_a Punchblock::Event::Complete::Error
@@ -143,7 +140,7 @@ module Punchblock
                 end
 
                 it 'should send a complete event when the files finish playback' do
-                  expect_playback([audio_filename1, audio_filename2].join('!')).yields true
+                  expect_playback([audio_filename1, audio_filename2].join('!'))
                   subject.execute
                   subject.handle_es_event RubyFS::Event.new(nil, :event_name => "CHANNEL_EXECUTE_COMPLETE", :application_response => "FILE PLAYED")
                   original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
@@ -342,13 +339,13 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                subject.wrapped_object.expects(:application)
+                subject.wrapped_object.should_receive(:application)
                 subject.execute_command command
                 command.response(0.1).should be == true
               end
 
               it "sends the correct complete event" do
-                subject.wrapped_object.expects(:application)
+                subject.wrapped_object.should_receive(:application)
                 original_command.should_not be_complete
                 subject.execute_command command
                 reason.should be_a Punchblock::Event::Complete::Stop
@@ -356,7 +353,7 @@ module Punchblock
               end
 
               it "breaks the current dialplan application" do
-                subject.wrapped_object.expects(:application).once.with 'break'
+                subject.wrapped_object.should_receive(:application).once.with 'break'
                 subject.execute_command command
               end
             end

data/spec/punchblock/translator/freeswitch/component/record_spec.rb

@@ -7,11 +7,8 @@ module Punchblock
     class Freeswitch
       module Component
         describe Record do
-          let(:connection) do
-            mock_connection_with_event_handler do |event|
-              original_command.add_event event
-            end
-          end
+          include HasMockCallbackConnection
+
           let(:id)          { Punchblock.new_uuid }
           let(:translator)  { Punchblock::Translator::Freeswitch.new connection }
           let(:mock_stream) { mock('RubyFS::Stream') }
@@ -25,7 +22,7 @@ module Punchblock
             {}
           end
 
-          before { mock_stream.stub_everything }
+          before { mock_stream.as_null_object }
 
           subject { Record.new original_command, mock_call }
 
@@ -44,7 +41,7 @@ module Punchblock
             end
 
             it "starts a recording via uuid_record, using the component ID as the filename" do
-              mock_call.expects(:uuid_foo).once.with(:record, "start #{filename}")
+              mock_call.should_receive(:uuid_foo).once.with(:record, "start #{filename}")
               subject.execute
             end
 
@@ -65,7 +62,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :start_paused => nil } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -74,7 +71,7 @@ module Punchblock
               context "set to false" do
                 let(:command_options) { { :start_paused => false } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -83,7 +80,7 @@ module Punchblock
               context "set to true" do
                 let(:command_options) { { :start_paused => true } }
                 it "should return an error and not execute any actions" do
-                  mock_call.expects(:uuid_foo).never
+                  mock_call.should_receive(:uuid_foo).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A start-paused value of true is unsupported.'
                   original_command.response(0.1).should be == error
@@ -95,7 +92,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :initial_timeout => nil } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -104,7 +101,7 @@ module Punchblock
               context "set to -1" do
                 let(:command_options) { { :initial_timeout => -1 } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -113,7 +110,7 @@ module Punchblock
               context "set to a positive number" do
                 let(:command_options) { { :initial_timeout => 10 } }
                 it "should return an error and not execute any actions" do
-                  mock_call.expects(:uuid_foo).never
+                  mock_call.should_receive(:uuid_foo).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'An initial-timeout value is unsupported.'
                   original_command.response(0.1).should be == error
@@ -125,7 +122,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :final_timeout => nil } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -134,7 +131,7 @@ module Punchblock
               context "set to -1" do
                 let(:command_options) { { :final_timeout => -1 } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -143,7 +140,7 @@ module Punchblock
               context "set to a positive number" do
                 let(:command_options) { { :final_timeout => 10 } }
                 it "should return an error and not execute any actions" do
-                  mock_call.expects(:send_agi_action!).never
+                  mock_call.should_receive(:send_agi_action!).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A final-timeout value is unsupported.'
                   original_command.response(0.1).should be == error
@@ -155,13 +152,13 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :format => nil } }
                 it "should execute as 'wav'" do
-                  mock_call.expects(:uuid_foo).once.with(:record, regexp_matches(/.wav/))
+                  mock_call.should_receive(:uuid_foo).once.with(:record, /.wav/)
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
 
                 it "provides the correct filename in the recording" do
-                  mock_call.expects(:uuid_foo)
+                  mock_call.should_receive(:uuid_foo)
                   subject.execute
                   record_stop_event = RubyFS::Event.new nil, {
                     :event_name       => 'RECORD_STOP',
@@ -175,13 +172,13 @@ module Punchblock
               context "set to 'mp3'" do
                 let(:command_options) { { :format => 'mp3' } }
                 it "should execute as 'mp3'" do
-                  mock_call.expects(:uuid_foo).once.with(:record, regexp_matches(/.mp3/))
+                  mock_call.should_receive(:uuid_foo).once.with(:record, /.mp3/)
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
 
                 it "provides the correct filename in the recording" do
-                  mock_call.expects(:uuid_foo)
+                  mock_call.should_receive(:uuid_foo)
                   subject.execute
                   record_stop_event = RubyFS::Event.new nil, {
                     :event_name       => 'RECORD_STOP',
@@ -197,7 +194,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :start_beep => nil } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -206,7 +203,7 @@ module Punchblock
               context "set to false" do
                 let(:command_options) { { :start_beep => false } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once
+                  mock_call.should_receive(:uuid_foo).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -216,7 +213,7 @@ module Punchblock
                 let(:command_options) { { :start_beep => true } }
 
                 it "should return an error and not execute any actions" do
-                  mock_call.expects(:uuid_foo).never
+                  mock_call.should_receive(:uuid_foo).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A start-beep value of true is unsupported.'
                   original_command.response(0.1).should be == error
@@ -228,7 +225,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :max_duration => nil } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once.with(:record, regexp_matches(/.wav$/))
+                  mock_call.should_receive(:uuid_foo).once.with(:record, /.wav$/)
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -237,7 +234,7 @@ module Punchblock
               context "set to -1" do
                 let(:command_options) { { :max_duration => -1 } }
                 it "should execute normally" do
-                  mock_call.expects(:uuid_foo).once.with(:record, regexp_matches(/.wav$/))
+                  mock_call.should_receive(:uuid_foo).once.with(:record, /.wav$/)
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -259,7 +256,7 @@ module Punchblock
                 let(:command_options) { { :max_duration => 1000 } }
 
                 it "executes the recording with a time limit" do
-                  mock_call.expects(:uuid_foo).once.with(:record, regexp_matches(/.wav 1$/))
+                  mock_call.should_receive(:uuid_foo).once.with(:record, /.wav 1$/)
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -285,7 +282,7 @@ module Punchblock
               let(:command) { Punchblock::Component::Stop.new }
 
               before do
-                mock_call.expects :uuid_foo
+                mock_call.should_receive :uuid_foo
                 command.request!
                 original_command.request!
                 subject.execute
@@ -300,19 +297,19 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                mock_call.expects :uuid_foo
+                mock_call.should_receive :uuid_foo
                 subject.execute_command command
                 send_stop_event
                 command.response(0.1).should be == true
               end
 
               it "executes a uuid_record stop command" do
-                mock_call.expects(:uuid_foo).with(:record, "stop #{filename}")
+                mock_call.should_receive(:uuid_foo).with(:record, "stop #{filename}")
                 subject.execute_command command
               end
 
               it "sends the correct complete event" do
-                mock_call.expects(:uuid_foo).with(:record, "stop #{filename}")
+                mock_call.should_receive(:uuid_foo).with(:record, "stop #{filename}")
                 subject.execute_command command
                 send_stop_event
                 reason.should be_a Punchblock::Event::Complete::Stop
@@ -326,7 +323,7 @@ module Punchblock
 
               before do
                 pending
-                mock_call.expects :uuid_foo
+                mock_call.should_receive :uuid_foo
                 command.request!
                 original_command.request!
                 subject.execute
@@ -338,7 +335,7 @@ module Punchblock
               end
 
               it "pauses the recording via AMI" do
-                mock_call.expects(:uuid_foo).once.with('PauseMonitor', 'Channel' => channel)
+                mock_call.should_receive(:uuid_foo).once.with('PauseMonitor', 'Channel' => channel)
                 subject.execute_command command
               end
             end
@@ -348,7 +345,7 @@ module Punchblock
 
               before do
                 pending
-                mock_call.expects :uuid_foo
+                mock_call.should_receive :uuid_foo
                 command.request!
                 original_command.request!
                 subject.execute
@@ -360,7 +357,7 @@ module Punchblock
               end
 
               it "resumes the recording via AMI" do
-                mock_call.expects(:uuid_foo).once.with('ResumeMonitor', 'Channel' => channel)
+                mock_call.should_receive(:uuid_foo).once.with('ResumeMonitor', 'Channel' => channel)
                 subject.execute_command command
               end
             end

data/spec/punchblock/translator/freeswitch/component/tts_output_spec.rb

@@ -7,11 +7,8 @@ module Punchblock
     class Freeswitch
       module Component
         describe TTSOutput do
-          let(:connection) do
-            mock_connection_with_event_handler do |event|
-              original_command.add_event event
-            end
-          end
+          include HasMockCallbackConnection
+
           let(:media_engine)  { :flite }
           let(:default_voice) { :hal }
           let(:translator)    { Punchblock::Translator::Freeswitch.new connection }
@@ -40,7 +37,7 @@ module Punchblock
           describe '#execute' do
             before { original_command.request! }
             def expect_playback(voice = default_voice)
-              subject.wrapped_object.expects(:application).once.with :speak, "#{media_engine}|#{voice}|#{ssml_doc}"
+              subject.wrapped_object.should_receive(:application).once.with :speak, "#{media_engine}|#{voice}|#{ssml_doc}"
             end
 
             let :ssml_doc do
@@ -76,7 +73,7 @@ module Punchblock
                 end
 
                 it 'should send a complete event when the speak finishes' do
-                  expect_playback.yields true
+                  expect_playback
                   execute
                   subject.handle_es_event RubyFS::Event.new(nil, :event_name => "CHANNEL_EXECUTE_COMPLETE")
                   original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
@@ -258,13 +255,13 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                subject.wrapped_object.expects(:application)
+                subject.wrapped_object.should_receive(:application)
                 subject.execute_command command
                 command.response(0.1).should be == true
               end
 
               it "sends the correct complete event" do
-                subject.wrapped_object.expects(:application)
+                subject.wrapped_object.should_receive(:application)
                 original_command.should_not be_complete
                 subject.execute_command command
                 reason.should be_a Punchblock::Event::Complete::Stop
@@ -272,7 +269,7 @@ module Punchblock
               end
 
               it "breaks the current dialplan application" do
-                subject.wrapped_object.expects(:application).once.with 'break'
+                subject.wrapped_object.should_receive(:application).once.with 'break'
                 subject.execute_command command
               end
             end

data/spec/punchblock/translator/freeswitch/component_spec.rb

@@ -29,7 +29,7 @@ module Punchblock
               let(:response) { mock 'Response' }
 
               it 'should execute the handler' do
-                response.expects(:call).once.with es_event
+                response.should_receive(:call).once.with es_event
                 subject.register_handler :es, :event_name => 'CHANNEL_EXECUTE' do |event|
                   response.call event
                 end
@@ -53,7 +53,7 @@ module Punchblock
             end
 
             it "should send the event to the connection" do
-              connection.expects(:handle_event).once.with expected_event
+              connection.should_receive(:handle_event).once.with expected_event
               subject.send_event event
             end
           end
@@ -69,12 +69,12 @@ module Punchblock
             end
 
             it "should send a complete event with the specified reason" do
-              subject.wrapped_object.expects(:send_event).once.with expected_event
+              subject.wrapped_object.should_receive(:send_event).once.with expected_event
               subject.send_complete_event reason
             end
 
             it "should cause the actor to be shut down" do
-              subject.wrapped_object.stubs(:send_event).returns true
+              subject.wrapped_object.stub(:send_event).and_return true
               subject.send_complete_event reason
               sleep 0.2
               subject.should_not be_alive
@@ -83,14 +83,14 @@ module Punchblock
 
           describe "#call_ended" do
             it "should send a complete event with the call hangup reason" do
-              subject.wrapped_object.expects(:send_complete_event).once.with Punchblock::Event::Complete::Hangup.new
+              subject.wrapped_object.should_receive(:send_complete_event).once.with Punchblock::Event::Complete::Hangup.new
               subject.call_ended
             end
           end
 
           describe "#application" do
             it "should execute a FS application on the current call" do
-              call.expects(:application).once.with('appname', "%[punchblock_component_id=#{subject.id}]options")
+              call.should_receive(:application).once.with('appname', "%[punchblock_component_id=#{subject.id}]options")
               subject.application 'appname', 'options'
             end
           end