adhearsion 2.3.0 → 2.3.1

data/spec/adhearsion/router/unaccepting_route_spec.rb

@@ -18,31 +18,31 @@ module Adhearsion
 
         let(:latch) { CountDownLatch.new 1 }
 
-        before { flexmock(call.wrapped_object).should_receive :write_and_await_response }
+        before { call.wrapped_object.stub :write_and_await_response }
 
         context "via a call controller" do
           let(:controller)  { CallController }
           subject(:route)   { Route.new 'foobar', controller }
 
           it "should not accept the call" do
-            flexmock(call).should_receive(:accept).never
+            call.should_receive(:accept).never
             route.dispatch call, lambda { latch.countdown! }
             latch.wait(2).should be true
           end
 
           it "should instruct the call to use an instance of the controller" do
-            flexmock(call).should_receive(:execute_controller).once.with controller, Proc
+            call.should_receive(:execute_controller).once.with kind_of(controller), kind_of(Proc)
             route.dispatch call
           end
 
           it "should hangup the call after all controllers have executed" do
-            flexmock(call).should_receive(:hangup).once
+            call.should_receive(:hangup).once
             route.dispatch call, lambda { latch.countdown! }
             latch.wait(2).should be true
           end
 
           context "if hangup raises a Call::Hangup" do
-            before { flexmock(call).should_receive(:hangup).once.and_raise Call::Hangup }
+            before { call.should_receive(:hangup).once.and_raise Call::Hangup }
 
             it "should not raise an exception" do
               lambda do
@@ -61,7 +61,7 @@ module Adhearsion
           end
 
           it "should instruct the call to use a CallController with the correct block" do
-            flexmock(call).should_receive(:execute_controller).once.with(CallController, Proc).and_return do |controller|
+            call.should_receive(:execute_controller).once.with(kind_of(CallController), kind_of(Proc)).and_return do |controller|
               controller.block.call.should be == :foobar
             end
             route.dispatch call

data/spec/adhearsion/router_spec.rb

@@ -9,6 +9,9 @@ module Adhearsion
     describe 'a new router' do
       subject { Router.new {} }
 
+      let(:call) { mock 'Adhearsion::Call' }
+      before { call.stub id: 'abc123' }
+
       it "should make the router available to the block" do
         foo = nil
         Router.new do
@@ -150,17 +153,17 @@ module Adhearsion
         subject { router.match call }
 
         context 'with a call from fred' do
-          let(:call) { flexmock 'Adhearsion::Call', :from => 'fred' }
+          before { call.stub :from => 'fred' }
           its(:name) { should be == 'calls from fred' }
         end
 
         context 'with a call from paul' do
-          let(:call) { flexmock 'Adhearsion::Call', :from => 'paul' }
+          before { call.stub :from => 'paul' }
           its(:name) { should be == 'calls from paul' }
         end
 
         context 'with a call from frank' do
-          let(:call) { flexmock 'Adhearsion::Call', :from => 'frank' }
+          before { call.stub :from => 'frank' }
           its(:name) { should be == 'catchall' }
         end
       end
@@ -172,11 +175,10 @@ module Adhearsion
           end
         end
 
-        let(:call) { flexmock 'Adhearsion::Call', :id => 'abc123' }
         let(:route) { subject.routes.first }
 
         it "should dispatch via the route" do
-          flexmock(route).should_receive(:dispatch).once.with call
+          route.should_receive(:dispatch).once.with call
           subject.handle call
         end
 
@@ -185,8 +187,6 @@ module Adhearsion
             Router.new {}
           end
 
-          let(:call) { flexmock 'Adhearsion::Call', :id => 'abc123' }
-
           it "should return a dispatcher which rejects the call as an error" do
             call.should_receive(:reject).once.with(:error)
             subject.handle call
@@ -200,7 +200,7 @@ module Adhearsion
             end
           end
 
-          let(:call) { flexmock 'Adhearsion::Call', :id => 'abc123', :to => 'bar' }
+          before { call.stub to: 'bar' }
 
           it "should return a dispatcher which rejects the call as an error" do
             call.should_receive(:reject).once.with(:error)

data/spec/adhearsion/statistics_spec.rb

@@ -11,7 +11,7 @@ describe Adhearsion::Statistics do
 
   before do
     Celluloid::Actor[:statistics] = described_class.new
-    flexmock(Adhearsion.active_calls).should_receive(:count).and_return 0
+    Adhearsion.active_calls.stub count: 0
   end
 
   after do

data/spec/adhearsion_spec.rb

@@ -41,7 +41,7 @@ describe Adhearsion do
 
     it "should execute a block" do
       foo = Object.new
-      flexmock(foo).should_receive(:bar).once
+      foo.should_receive(:bar).once
       Adhearsion.config do |config|
         foo.bar
       end

data/spec/spec_helper.rb

@@ -20,7 +20,6 @@ end
 
 %w{
   bundler/setup
-  flexmock/rspec
   active_support
   stringio
   countdownlatch
@@ -35,7 +34,7 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.mock_framework = :flexmock
+  config.mock_framework = :rspec
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.color_enabled = true

data/spec/support/call_controller_test_helpers.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
 module CallControllerTestHelpers
-  include FlexMock::ArgumentTypes
-
   def self.included(test_case)
     test_case.let(:call_id)     { new_uuid }
     test_case.let(:call)        { Adhearsion::Call.new }
@@ -12,9 +10,7 @@ module CallControllerTestHelpers
     test_case.subject { controller }
 
     test_case.before do
-      flexmock subject
-      flexmock controller
-      flexmock call, :write_command => true, :id => call_id
+      call.stub :write_command => true, :id => call_id
     end
   end
 
@@ -28,8 +24,9 @@ module CallControllerTestHelpers
     end.new call, :doo => :dah, &block
   end
 
-  def expect_message_waiting_for_response(message, fail = false)
-    expectation = controller.should_receive(:write_and_await_response).once.with message
+  def expect_message_waiting_for_response(message = nil, fail = false, &block)
+    expectation = controller.should_receive(:write_and_await_response, &block).once
+    expectation = expectation.with message if message
     if fail
       expectation.and_raise fail
     else
@@ -38,7 +35,7 @@ module CallControllerTestHelpers
   end
 
   def expect_message_of_type_waiting_for_response(message)
-    controller.should_receive(:write_and_await_response).once.with(message.class).and_return message
+    controller.should_receive(:write_and_await_response).once.with(kind_of(message.class)).and_return message
   end
 
   def expect_component_execution(component, fail = false)
@@ -49,4 +46,10 @@ module CallControllerTestHelpers
       expectation.and_return component
     end
   end
+
+  def expect_input_component_complete_event(utterance)
+    complete_event = Punchblock::Event::Complete.new
+    complete_event.stub reason: mock(utterance: utterance, name: :input)
+    Punchblock::Component::Input.any_instance.stub(complete?: true, complete_event: complete_event)
+  end
 end

data/spec/support/initializer_stubs.rb

@@ -2,7 +2,7 @@
 
 module InitializerStubs
   UNWANTED_BEHAVIOR = {
-    Adhearsion::Initializer => [:debugging_log, :initialize_log_paths, :update_rails_env_var, :require, :init_plugins, :run_plugins, :load_lib_folder]
+    Adhearsion::Initializer => [:debugging_log, :initialize_log_paths, :update_rails_env_var, :require, :init_plugins, :run_plugins]
   } unless defined? UNWANTED_BEHAVIOR
 
   def stub_behavior_for_initializer_with_no_path_changing_behavior

data/spec/support/punchblock_mocks.rb

@@ -2,7 +2,8 @@
 
 def mock_offer(id = nil, headers = {})
   id ||= rand
-  flexmock("Offer: #{id}", :call_id => id, :headers_hash => headers).tap do |offer|
-    offer.should_ignore_missing
+  mock("Offer: #{id}").tap do |offer|
+    offer.stub :call_id => id, :headers_hash => headers
+    offer.as_null_object
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -279,20 +279,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement