[CI] Fix the build on 3.0

.travis.yml

@@ -1,12 +1,19 @@
+dist: xenial
 language: ruby
-sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - jruby-9.1.2.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.3
+  - jruby-9.1.17.0
+  - jruby
   - ruby-head
+jdk:
+  - openjdk8 # for jruby
 matrix:
   allow_failures:
     - rvm: ruby-head
+before_install: rvm list
 notifications:
   irc: "irc.freenode.org#adhearsion"

cucumber.yml

@@ -1,2 +1,2 @@
-default: --tags ~@wip
+default: --strict --tags ~@wip
 wip: --wip --tags @wip

ruby_ami.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<celluloid-io>, ["~> 0.13"]
   s.add_runtime_dependency %q<celluloid>, ["~> 0.16.0"]
 
-  s.add_development_dependency %q<bundler>, ["~> 1.0"]
-  s.add_development_dependency %q<rspec>, ["~> 2.5"]
-  s.add_development_dependency %q<cucumber>, [">= 0"]
+  s.add_development_dependency %q<bundler>, [">= 1.0"]
+  s.add_development_dependency %q<rspec>, [">= 3.0"]
+  s.add_development_dependency %q<cucumber>, ["< 3.0"]
   s.add_development_dependency %q<yard>, ["~> 0.6"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<guard-rspec>

spec/ruby_ami/action_spec.rb

@@ -12,30 +12,30 @@ module RubyAMI
       end
     end
 
-    it { should_not be_complete }
+    it { is_expected.not_to be_complete }
 
     describe "SIPPeers actions" do
       it "has causal events" do
-        Action.new('SIPPeers').has_causal_events?.should be true
+        expect(Action.new('SIPPeers').has_causal_events?).to be true
       end
     end
 
     describe "the ParkedCalls terminator event" do
       it "knows its causal event terminator name" do
-        Action.new('ParkedCalls').causal_event_terminator_name.should == "parkedcallscomplete"
+        expect(Action.new('ParkedCalls').causal_event_terminator_name).to eq("parkedcallscomplete")
       end
     end
 
     it "should properly convert itself into a String when additional headers are given" do
       string = Action.new("Hawtsawce", "Monkey" => "Zoo").to_s
-      string.should =~ /^Action: Hawtsawce\r\n/i
-      string.should =~ /[^\n]\r\n\r\n$/
-      string.should =~ /^(\w+:\s*[\w-]+\r\n){3}\r\n$/
+      expect(string).to match(/^Action: Hawtsawce\r\n/i)
+      expect(string).to match(/[^\n]\r\n\r\n$/)
+      expect(string).to match(/^(\w+:\s*[\w-]+\r\n){3}\r\n$/)
     end
 
     it "should properly convert itself into a String when no additional headers are given" do
-      Action.new("Ping").to_s.should =~ /^Action: Ping\r\nActionID: [\w-]+\r\n\r\n$/i
-      Action.new("ParkedCalls").to_s.should =~ /^Action: ParkedCalls\r\nActionID: [\w-]+\r\n\r\n$/i
+      expect(Action.new("Ping").to_s).to match(/^Action: Ping\r\nActionID: [\w-]+\r\n\r\n$/i)
+      expect(Action.new("ParkedCalls").to_s).to match(/^Action: ParkedCalls\r\nActionID: [\w-]+\r\n\r\n$/i)
     end
 
     describe '#<<' do
@@ -46,14 +46,14 @@ module RubyAMI
           before { subject << response }
 
           it 'should set the response' do
-            subject.response.should be response
+            expect(subject.response).to be response
           end
 
           it 'should call the callback' do
-            @callback_result.should be response
+            expect(@callback_result).to be response
           end
 
-          it { should be_complete }
+          it { is_expected.to be_complete }
         end
 
         context 'with an error' do
@@ -62,15 +62,15 @@ module RubyAMI
           before { subject << error }
 
           it 'should set the response' do
-            subject.response.should == error
+            expect(subject.response).to eq(error)
           end
 
-          it { should be_complete }
+          it { is_expected.to be_complete }
         end
 
         context 'with an event' do
           it 'should raise an error' do
-            lambda { subject << Event.new('foo') }.should raise_error StandardError, /causal action/
+            expect { subject << Event.new('foo') }.to raise_error StandardError, /causal action/
           end
         end
       end
@@ -82,7 +82,7 @@ module RubyAMI
         context 'with a response' do
           before { subject << response }
 
-          it { should_not be_complete }
+          it { is_expected.not_to be_complete }
         end
 
         context 'with an event' do
@@ -91,7 +91,7 @@ module RubyAMI
           before { subject << response << event }
 
           it "should add the events to the response" do
-            subject.response.events.should == [event]
+            expect(subject.response.events).to eq([event])
           end
         end
 
@@ -100,17 +100,17 @@ module RubyAMI
 
           before do
             subject << response
-            subject.should_not be_complete
+            expect(subject).not_to be_complete
             subject << event
           end
 
           it "should add the events to the response" do
-            subject.response.events.should == [event]
+            expect(subject.response.events).to eq([event])
           end
 
-          it { should be_complete }
+          it { is_expected.to be_complete }
 
-          it { subject.response.should be response }
+          it { expect(subject.response).to be response }
         end
       end
     end
@@ -119,21 +119,21 @@ module RubyAMI
       describe 'with another Action' do
         context 'with identical name and headers' do
           let(:other) { Action.new name, headers }
-          it { should == other }
+          it { is_expected.to eq(other) }
         end
 
         context 'with identical name and different headers' do
           let(:other) { Action.new name, 'boo' => 'baz' }
-          it { should_not == other }
+          it { is_expected.not_to eq(other) }
         end
 
         context 'with different name and identical headers' do
           let(:other) { Action.new 'BARBAZ', headers }
-          it { should_not == other }
+          it { is_expected.not_to eq(other) }
         end
       end
 
-      it { should_not == :foo }
+      it { is_expected.not_to eq(:foo) }
     end
   end # Action
 end # RubyAMI

spec/ruby_ami/agi_result_parser_spec.rb

@@ -16,46 +16,46 @@ module RubyAMI
     context 'with a simple result with no data' do
       let(:result_string) { "200%20result=123%0A" }
 
-      it { subject.code.should == 200 }
-      it { subject.result.should == 123 }
-      it { subject.data.should == '' }
-      it { subject.data_hash.should == nil }
+      it { expect(subject.code).to eq(200) }
+      it { expect(subject.result).to eq(123) }
+      it { expect(subject.data).to eq('') }
+      it { expect(subject.data_hash).to eq(nil) }
     end
 
     context 'with a simple unescaped result with no data' do
       let(:result_string) { "200 result=123" }
 
-      it { subject.code.should == 200 }
-      it { subject.result.should == 123 }
-      it { subject.data.should == '' }
-      it { subject.data_hash.should == nil }
+      it { expect(subject.code).to eq(200) }
+      it { expect(subject.result).to eq(123) }
+      it { expect(subject.data).to eq('') }
+      it { expect(subject.data_hash).to eq(nil) }
     end
 
     context 'with a result and data in parens' do
       let(:result_string) { "200%20result=-123%20(timeout)%0A" }
 
-      it { subject.code.should == 200 }
-      it { subject.result.should == -123 }
-      it { subject.data.should == 'timeout' }
-      it { subject.data_hash.should == nil }
+      it { expect(subject.code).to eq(200) }
+      it { expect(subject.result).to eq(-123) }
+      it { expect(subject.data).to eq('timeout') }
+      it { expect(subject.data_hash).to eq(nil) }
     end
 
     context 'with a result and key-value data' do
       let(:result_string) { "200%20result=123%20foo=bar%0A" }
 
-      it { subject.code.should == 200 }
-      it { subject.result.should == 123 }
-      it { subject.data.should == 'foo=bar' }
-      it { subject.data_hash.should == {'foo' => 'bar'} }
+      it { expect(subject.code).to eq(200) }
+      it { expect(subject.result).to eq(123) }
+      it { expect(subject.data).to eq('foo=bar') }
+      it { expect(subject.data_hash).to eq({'foo' => 'bar'}) }
     end
 
     context 'with a 5xx error' do
       let(:result_string) { "510%20Invalid%20or%20unknown%20command%0A" }
 
-      it { subject.code.should == 510 }
-      it { subject.result.should be_nil }
-      it { subject.data.should == 'Invalid or unknown command' }
-      it { subject.data_hash.should be_nil }
+      it { expect(subject.code).to eq(510) }
+      it { expect(subject.result).to be_nil }
+      it { expect(subject.data).to eq('Invalid or unknown command') }
+      it { expect(subject.data_hash).to be_nil }
     end
   end
 end

spec/ruby_ami/async_agi_environment_parser_spec.rb

@@ -9,12 +9,12 @@ module RubyAMI
 
     subject { described_class.new environment_string }
 
-    it { subject.to_s.should == environment_string }
-    it { subject.to_s.should_not be environment_string }
+    it { expect(subject.to_s).to eq(environment_string) }
+    it { expect(subject.to_s).not_to be environment_string }
 
     describe 'retrieving a hash representation' do
       it "should return a hash of attributes" do
-        subject.to_hash.should == {
+        expect(subject.to_hash).to eq({
           :agi_request      => 'async',
           :agi_channel      => 'SIP/1234-00000000',
           :agi_language     => 'en',
@@ -35,11 +35,11 @@ module RubyAMI
           :agi_enhanced     => '0.0',
           :agi_accountcode  => '',
           :agi_threadid     => '4366221312'
-        }
+        })
       end
 
       it "should not return the same hash object every time" do
-        subject.to_hash.should_not be subject.to_hash
+        expect(subject.to_hash).not_to be subject.to_hash
       end
     end
   end

spec/ruby_ami/event_spec.rb

@@ -8,11 +8,11 @@ module RubyAMI
     describe "#receipt_time" do
       before do
         @now = DateTime.now
-        DateTime.stub now: @now
+        allow(DateTime).to receive_messages now: @now
       end
 
       it "should be the time the object was created (event receipt time)" do
-        subject.receipt_time.should == @now
+        expect(subject.receipt_time).to eq(@now)
       end
     end
 
@@ -21,27 +21,27 @@ module RubyAMI
 
       describe "#timestamp" do
         it "should be a time object representing the event's timestamp (assuming UTC)" do
-          subject.timestamp.should == DateTime.new(2014, 2, 25, 22, 46, 20)
+          expect(subject.timestamp).to eq(DateTime.new(2014, 2, 25, 22, 46, 20))
         end
       end
 
       describe "#best_time" do
         it "should be the timestamp" do
-          subject.best_time.should == subject.timestamp
+          expect(subject.best_time).to eq(subject.timestamp)
         end
       end
     end
 
     context "when the event does not have a timestamp" do
       describe "#timestamp" do
         it "should be nil" do
-          subject.timestamp.should be_nil
+          expect(subject.timestamp).to be_nil
         end
       end
 
       describe "#best_time" do
         it "should be the receipt_time" do
-          subject.best_time.should == subject.receipt_time
+          expect(subject.best_time).to eq(subject.receipt_time)
         end
       end
     end
@@ -63,7 +63,7 @@ module RubyAMI
         end
 
         it "should be equal" do
-          event1.should be == event2
+          expect(event1).to eq(event2)
         end
       end
 
@@ -83,7 +83,7 @@ module RubyAMI
         end
 
         it "should not be equal" do
-          event1.should_not be == event2
+          expect(event1).not_to eq(event2)
         end
       end
 
@@ -103,7 +103,7 @@ module RubyAMI
         end
 
         it "should not be equal" do
-          event1.should_not be == event2
+          expect(event1).not_to eq(event2)
         end
       end
     end

spec/ruby_ami/response_spec.rb

@@ -18,7 +18,7 @@ module RubyAMI
         end
 
         it "should be equal" do
-          event1.should be == event2
+          expect(event1).to eq(event2)
         end
       end
 
@@ -36,7 +36,7 @@ module RubyAMI
         end
 
         it "should not be equal" do
-          event1.should_not be == event2
+          expect(event1).not_to eq(event2)
         end
       end
     end