spec/adhearsion/call_spec.rb in adhearsion-2.0.0.rc3 vs spec/adhearsion/call_spec.rb in adhearsion-2.0.0.rc4

@@ -15,11 +15,11 @@
     let(:call_id) { rand }
     let(:headers) { nil }
     let(:to)      { 'sip:[e-mail]' }
     let(:from)    { 'sip:[e-mail]' }
     let :offer do
-      Punchblock::Event::Offer.new :call_id => call_id,
+      Punchblock::Event::Offer.new :target_call_id => call_id,
                                    :to      => to,
                                    :from    => from,
                                    :headers => headers
     end
 
@@ -311,11 +311,11 @@
           flexmock(Events).should_receive(:trigger).never
           lambda { subject.write_and_await_response message }.should raise_error new_exception
         end
 
         context "where the name is :item_not_found" do
-          let(:response) { new_exception.new :item_not_found }
+          let(:response) { new_exception.new.setup :item_not_found }
 
           it "should raise a Hangup exception" do
             flexmock(Events).should_receive(:trigger).never
             lambda { subject.write_and_await_response message }.should raise_error Call::Hangup
           end
@@ -461,50 +461,50 @@
         context "with a call" do
           let(:call_id) { rand.to_s }
           let(:target)  { flexmock Call.new, :id => call_id }
 
           it "should send a join command joining to the provided call ID" do
-            expect_join_with_options :other_call_id => call_id
+            expect_join_with_options :call_id => call_id
             subject.join target
           end
 
           context "and direction/media options" do
             it "should send a join command with the correct options" do
-              expect_join_with_options :other_call_id => call_id, :media => :bridge, :direction => :recv
+              expect_join_with_options :call_id => call_id, :media => :bridge, :direction => :recv
               subject.join target, :media => :bridge, :direction => :recv
             end
           end
         end
 
         context "with a call ID" do
           let(:target) { rand.to_s }
 
           it "should send a join command joining to the provided call ID" do
-            expect_join_with_options :other_call_id => target
+            expect_join_with_options :call_id => target
             subject.join target
           end
 
           context "and direction/media options" do
             it "should send a join command with the correct options" do
-              expect_join_with_options :other_call_id => target, :media => :bridge, :direction => :recv
+              expect_join_with_options :call_id => target, :media => :bridge, :direction => :recv
               subject.join target, :media => :bridge, :direction => :recv
             end
           end
         end
 
         context "with a call ID as a hash key" do
           let(:call_id) { rand.to_s }
           let(:target)  { { :call_id => call_id } }
 
           it "should send a join command joining to the provided call ID" do
-            expect_join_with_options :other_call_id => call_id
+            expect_join_with_options :call_id => call_id
             subject.join target
           end
 
           context "and direction/media options" do
             it "should send a join command with the correct options" do
-              expect_join_with_options :other_call_id => call_id, :media => :bridge, :direction => :recv
+              expect_join_with_options :call_id => call_id, :media => :bridge, :direction => :recv
               subject.join target.merge({:media => :bridge, :direction => :recv})
             end
           end
         end
 
@@ -546,30 +546,30 @@
         context "with a call" do
           let(:call_id) { rand.to_s }
           let(:target)  { flexmock Call.new, :id => call_id }
 
           it "should send an unjoin command unjoining from the provided call ID" do
-            expect_unjoin_with_options :other_call_id => call_id
+            expect_unjoin_with_options :call_id => call_id
             subject.unjoin target
           end
         end
 
         context "with a call ID" do
           let(:target) { rand.to_s }
 
           it "should send an unjoin command unjoining from the provided call ID" do
-            expect_unjoin_with_options :other_call_id => target
+            expect_unjoin_with_options :call_id => target
             subject.unjoin target
           end
         end
 
         context "with a call ID as a hash key" do
           let(:call_id) { rand.to_s }
           let(:target)  { { :call_id => call_id } }
 
           it "should send an unjoin command unjoining from the provided call ID" do
-            expect_unjoin_with_options :other_call_id => call_id
+            expect_unjoin_with_options :call_id => call_id
             subject.unjoin target
           end
         end
 
         context "with a mixer name as a hash key" do
@@ -615,36 +615,37 @@
           flexmock subject.wrapped_object, :write_and_await_response => true
         end
 
         it "should call #execute on the controller instance" do
           flexmock(CallController).should_receive(:exec).once.with mock_controller
-          subject.execute_controller mock_controller, latch
+          subject.execute_controller mock_controller, lambda { |call| latch.countdown! }
           latch.wait(3).should be_true
         end
 
-        it "should hangup the call after all controllers have executed" do
-          flexmock(CallController).should_receive(:exec).once.with mock_controller
-          subject.should_receive(:hangup).once
-          subject.execute_controller mock_controller, latch
-          latch.wait(3).should be_true
-        end
-
         it "should add the controller thread to the important threads" do
           flexmock(CallController).should_receive(:exec)
-          controller_thread = subject.execute_controller mock_controller, latch
+          controller_thread = subject.execute_controller mock_controller, lambda { |call| latch.countdown! }
           Adhearsion::Process.important_threads.should include controller_thread
         end
 
         it "should pass the exception to the events system" do
           latch = CountDownLatch.new 1
           Adhearsion::Events.exception do |e, l|
             e.should be_a RuntimeError
             l.should be subject.logger
             latch.countdown!
           end
-          subject.execute_controller BrokenController.new(subject), latch
+          subject.execute_controller BrokenController.new(subject), lambda { |call| latch.countdown! }
           latch.wait(3).should be true
           Adhearsion::Events.clear_handlers :exception
+        end
+
+        it "should execute a callback after the controller executes" do
+          flexmock(CallController).should_receive(:exec)
+          foo = nil
+          subject.execute_controller mock_controller, lambda { |call| foo = call; latch.countdown! }
+          latch.wait(3).should be_true
+          foo.should be subject
         end
       end
 
       describe "#register_controller" do
         it "should add the controller to a list on the call" do