punchblock 1.6.1 → 1.7.0

data/spec/punchblock/translator/freeswitch_spec.rb

@@ -12,7 +12,7 @@ module Punchblock
       let(:translator)  { described_class.new connection, media_engine, default_voice }
       let(:stream)      { mock 'RubyFS::Stream' }
 
-      before { connection.expects(:stream).times(0..1).returns stream }
+      before { connection.should_receive(:stream).at_most(:once).and_return stream }
 
       subject { translator }
 
@@ -34,7 +34,7 @@ module Punchblock
           let(:call_id) { 'abc123' }
 
           it 'executes the call command' do
-            subject.wrapped_object.expects(:execute_call_command).with do |c|
+            subject.wrapped_object.should_receive(:execute_call_command).with do |c|
               c.should be command
               c.target_call_id.should be == call_id
             end
@@ -47,7 +47,7 @@ module Punchblock
           let(:component_id)  { '123abc' }
 
           it 'executes the component command' do
-            subject.wrapped_object.expects(:execute_component_command).with do |c|
+            subject.wrapped_object.should_receive(:execute_component_command).with do |c|
               c.should be command
               c.component_id.should be == component_id
             end
@@ -59,7 +59,7 @@ module Punchblock
           let(:command) { Command::Dial.new }
 
           it 'executes the command directly' do
-            subject.wrapped_object.expects(:execute_global_command).with command
+            subject.wrapped_object.should_receive(:execute_global_command).with command
             subject.execute_command command
           end
         end
@@ -112,12 +112,12 @@ module Punchblock
 
           before do
             command.request!
-            call.stubs(:id).returns call_id
+            call.stub(:id).and_return call_id
             subject.register_call call
           end
 
           it 'sends the command to the call for execution' do
-            call.expects(:execute_command!).once.with command
+            call.should_receive(:execute_command!).once.with command
             subject.execute_call_command command
           end
         end
@@ -135,7 +135,7 @@ module Punchblock
           let(:call_id) { dial_command.response.id }
 
           before do
-            stream.stub_everything
+            stream.as_null_object
             subject.execute_command dial_command
           end
 
@@ -146,7 +146,7 @@ module Punchblock
               raise 'Woops, I died'
             end
 
-            connection.expects(:handle_event).once.with end_error_event
+            connection.should_receive(:handle_event).once.with end_error_event
 
             lambda { call.oops }.should raise_error(/Woops, I died/)
             sleep 0.1
@@ -168,7 +168,7 @@ module Punchblock
           let(:call_id) { call.id }
 
           before do
-            connection.expects(:handle_event).at_least(1)
+            connection.stub :handle_event
             subject.handle_es_event es_event
             call_id
           end
@@ -178,7 +178,7 @@ module Punchblock
               raise 'Woops, I died'
             end
 
-            connection.expects(:handle_event).once.with end_error_event
+            connection.should_receive(:handle_event).once.with end_error_event
 
             lambda { call.oops }.should raise_error(/Woops, I died/)
             sleep 0.1
@@ -216,7 +216,7 @@ module Punchblock
           end
 
           it 'sends the command to the component for execution' do
-            component.expects(:execute_command!).once.with command
+            component.should_receive(:execute_command!).once.with command
             subject.execute_component_command command
           end
         end
@@ -239,9 +239,9 @@ module Punchblock
 
           before do
             id
-            Punchblock.expects(:new_uuid).once.returns id
+            Punchblock.should_receive(:new_uuid).once.and_return id
             command.request!
-            stream.stub_everything
+            stream.as_null_object
           end
 
           it 'should be able to look up the call by ID' do
@@ -255,9 +255,9 @@ module Punchblock
           end
 
           it 'should instruct the call to send a dial' do
-            mock_call = stub_everything 'Freeswitch::Call'
-            Freeswitch::Call.expects(:new_link).once.returns mock_call
-            mock_call.expects(:dial!).once.with command
+            mock_call = stub('Freeswitch::Call').as_null_object
+            Freeswitch::Call.should_receive(:new_link).once.and_return mock_call
+            mock_call.should_receive(:dial!).once.with command
             subject.execute_global_command command
           end
         end
@@ -277,13 +277,13 @@ module Punchblock
       describe '#handle_pb_event' do
         it 'should forward the event to the connection' do
           event = mock 'Punchblock::Event'
-          subject.connection.expects(:handle_event).once.with event
+          subject.connection.should_receive(:handle_event).once.with event
           subject.handle_pb_event event
         end
       end
 
       describe '#handle_es_event' do
-        before { subject.wrapped_object.stubs :handle_pb_event }
+        before { subject.wrapped_object.stub :handle_pb_event }
 
         let(:unique_id) { "3f0e1e18-c056-11e1-b099-fffeda3ce54f" }
 
@@ -514,7 +514,7 @@ module Punchblock
           let(:es_event) { RubyFS::Stream::Connected.new }
 
           it "should send a Punchblock::Connection::Connected event" do
-            subject.wrapped_object.expects(:handle_pb_event).once.with(Punchblock::Connection::Connected.new)
+            subject.wrapped_object.should_receive(:handle_pb_event).once.with(Punchblock::Connection::Connected.new)
             subject.handle_es_event es_event
           end
         end
@@ -529,10 +529,10 @@ module Punchblock
 
         describe 'with a CHANNEL_PARK event' do
           it 'should instruct the call to send an offer' do
-            mock_call = stub_everything 'Freeswitch::Call'
-            Freeswitch::Call.expects(:new).once.returns mock_call
-            subject.wrapped_object.expects(:link)
-            mock_call.expects(:send_offer!).once
+            mock_call = stub('Freeswitch::Call').as_null_object
+            Freeswitch::Call.should_receive(:new).once.and_return mock_call
+            subject.wrapped_object.should_receive(:link)
+            mock_call.should_receive(:send_offer!).once
             subject.handle_es_event es_event
           end
 
@@ -544,7 +544,7 @@ module Punchblock
             end
 
             it "should not create a new call" do
-              Freeswitch::Call.expects(:new).never
+              Freeswitch::Call.should_receive(:new).never
               subject.handle_es_event es_event
             end
           end
@@ -567,12 +567,12 @@ module Punchblock
           end
 
           it "is delivered to the bridging leg" do
-            call_a.expects(:handle_es_event!).once.with es_event
+            call_a.should_receive(:handle_es_event!).once.with es_event
             subject.handle_es_event es_event
           end
 
           it "is delivered to the other leg" do
-            call_b.expects(:handle_es_event!).once.with es_event
+            call_b.should_receive(:handle_es_event!).once.with es_event
             subject.handle_es_event es_event
           end
         end
@@ -587,7 +587,7 @@ module Punchblock
           end
 
           it 'sends the ES event to the call' do
-            call.expects(:handle_es_event!).once.with es_event
+            call.should_receive(:handle_es_event!).once.with es_event
             subject.handle_es_event es_event
           end
         end

data/spec/punchblock_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe Punchblock do
   describe '#client_with_connection' do
+    let(:mock_connection) { stub('Connection').as_null_object }
+
     context 'with :XMPP' do
       it 'sets up an XMPP connection, passing options, and a client with the connection attached' do
-        mock_connection = stub_everything 'Connection'
         options = {:username => 'foo', :password => 'bar'}
-        Punchblock::Connection::XMPP.expects(:new).once.with(options).returns mock_connection
+        Punchblock::Connection::XMPP.should_receive(:new).once.with(options).and_return mock_connection
         client = Punchblock.client_with_connection :XMPP, options
         client.should be_a Punchblock::Client
         client.connection.should be mock_connection
@@ -15,9 +16,8 @@ describe Punchblock do
 
     context 'with :asterisk' do
       it 'sets up an Asterisk connection, passing options, and a client with the connection attached' do
-        mock_connection = stub_everything 'Connection'
         options = {:username => 'foo', :password => 'bar'}
-        Punchblock::Connection::Asterisk.expects(:new).once.with(options).returns mock_connection
+        Punchblock::Connection::Asterisk.should_receive(:new).once.with(options).and_return mock_connection
         client = Punchblock.client_with_connection :asterisk, options
         client.should be_a Punchblock::Client
         client.connection.should be mock_connection
@@ -26,9 +26,8 @@ describe Punchblock do
 
     context 'with :freeswitch' do
       it 'sets up an Freeswitch connection, passing options, and a client with the connection attached' do
-        mock_connection = stub_everything 'Connection'
         options = {:username => 'foo', :password => 'bar'}
-        Punchblock::Connection::Freeswitch.expects(:new).once.with(options).returns mock_connection
+        Punchblock::Connection::Freeswitch.should_receive(:new).once.with(options).and_return mock_connection
         client = Punchblock.client_with_connection :freeswitch, options
         client.should be_a Punchblock::Client
         client.connection.should be mock_connection

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 Thread.abort_on_exception = true
 
 RSpec.configure do |config|
-  config.mock_with :mocha
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 
@@ -32,8 +31,8 @@ def import_stanza(xml)
 end
 
 def stub_uuids(value)
-  RubyAMI.stubs :new_uuid => value
-  Punchblock.stubs :new_uuid => value
+  RubyAMI.stub :new_uuid => value
+  Punchblock.stub :new_uuid => value
 end
 
 # FIXME: change this to rayo_event?  It can be ambigous

data/spec/support/mock_connection_with_event_handler.rb

@@ -1,24 +1,13 @@
 # encoding: utf-8
 
-# This is a nasty hack due to the fact that Mocha does not support expectations returning a value calculated by executing a block with the parameters passed.
-# If it did, we could do this in our component tests:
-# mc = mock 'Connection'
-# mc.stubs(:handle_event).returns { |event| command.add_event event }
-#
-# Mocha does not support this feature because really, it's a smell in the tests
-# We shouldn't really be mocking out behaviour like this if we actually need it to have side effects
-# We only do this because of the difficulties in synchronising the tests with an asynchronous target in another thread.
-#
-def mock_connection_with_event_handler(&block)
-  mock('Connection').tap do |mc|
-    class << mc
-      attr_accessor :target
-    end
-
-    mc.target = block
-
-    def mc.handle_event(event)
-      target.call event
+module HasMockCallbackConnection
+  def self.included(test_case)
+    test_case.let(:connection) do
+      mock('Connection').tap do |mc|
+        mc.stub :handle_event do |event|
+          original_command.add_event event
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -265,22 +265,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -515,7 +499,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2449922662339076716
+      hash: -475080832801704872
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: