Upgrade gem rspec

Author: vitalie

Gemfile

@@ -25,7 +25,7 @@ gem 'jemalloc',        git: 'https://github.com/travis-ci/jemalloc-rb', branch:
 
 group :development, :test do
   gem 'pry'
-  gem 'rspec',         '~> 2.9'
+  gem 'rspec'
 end
 
 group :development do

Gemfile.lock

@@ -27,7 +27,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
     foreman (0.41.0)
@@ -62,14 +62,19 @@ GEM
     redis (3.3.5)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     sentry-raven (2.7.3)
       faraday (>= 0.7.6, < 1.0)
     sidekiq (4.0.2)
@@ -105,7 +110,7 @@ DEPENDENCIES
   rack-test
   rake (~> 12.3.3)
   redis-namespace
-  rspec (~> 2.9)
+  rspec
   sentry-raven
   sidekiq (~> 4.0.0)
   sinatra (~> 2.0.3)

spec/travis/app_spec.rb renamed to spec/travis/listener/app_spec.rb

@@ -27,20 +27,20 @@ def create(opts = {})
 
   it 'results in a 204 if the hook is accepted' do
     create
-    last_response.status.should be == 204
+    expect(last_response.status).to be(204)
   end
 
   describe 'without a payload' do
     let(:payload) { nil }
     it 'does not accept a hook' do
       create
-      last_response.status.should be == 422
+      expect(last_response.status).to be(422)
     end
   end
 
   it 'returns 200 when checking if the app is still running' do
     get '/uptime'
-    last_response.status.should be == 200
+    expect(last_response.status).to be(200)
   end
 
   it "should push the message to sidekiq" do
@@ -55,60 +55,60 @@ def create(opts = {})
 
   context "with valid_ips provided" do
     before do
-      described_class.any_instance.stub(:valid_ips).and_return(['1.2.3.4'])
+      allow_any_instance_of(described_class).to receive(:valid_ips).and_return(['1.2.3.4'])
     end
 
     context "when ip_validation is turned off" do
       it 'accepts a request from an invalid IP' do
-        described_class.any_instance.should_receive(:report_ip_validity)
+        expect_any_instance_of(described_class).to receive(:report_ip_validity)
         create headers: { 'REMOTE_ADDR' => '1.2.3.1' }
-        last_response.status.should be == 204
+        expect(last_response.status).to be(204)
       end
     end
 
     context "when ip_validation is turned on" do
       before do
-        described_class.any_instance.stub(:ip_validation?).and_return(true)
+        allow_any_instance_of(described_class).to receive(:ip_validation?).and_return(true)
       end
 
       it 'accepts a request from valid IP' do
         create headers: { 'REMOTE_ADDR' => '1.2.3.4' }
-        last_response.status.should be == 204
+        expect(last_response.status).to be(204)
       end
 
       it 'rejects a request without a valid IP' do
         create headers: { 'REMOTE_ADDR' => '1.1.1.1' }
-        last_response.status.should be == 403
+        expect(last_response.status).to be(403)
       end
     end
   end
 
   context 'with valid_ips provided as a range' do
     before do
-      described_class.any_instance.stub(:valid_ips).and_return(['1.1.1.0/30'])
-      described_class.any_instance.stub(:ip_validation?).and_return(true)
+      allow_any_instance_of(described_class).to receive(:valid_ips).and_return(['1.1.1.0/30'])
+      allow_any_instance_of(described_class).to receive(:ip_validation?).and_return(true)
     end
 
     it 'accepts a request from valid IP' do
       create headers: { 'REMOTE_ADDR' => '1.1.1.0' }
-      last_response.status.should be == 204
+      expect(last_response.status).to be(204)
 
       create headers: { 'REMOTE_ADDR' => '1.1.1.1' }
-      last_response.status.should be == 204
+      expect(last_response.status).to be(204)
 
       create headers: { 'REMOTE_ADDR' => '1.1.1.2' }
-      last_response.status.should be == 204
+      expect(last_response.status).to be(204)
 
       create headers: { 'REMOTE_ADDR' => '1.1.1.3' }
-      last_response.status.should be == 204
+      expect(last_response.status).to be(204)
     end
 
     it 'rejects a request without a valid IP' do
       create headers: { 'REMOTE_ADDR' => '1.1.1.4' }
-      last_response.status.should be == 403
+      expect(last_response.status).to be(403)
 
       create headers: { 'REMOTE_ADDR' => '1.1.1.10' }
-      last_response.status.should be == 403
+      expect(last_response.status).to be(403)
     end
   end
 end