adhearsion 2.5.4 → 2.6.0

data/spec/adhearsion/outbound_call_spec.rb

@@ -4,10 +4,17 @@ require 'spec_helper'
 
 module Adhearsion
   describe OutboundCall do
-    it { should be_a Call }
+    it { is_expected.to be_a Call }
 
-    its(:id) { should be_nil }
-    its(:variables) { should be == {} }
+    describe '#id' do
+      subject { super().id }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#variables' do
+      subject { super().variables }
+      it { is_expected.to eq({}) }
+    end
 
     let(:mock_client) { double 'Punchblock Client', execute_command: true, new_call_uri: call_uri }
 
@@ -16,8 +23,15 @@ module Adhearsion
       Adhearsion.active_calls.clear
     end
 
-    its(:client) { should be mock_client }
-    its(:start_time) { should be nil }
+    describe '#client' do
+      subject { super().client }
+      it { is_expected.to be mock_client }
+    end
+
+    describe '#start_time' do
+      subject { super().start_time }
+      it { is_expected.to be nil }
+    end
 
     let(:transport) { 'xmpp' }
     let(:call_id)   { SecureRandom.uuid }
@@ -30,7 +44,7 @@ module Adhearsion
       foo = :bar
       subject.after(1) { foo = :baz }
       sleep 1.1
-      foo.should == :baz
+      expect(foo).to eq(:baz)
     end
 
     describe ".originate" do
@@ -40,18 +54,18 @@ module Adhearsion
 
       before do
         mock_call
-        OutboundCall.should_receive(:new).and_return mock_call
+        expect(OutboundCall).to receive(:new).and_return mock_call
       end
 
       it "should dial the call to the correct endpoint and return it" do
-        mock_call.wrapped_object.should_receive(:dial).with(to, :from => 'foo').once
-        OutboundCall.originate(to, :from => 'foo').should be mock_call
+        expect(mock_call.wrapped_object).to receive(:dial).with(to, :from => 'foo').once
+        expect(OutboundCall.originate(to, :from => 'foo')).to be mock_call
       end
 
       it "should run through the router when the call is answered" do
-        mock_call.wrapped_object.should_receive(:dial).once
+        expect(mock_call.wrapped_object).to receive(:dial).once
 
-        Adhearsion.router.should_receive(:handle).once.with(mock_call)
+        expect(Adhearsion.router).to receive(:handle).once.with(mock_call)
 
         OutboundCall.originate(to) << Punchblock::Event::Answered.new
       end
@@ -60,15 +74,15 @@ module Adhearsion
         let(:controller) { CallController }
 
         it "should execute the controller on the call when it is answered" do
-          mock_call.should_receive(:dial).once.with(to, {})
-          mock_call.should_receive(:execute_controller).once.with kind_of(controller), kind_of(Proc)
+          expect(mock_call).to receive(:dial).once.with(to, {})
+          expect(mock_call).to receive(:execute_controller).once.with kind_of(controller), kind_of(Proc)
           call = OutboundCall.originate to, :controller => controller
           call << Punchblock::Event::Answered.new
         end
 
         it "should hangup the call after all controllers have executed" do
-          mock_call.should_receive(:dial).once
-          mock_call.should_receive(:hangup).once
+          expect(mock_call).to receive(:dial).once
+          expect(mock_call).to receive(:hangup).once
 
           call = OutboundCall.originate to, :controller => controller
           call << Punchblock::Event::Answered.new
@@ -77,9 +91,9 @@ module Adhearsion
 
         context "with controller metadata specified" do
           it "should set the metadata on the controller" do
-            mock_call.should_receive(:dial).once.with(to, {})
+            expect(mock_call).to receive(:dial).once.with(to, {})
             expected_controller = controller.new mock_call, foo: 'bar'
-            mock_call.should_receive(:execute_controller).with(expected_controller, kind_of(Proc)).once
+            expect(mock_call).to receive(:execute_controller).with(expected_controller, kind_of(Proc)).once
             call = OutboundCall.originate to, :controller => controller, :controller_metadata => {:foo => 'bar'}
             call << Punchblock::Event::Answered.new
           end
@@ -88,9 +102,9 @@ module Adhearsion
 
       context "when given a block" do
         it "should execute the block as a controller on the call when it is answered" do
-          mock_call.should_receive(:dial).once.with(to, {})
-          mock_call.should_receive(:execute_controller).once.with(kind_of(CallController), kind_of(Proc)).and_return do |controller|
-            controller.block.call.should be == :foobar
+          expect(mock_call).to receive(:dial).once.with(to, {})
+          expect(mock_call).to receive(:execute_controller).once.with(kind_of(CallController), kind_of(Proc)) do |controller|
+            expect(controller.block.call).to eq(:foobar)
           end
 
           call = OutboundCall.originate to do
@@ -102,8 +116,8 @@ module Adhearsion
 
       context "when the dial fails" do
         before do
-          subject.wrapped_object.should_receive(:write_command)
-          Punchblock::Command::Dial.any_instance.should_receive(:response).and_return StandardError.new("User not registered")
+          expect(subject.wrapped_object).to receive(:write_command)
+          expect_any_instance_of(Punchblock::Command::Dial).to receive(:response).and_return StandardError.new("User not registered")
         end
 
         after do
@@ -117,7 +131,7 @@ module Adhearsion
         it "should kill the actor" do
           expect { subject.dial to }.to raise_error("User not registered")
           sleep 0.1
-          subject.should_not be_alive
+          expect(subject.alive?).to be false
         end
       end
     end
@@ -129,7 +143,7 @@ module Adhearsion
         let(:event) { Punchblock::Event::Answered.new }
 
         it "should trigger any on_answer callbacks set" do
-          response.should_receive(:call).once.with(event)
+          expect(response).to receive(:call).once.with(event)
           subject.on_answer { |event| response.call event }
           subject << event
         end
@@ -137,27 +151,27 @@ module Adhearsion
         it "should record the call start time" do
           originate_time = Time.local(2008, 9, 1, 12, 0, 0)
           Timecop.freeze originate_time
-          subject.duration.should == 0.0
+          expect(subject.duration).to eq(0.0)
 
           mid_point_time = Time.local(2008, 9, 1, 12, 0, 20)
           Timecop.freeze mid_point_time
-          subject.duration.should == 0.0
+          expect(subject.duration).to eq(0.0)
 
           answer_time = Time.local(2008, 9, 1, 12, 0, 40)
           Timecop.freeze answer_time
           subject << event
-          subject.start_time.should == answer_time
+          expect(subject.start_time).to eq(answer_time)
 
           later_time = Time.local(2008, 9, 1, 12, 0, 50)
           Timecop.freeze later_time
-          subject.duration.should == 10.0
+          expect(subject.duration).to eq(10.0)
         end
       end
     end
 
     describe "#dial" do
       def expect_message_waiting_for_response(message, uri = call_uri)
-        subject.wrapped_object.should_receive(:write_and_await_response).once.with(message, 60, true).and_return do |real_message|
+        expect(subject.wrapped_object).to receive(:write_and_await_response).once.with(message, 60, true) do |real_message|
           real_message.request!
           real_message.response = Punchblock::Ref.new(uri: uri)
           real_message
@@ -168,29 +182,29 @@ module Adhearsion
 
       context "while waiting for a response" do
         before do
-          mock_client.should_receive(:execute_command).once.with(expected_dial_command).and_return true
+          expect(mock_client).to receive(:execute_command).once.with(expected_dial_command).and_return true
           subject.async.dial to, from: from
           sleep 1
         end
 
         it "should set the dial command" do
-          subject.dial_command.should be == expected_dial_command
+          expect(subject.dial_command).to eq(expected_dial_command)
         end
 
         it "should know its requested URI" do
-          subject.uri.should be == call_uri
+          expect(subject.uri).to eq(call_uri)
         end
 
         it "should know its requested ID" do
-          subject.id.should be == call_id
+          expect(subject.id).to eq(call_id)
         end
 
         it "should know its domain" do
-          subject.domain.should be == domain
+          expect(subject.domain).to eq(domain)
         end
 
         it "should be entered in the active calls registry" do
-          Adhearsion.active_calls[call_id].should be subject
+          expect(Adhearsion.active_calls[call_id]).to be subject
         end
       end
 
@@ -207,37 +221,37 @@ module Adhearsion
 
         it "should set the dial command" do
           subject.dial to, :from => from
-          subject.dial_command.should be == Punchblock::Command::Dial.new(:to => to, :from => from, :uri => call_uri, target_call_id: call_id, domain: domain, transport: transport)
+          expect(subject.dial_command).to eq(Punchblock::Command::Dial.new(:to => to, :from => from, :uri => call_uri, target_call_id: call_id, domain: domain, transport: transport))
         end
 
         it "should set the URI from the reference" do
           subject.dial to, :from => from
-          subject.uri.should be == call_uri
+          expect(subject.uri).to eq(call_uri)
         end
 
         it "should set the call ID from the reference" do
           subject.dial to, :from => from
-          subject.id.should be == call_id
+          expect(subject.id).to eq(call_id)
         end
 
         it "should set the call domain from the reference" do
           subject.dial to, :from => from
-          subject.domain.should be == domain
+          expect(subject.domain).to eq(domain)
         end
 
         it "should set the to from the dial command" do
           subject.dial to, :from => from
-          subject.to.should be == to
+          expect(subject.to).to eq(to)
         end
 
         it "should set the 'from' from the dial command" do
           subject.dial to, :from => from
-          subject.from.should be == from
+          expect(subject.from).to eq(from)
         end
 
         it "should add the call to the active calls registry" do
           subject.dial to, :from => from
-          Adhearsion.active_calls[call_id].should be subject
+          expect(Adhearsion.active_calls[call_id]).to be subject
         end
 
         context "when a different ref is returned than the one expected" do
@@ -248,41 +262,41 @@ module Adhearsion
           end
 
           it "should set the URI from the reference" do
-            subject.uri.should be == returned_uri
+            expect(subject.uri).to eq(returned_uri)
           end
 
           it "should set the call ID from the reference" do
-            subject.id.should be == 'otherid'
+            expect(subject.id).to eq('otherid')
           end
 
           it "should set the call domain from the reference" do
-            subject.domain.should be == 'wonderland.lit'
+            expect(subject.domain).to eq('wonderland.lit')
           end
 
           it "should make the call addressible in the active calls registry by the new ID" do
-            Adhearsion.active_calls[call_id].should be_nil
-            Adhearsion.active_calls['otherid'].should be subject
+            expect(Adhearsion.active_calls[call_id]).to be_nil
+            expect(Adhearsion.active_calls['otherid']).to be subject
           end
         end
 
         it "should immediately fire the :call_dialed event giving the call" do
-          Adhearsion::Events.should_receive(:trigger_immediately).once.with(:call_dialed, subject)
+          expect(Adhearsion::Events).to receive(:trigger_immediately).once.with(:call_dialed, subject)
           subject.dial to, :from => from
         end
 
         it "should not modify the provided options" do
           options = {:from => from}
           original_options = Marshal.load(Marshal.dump(options))
-          options.should be == original_options
+          expect(options).to eq(original_options)
           subject.dial to, options
-          options.should be == original_options
+          expect(options).to eq(original_options)
         end
       end
 
       context "when the dial fails" do
         before do
-          subject.wrapped_object.should_receive(:write_command)
-          Punchblock::Command::Dial.any_instance.should_receive(:response).and_return StandardError.new("User not registered")
+          expect(subject.wrapped_object).to receive(:write_command)
+          expect_any_instance_of(Punchblock::Command::Dial).to receive(:response).and_return StandardError.new("User not registered")
         end
 
         after do
@@ -296,20 +310,20 @@ module Adhearsion
         it "should kill the actor" do
           expect { subject.dial to }.to raise_error("User not registered")
           sleep 0.1
-          subject.should_not be_alive
+          expect(subject.alive?).to be false
         end
 
         it "should remove the call from the active calls hash" do
           expect { subject.dial to }.to raise_error("User not registered")
           sleep 0.1
-          Adhearsion.active_calls[call_id].should be_nil
+          expect(Adhearsion.active_calls[call_id]).to be_nil
         end
       end
     end
 
     describe "basic control commands" do
       def expect_no_message_waiting_for_response
-        subject.wrapped_object.should_receive(:write_and_await_response).never
+        expect(subject.wrapped_object).to receive(:write_and_await_response).never
       end
 
       describe '#accept' do

data/spec/adhearsion/plugin_spec.rb

@@ -12,7 +12,7 @@ describe Adhearsion::Plugin do
   end
 
   before do
-    Adhearsion::PunchblockPlugin::Initializer.stub :start => true
+    allow(Adhearsion::PunchblockPlugin::Initializer).to receive_messages :start => true
   end
 
   describe "inheritance" do
@@ -22,12 +22,12 @@ describe Adhearsion::Plugin do
 
     it "should provide the plugin name in a plugin class" do
       ::FooBar = Class.new Adhearsion::Plugin
-      ::FooBar.plugin_name.should be == "foo_bar"
+      expect(::FooBar.plugin_name).to eq("foo_bar")
     end
 
     it "should provide the plugin name in a plugin instance" do
       ::FooBar = Class.new Adhearsion::Plugin
-      ::FooBar.new.plugin_name.should be == "foo_bar"
+      expect(::FooBar.new.plugin_name).to eq("foo_bar")
     end
 
     it "should provide a setter for plugin name" do
@@ -35,7 +35,7 @@ describe Adhearsion::Plugin do
         self.plugin_name = "bar_foo"
       end
 
-      ::FooBar.plugin_name.should be == "bar_foo"
+      expect(::FooBar.plugin_name).to eq("bar_foo")
     end
   end
 
@@ -54,28 +54,34 @@ describe Adhearsion::Plugin do
       end
     }
 
-    its(:plugin_name) { should be == :bar_foo }
+    describe '#plugin_name' do
+      subject { super().plugin_name }
+      it { is_expected.to eq(:bar_foo) }
+    end
 
-    its(:config) { should be_instance_of Loquacious::Configuration }
+    describe '#config' do
+      subject { super().config }
+      it { is_expected.to be_instance_of Loquacious::Configuration }
+    end
 
     it "should keep a default configuration and a description" do
       [:name, :password, :host].each do |value|
-        subject.config.should respond_to value
+        expect(subject.config).to respond_to value
       end
 
-      subject.config.name.should     be == "user"
-      subject.config.password.should be == "password"
-      subject.config.host.should     be == "localhost"
+      expect(subject.config.name).to     eq("user")
+      expect(subject.config.password).to eq("password")
+      expect(subject.config.host).to     eq("localhost")
     end
 
     it "should return a description of configuration options" do
-      subject.show_description.should be_kind_of Loquacious::Configuration::Help
+      expect(subject.show_description).to be_kind_of Loquacious::Configuration::Help
     end
 
     describe "while updating config values" do
       it "should return the updated value" do
         subject.config.name = "usera"
-        subject.config.name.should be == "usera"
+        expect(subject.config.name).to eq("usera")
       end
     end
 
@@ -87,15 +93,15 @@ describe Adhearsion::Plugin do
     it "should add plugins on the air" do
       Adhearsion::Plugin.delete_all
       Adhearsion::Plugin.add AhnPluginDemo
-      Adhearsion::Plugin.count.should eql 1
+      expect(Adhearsion::Plugin.count).to eql 1
     end
 
     it "should delete plugins on the air" do
       Adhearsion::Plugin.delete_all
       Adhearsion::Plugin.add AhnPluginDemo
-      Adhearsion::Plugin.count.should eql 1
+      expect(Adhearsion::Plugin.count).to eql 1
       Adhearsion::Plugin.delete AhnPluginDemo
-      Adhearsion::Plugin.count.should eql 0
+      expect(Adhearsion::Plugin.count).to eql 0
     end
   end
 
@@ -107,7 +113,7 @@ describe Adhearsion::Plugin do
     it "should count the number of registered plugins" do
       number = Adhearsion::Plugin.count
       FooBar = Class.new Adhearsion::Plugin
-      Adhearsion::Plugin.count.should eql(number + 1)
+      expect(Adhearsion::Plugin.count).to eql(number + 1)
     end
   end
 
@@ -142,7 +148,7 @@ describe Adhearsion::Plugin do
         FooBar = Class.new Adhearsion::Plugin
 
         # 1 => Punchblock. Must be empty once punchblock initializer is an external Plugin
-        Adhearsion::Plugin.initializers.should have(1).initializers
+        expect(Adhearsion::Plugin.initializers.size).to eq(1)
         Adhearsion::Plugin.init_plugins
       end
 
@@ -155,8 +161,8 @@ describe Adhearsion::Plugin do
           end
         end
 
-        FooBar.should_receive(:log).once
-        Adhearsion::Plugin.initializers.length.should be 1
+        expect(FooBar).to receive(:log).once
+        expect(Adhearsion::Plugin.initializers.length).to be 1
         Adhearsion::Plugin.init_plugins
       end
 
@@ -181,7 +187,7 @@ describe Adhearsion::Plugin do
           end
         end
 
-        FooBar.should_receive(:log).exactly(3).times
+        expect(FooBar).to receive(:log).exactly(3).times
         Adhearsion::Plugin.init_plugins
       end
 
@@ -201,8 +207,8 @@ describe Adhearsion::Plugin do
           end
         end
 
-        Adhearsion::Plugin.initializers.tsort.first.name.should eql :foo_bar_baz
-        Adhearsion::Plugin.initializers.tsort.last.name.should eql :foo_bar
+        expect(Adhearsion::Plugin.initializers.tsort.first.name).to eql :foo_bar_baz
+        expect(Adhearsion::Plugin.initializers.tsort.last.name).to eql :foo_bar
       end
 
       it "should allow to include an initializer after another one" do
@@ -227,9 +233,9 @@ describe Adhearsion::Plugin do
           end
         end
 
-        Adhearsion::Plugin.initializers.length.should eql 3
-        Adhearsion::Plugin.initializers.tsort.first.name.should eql :foo_bar
-        Adhearsion::Plugin.initializers.tsort.last.name.should eql :foo_bar_baz
+        expect(Adhearsion::Plugin.initializers.length).to eql 3
+        expect(Adhearsion::Plugin.initializers.tsort.first.name).to eql :foo_bar
+        expect(Adhearsion::Plugin.initializers.tsort.last.name).to eql :foo_bar_baz
       end
     end
 
@@ -238,7 +244,7 @@ describe Adhearsion::Plugin do
         FooBar = Class.new Adhearsion::Plugin
 
         # May become 1 if Punchblock defines a runner.
-        Adhearsion::Plugin.runners.should have(0).runners
+        expect(Adhearsion::Plugin.runners.size).to eq(0)
         Adhearsion::Plugin.run_plugins
       end
 
@@ -251,8 +257,8 @@ describe Adhearsion::Plugin do
           end
         end
 
-        FooBar.should_receive(:log).once
-        Adhearsion::Plugin.runners.length.should be 1
+        expect(FooBar).to receive(:log).once
+        expect(Adhearsion::Plugin.runners.length).to be 1
         Adhearsion::Plugin.run_plugins
       end
 
@@ -277,7 +283,7 @@ describe Adhearsion::Plugin do
           end
         end
 
-        FooBar.should_receive(:log).exactly(3).times
+        expect(FooBar).to receive(:log).exactly(3).times
         Adhearsion::Plugin.run_plugins
       end
 
@@ -297,8 +303,8 @@ describe Adhearsion::Plugin do
           end
         end
 
-        Adhearsion::Plugin.runners.tsort.first.name.should eql :foo_bar_baz
-        Adhearsion::Plugin.runners.tsort.last.name.should eql :foo_bar
+        expect(Adhearsion::Plugin.runners.tsort.first.name).to eql :foo_bar_baz
+        expect(Adhearsion::Plugin.runners.tsort.last.name).to eql :foo_bar
       end
 
       it "should allow to include an runner after another one" do
@@ -323,9 +329,9 @@ describe Adhearsion::Plugin do
           end
         end
 
-        Adhearsion::Plugin.runners.length.should eql 3
-        Adhearsion::Plugin.runners.tsort.first.name.should eql :foo_bar
-        Adhearsion::Plugin.runners.tsort.last.name.should eql :foo_bar_baz
+        expect(Adhearsion::Plugin.runners.length).to eql 3
+        expect(Adhearsion::Plugin.runners.tsort.first.name).to eql :foo_bar
+        expect(Adhearsion::Plugin.runners.tsort.last.name).to eql :foo_bar_baz
       end
     end
   end
@@ -340,32 +346,35 @@ describe Adhearsion::Plugin do
     subject { Adhearsion::Plugin.tasks }
 
     it "should return an Array" do
-      subject.should be_instance_of Array
+      expect(subject).to be_instance_of Array
     end
 
-    its(:length) { should be == 0 }
+    describe '#length' do
+      subject { super().length }
+      it { is_expected.to eq(0) }
+    end
 
     it "should not load a new task when there is no block in the method call" do
-      subject.length.should be == 0
+      expect(subject.length).to eq(0)
       FooBar = Class.new Adhearsion::Plugin do
         tasks
       end
 
-      subject.length.should be == 0
+      expect(subject.length).to eq(0)
     end
 
     it "should load a new task when there is a block in the method call" do
-      subject.length.should be == 0
+      expect(subject.length).to eq(0)
       FooBar = Class.new Adhearsion::Plugin do
         tasks do
           puts "foo bar"
         end
       end
-      Adhearsion::Plugin.tasks.length.should be == 1
+      expect(Adhearsion::Plugin.tasks.length).to eq(1)
     end
 
     it "should execute the tasks blocks while loading rake tasks" do
-      subject.length.should be == 0
+      expect(subject.length).to eq(0)
       FooBar = Class.new Adhearsion::Plugin do
         tasks do
           FooBar.foo
@@ -373,7 +382,7 @@ describe Adhearsion::Plugin do
         def self.foo
         end
       end
-      FooBar.should_receive(:foo).once
+      expect(FooBar).to receive(:foo).once
       Adhearsion::Plugin.load_tasks
     end
 
@@ -392,8 +401,8 @@ describe Adhearsion::Plugin do
         generators :gen1 => TestGenerator1, :gen2 => TestGenerator2
       end
 
-      Adhearsion::Generators.mappings[:gen1].should be TestGenerator1
-      Adhearsion::Generators.mappings[:gen2].should be TestGenerator2
+      expect(Adhearsion::Generators.mappings[:gen1]).to be TestGenerator1
+      expect(Adhearsion::Generators.mappings[:gen2]).to be TestGenerator2
     end
   end