]> cat aescling's git repositories - mastodon.git/commitdiff
Upgrade ruby to 2.3.1
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 11 Nov 2016 22:37:39 +0000 (23:37 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 12 Nov 2016 00:55:33 +0000 (01:55 +0100)
.ruby-version
.travis.yml
Dockerfile.app
spec/services/reblog_service_spec.rb

index c063f5a8aecab54e1d9a69e37d20cbd5b3f56b4a..2bf1c1ccf363acd53eaf92ef33a7f11f5f4557c2 100644 (file)
@@ -1 +1 @@
-ruby-2.2.4
+2.3.1
index 405cce6459bd4b98d353cdf212aeccf8beba098b..f6841779d460fd28ce80e397543c89ce6f3d6834 100644 (file)
@@ -18,7 +18,7 @@ addons:
   postgresql: 9.4
 
 rvm:
-  - 2.2.4
+  - 2.3.1
 
 services:
   - redis-server
index 0e47cdb02842f709cf667ddfbb74d0971fec1916..dfc0ad5b73629b815b8a75deae1d773c1f361eef 100644 (file)
@@ -1,4 +1,4 @@
-FROM ruby:2.2.4
+FROM ruby:2.3.1
 
 ENV RAILS_ENV=production
 
index 25ea35e94bd788d362522bda81dd5689af1deda8..f0a40fe91c9862f716c5b91e91d327b960dd58c2 100644 (file)
@@ -8,9 +8,7 @@ RSpec.describe ReblogService do
   subject { ReblogService.new }
 
   before do
-    Rails.configuration.x.hub_url = 'http://hub.example.com'
-
-    stub_request(:post, 'http://hub.example.com')
+    stub_request(:post, Rails.configuration.x.hub_url)
     stub_request(:post, 'http://salmon.example.com')
 
     subject.(alice, status)
@@ -21,7 +19,7 @@ RSpec.describe ReblogService do
   end
 
   it 'pings PubSubHubbub hubs' do
-    expect(a_request(:post, 'http://hub.example.com')).to have_been_made
+    expect(a_request(:post, Rails.configuration.x.hub_url)).to have_been_made
   end
 
   it 'sends a Salmon slap for a remote reblog' do