diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-11 23:37:39 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-12 01:55:33 +0100 |
| commit | cd765f26a9610e160ffd347637fca40d7b80164e (patch) | |
| tree | d3305d28921c9a207bd6a8d8909ed205c1ebfdcc | |
| parent | ff229aa978d774d9ab067f0cbe345ccbe0f5658c (diff) | |
Upgrade ruby to 2.3.1
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Dockerfile.app | 2 | ||||
| -rw-r--r-- | spec/services/reblog_service_spec.rb | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/.ruby-version b/.ruby-version index c063f5a8a..2bf1c1ccf 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.2.4 +2.3.1 diff --git a/.travis.yml b/.travis.yml index 405cce645..f6841779d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ addons: postgresql: 9.4 rvm: - - 2.2.4 + - 2.3.1 services: - redis-server diff --git a/Dockerfile.app b/Dockerfile.app index 0e47cdb02..dfc0ad5b7 100644 --- a/Dockerfile.app +++ b/Dockerfile.app @@ -1,4 +1,4 @@ -FROM ruby:2.2.4 +FROM ruby:2.3.1 ENV RAILS_ENV=production diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb index 25ea35e94..f0a40fe91 100644 --- a/spec/services/reblog_service_spec.rb +++ b/spec/services/reblog_service_spec.rb @@ -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 |