adhearsion 2.5.4 → 2.6.0

data/spec/adhearsion/statistics/dump_spec.rb

@@ -6,33 +6,33 @@ describe Adhearsion::Statistics::Dump do
   it "should have a timestamp" do
     origin_time = Time.now
     dump = Adhearsion::Statistics::Dump.new timestamp: origin_time
-    dump.timestamp.should == origin_time
+    expect(dump.timestamp).to eq(origin_time)
   end
 
   it "should have a hash of call counts" do
     counts = {dialed: 0, offered: 0, routed: 0, rejected: 0, active: 0}
     dump = Adhearsion::Statistics::Dump.new call_counts: counts
-    dump.call_counts.should == counts
+    expect(dump.call_counts).to eq(counts)
   end
 
   it "should have a hash of call counts by route" do
     counts = {"my route" => 1, "your route" => 10}
     dump = Adhearsion::Statistics::Dump.new calls_by_route: counts
-    dump.calls_by_route.should == counts
+    expect(dump.calls_by_route).to eq(counts)
   end
 
   it "should be equal to another dump if they share the same timestamp" do
     origin_time = Time.now
     dump1 = Adhearsion::Statistics::Dump.new timestamp: origin_time
     dump2 = Adhearsion::Statistics::Dump.new timestamp: origin_time
-    dump1.should be == dump2
+    expect(dump1).to eq(dump2)
   end
 
   it "should compare based on the timestamp" do
     origin_time = Time.now
     dump1 = Adhearsion::Statistics::Dump.new timestamp: origin_time
     dump2 = Adhearsion::Statistics::Dump.new timestamp: (origin_time + 1)
-    dump1.should be < dump2
-    dump2.should be > dump1
+    expect(dump1).to be < dump2
+    expect(dump2).to be > dump1
   end
 end

data/spec/adhearsion/statistics_spec.rb

@@ -11,7 +11,7 @@ describe Adhearsion::Statistics do
 
   before do
     Celluloid::Actor[:statistics] = described_class.new
-    Adhearsion.active_calls.stub count: 0
+    allow(Adhearsion.active_calls).to receive_messages count: 0
   end
 
   after do
@@ -21,25 +21,25 @@ describe Adhearsion::Statistics do
 
   describe "#dump" do
     it "should report 0 calls offered, routed, rejected, active & completed" do
-      subject.dump.call_counts.should == {dialed: 0, offered: 0, routed: 0, rejected: 0, active: 0}
+      expect(subject.dump.call_counts).to eq({dialed: 0, offered: 0, routed: 0, rejected: 0, active: 0})
     end
 
     it "should report 0 calls for each route in the router" do
-      subject.dump.calls_by_route.should == {}
+      expect(subject.dump.calls_by_route).to eq({})
       Adhearsion.router.route 'your route', Adhearsion::CallController
       Adhearsion.router.route 'my route', Adhearsion::CallController
-      subject.dump.calls_by_route.should == {'your route' => 0, 'my route' => 0}
+      expect(subject.dump.calls_by_route).to eq({'your route' => 0, 'my route' => 0})
     end
   end
 
   it "should listen for dialed call events and increment the dialed call count" do
     Adhearsion::Events.trigger_immediately :call_dialed, :foo_call
-    subject.dump.call_counts.should == {dialed: 1, offered: 0, routed: 0, rejected: 0, active: 0}
+    expect(subject.dump.call_counts).to eq({dialed: 1, offered: 0, routed: 0, rejected: 0, active: 0})
   end
 
   it "should listen for call offer events and increment the offered call count" do
     Adhearsion::Events.trigger_immediately :punchblock, Punchblock::Event::Offer.new
-    subject.dump.call_counts.should == {dialed: 0, offered: 1, routed: 0, rejected: 0, active: 0}
+    expect(subject.dump.call_counts).to eq({dialed: 0, offered: 1, routed: 0, rejected: 0, active: 0})
   end
 
   context "when call_routed events are triggered" do
@@ -53,16 +53,16 @@ describe Adhearsion::Statistics do
     end
 
     it "should increment the routed call count" do
-      subject.dump.call_counts.should == {dialed: 0, offered: 0, routed: 1, rejected: 0, active: 0}
+      expect(subject.dump.call_counts).to eq({dialed: 0, offered: 0, routed: 1, rejected: 0, active: 0})
     end
 
     it "should increment the calls_by_route counter for the route matched" do
-      subject.dump.calls_by_route.should == {'your route' => 0, 'my route' => 1}
+      expect(subject.dump.calls_by_route).to eq({'your route' => 0, 'my route' => 1})
     end
   end
 
   it "should listen for rejected call events and increment the rejected call count" do
     Adhearsion::Events.trigger_immediately :call_rejected, call: :foo, reason: :bar
-    subject.dump.call_counts.should == {dialed: 0, offered: 0, routed: 0, rejected: 1, active: 0}
+    expect(subject.dump.call_counts).to eq({dialed: 0, offered: 0, routed: 0, rejected: 1, active: 0})
   end
 end

data/spec/adhearsion_spec.rb

@@ -6,42 +6,42 @@ describe Adhearsion do
   describe "#root=" do
     it "should update properly the config root variable" do
       Adhearsion.root = "./"
-      Adhearsion.config[:platform].root.should be == Dir.getwd
+      expect(Adhearsion.config[:platform].root).to eq(Dir.getwd)
     end
 
     it "should update properly the config root variable when path is nil" do
       Adhearsion.root = nil
-      Adhearsion.config[:platform].root.should be_nil
+      expect(Adhearsion.config[:platform].root).to be_nil
     end
   end
 
   describe "#root" do
     it "should return the set root" do
       Adhearsion.root = "./"
-      Adhearsion.root.should be == Dir.getwd
+      expect(Adhearsion.root).to eq(Dir.getwd)
     end
   end
 
   describe "#ahn_root=" do
     it "should update properly the config root variable" do
       Adhearsion.ahn_root = "./"
-      Adhearsion.config[:platform].root.should be == Dir.getwd
+      expect(Adhearsion.config[:platform].root).to eq(Dir.getwd)
     end
 
     it "should update properly the config root variable when path is nil" do
       Adhearsion.ahn_root = nil
-      Adhearsion.config[:platform].root.should be_nil
+      expect(Adhearsion.config[:platform].root).to be_nil
     end
   end
 
   describe "#config" do
     it "should return a Configuration instance" do
-      subject.config.should be_instance_of Adhearsion::Configuration
+      expect(subject.config).to be_instance_of Adhearsion::Configuration
     end
 
     it "should execute a block" do
       foo = Object.new
-      foo.should_receive(:bar).once
+      expect(foo).to receive(:bar).once
       Adhearsion.config do |config|
         foo.bar
       end
@@ -51,15 +51,18 @@ describe Adhearsion do
   describe "#environments" do
     it "should be the collection of valid environments" do
       Adhearsion.config.valid_environments << :foo
-      Adhearsion.environments.should include :foo
+      expect(Adhearsion.environments).to include :foo
     end
   end
 
   describe "#router" do
-    its(:router) { should be_a Adhearsion::Router }
+    describe '#router' do
+      subject { super().router }
+      it { is_expected.to be_a Adhearsion::Router }
+    end
 
     it "should always use the same router" do
-      Adhearsion.router.should be Adhearsion.router
+      expect(Adhearsion.router).to be Adhearsion.router
     end
 
     it "should pass a block along to the router" do
@@ -68,45 +71,45 @@ describe Adhearsion do
         foo = self
       end
 
-      foo.should be Adhearsion.router
+      expect(foo).to be Adhearsion.router
     end
   end
 
   describe "#active_calls" do
     it "should be a calls collection" do
-      Adhearsion.active_calls.should be_a Adhearsion::Calls
+      expect(Adhearsion.active_calls).to be_a Adhearsion::Calls
     end
 
     it "should return the same instance each time" do
-      Adhearsion.active_calls.should be Adhearsion.active_calls
+      expect(Adhearsion.active_calls).to be Adhearsion.active_calls
     end
   end
 
   describe "#statistics" do
     it "should be a statistics aggregator" do
-      Adhearsion.statistics.should be_a Adhearsion::Statistics
+      expect(Adhearsion.statistics).to be_a Adhearsion::Statistics
     end
 
     it "should return the same instance each time" do
-      Adhearsion.statistics.should be Adhearsion.statistics
+      expect(Adhearsion.statistics).to be Adhearsion.statistics
     end
 
     it "should create a new aggregator if the existing one dies" do
       original = Adhearsion.statistics
       original.terminate
-      original.should_not be_alive
+      expect(original.alive?).to be false
 
       sleep 0.25
 
       current = Adhearsion.statistics
-      current.should be_alive
-      current.should_not be original
+      expect(current).to be_alive
+      expect(current).not_to be original
     end
   end
 
   describe "#status" do
     it "should be the process status name" do
-      Adhearsion.status.should be == :booting
+      expect(Adhearsion.status).to eq(:booting)
     end
   end
 
@@ -114,7 +117,7 @@ describe Adhearsion do
     Dir['{bin,features,lib,spec}/**/*.rb'].each do |filename|
       File.open filename do |file|
         first_line = file.first
-        first_line.should == "# encoding: utf-8\n"
+        expect(first_line).to eq("# encoding: utf-8\n")
       end
     end
   end

data/spec/spec_helper.rb

@@ -21,15 +21,12 @@ Bundler.require(:default, :test) if defined?(Bundler)
 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 = :rspec
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-  config.color_enabled = true
+  config.color = true
 
-  config.mock_with :rspec do |mocks|
-    mocks.add_stub_and_should_receive_to Celluloid::AbstractProxy, ThreadSafeArray
-  end
+  config.raise_errors_for_deprecations!
 
   config.before :suite do
     Adhearsion::Logging.start Adhearsion::Logging.default_appenders, :trace, Adhearsion.config.platform.logging.formatter
@@ -39,7 +36,7 @@ RSpec.configure do |config|
 
   config.before :each do
     Adhearsion.router = nil
-    Punchblock.stub new_request_id: 'foo'
+    allow(Punchblock).to receive(:new_request_id).and_return 'foo'
   end
 
   config.after :each do

data/spec/support/call_controller_test_helpers.rb

@@ -6,12 +6,12 @@ module CallControllerTestHelpers
     test_case.let(:call)        { Adhearsion::Call.new }
     test_case.let(:block)       { nil }
     test_case.let(:metadata)    { {doo: :dah} }
-    test_case.let(:controller)  { new_controller test_case.describes }
+    test_case.let(:controller)  { new_controller test_case.described_class }
 
     test_case.subject { controller }
 
     test_case.before do
-      call.wrapped_object.stub :write_command => true, :id => call_id
+      allow(call.wrapped_object).to receive_messages :write_command => true, :id => call_id
     end
   end
 
@@ -26,7 +26,7 @@ module CallControllerTestHelpers
   end
 
   def expect_message_waiting_for_response(message = nil, fail = false, &block)
-    expectation = controller.should_receive(:write_and_await_response, &block).once
+    expectation = expect(controller).to receive(:write_and_await_response, &block).once
     expectation = expectation.with message if message
     if fail
       expectation.and_raise fail
@@ -36,11 +36,11 @@ module CallControllerTestHelpers
   end
 
   def expect_message_of_type_waiting_for_response(message)
-    controller.should_receive(:write_and_await_response).once.with(kind_of(message.class)).and_return message
+    expect(controller).to receive(:write_and_await_response).once.with(kind_of(message.class)).and_return message
   end
 
   def expect_component_execution(component, fail = false)
-    expectation = controller.should_receive(:execute_component_and_await_completion).once.with(component)
+    expectation = expect(controller).to receive(:execute_component_and_await_completion).once.with(component)
     if fail
       expectation.and_raise fail
     else
@@ -50,7 +50,7 @@ module CallControllerTestHelpers
 
   def expect_input_component_complete_event(utterance)
     complete_event = Punchblock::Event::Complete.new
-    complete_event.stub reason: double(utterance: utterance, name: :input)
-    Punchblock::Component::Input.any_instance.stub(complete?: true, complete_event: complete_event)
+    allow(complete_event).to receive_messages reason: double(utterance: utterance, name: :input)
+    allow_any_instance_of(Punchblock::Component::Input).to receive_messages(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]
+    Adhearsion::Initializer => [:debugging_log, :initialize_log_paths, :update_rails_env_var, :require, :load, :init_plugins, :run_plugins]
   } unless defined? UNWANTED_BEHAVIOR
 
   def stub_behavior_for_initializer_with_no_path_changing_behavior

data/spec/support/punchblock_mocks.rb

@@ -3,7 +3,7 @@
 def mock_offer(id = nil, headers = {})
   id ||= rand
   double("Offer: #{id}").tap do |offer|
-    offer.stub :call_id => id, :headers => headers
+    allow(offer).to receive_messages :call_id => id, :headers => 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.5.4
+  version: 2.6.0
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,14 +179,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +244,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: ci_reporter_rspec
+  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: ci_reporter_cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,14 +319,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -432,7 +446,6 @@ files:
 - features/step_definitions/app_generator_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
-- features/support/utils.rb
 - lib/adhearsion.rb
 - lib/adhearsion/call.rb
 - lib/adhearsion/call_controller.rb
@@ -593,7 +606,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adhearsion, open-source telephony development framework
@@ -611,7 +624,6 @@ test_files:
 - features/step_definitions/app_generator_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
-- features/support/utils.rb
 - spec/adhearsion/call_controller/dial_spec.rb
 - spec/adhearsion/call_controller/input_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/array_match_calculator_spec.rb

data/features/support/utils.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-Given /^PENDING/ do
-  pending
-end
-
-Given /^JRuby skip test/ do
-  pending "Daemonize not supported under JRuby" if RUBY_PLATFORM == 'java'
-end