logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: cd765f26a9610e160ffd347637fca40d7b80164e
parent: ff229aa978d774d9ab067f0cbe345ccbe0f5658c
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 11 Nov 2016 23:37:39 +0100

Upgrade ruby to 2.3.1

Diffstat:

M.ruby-version2+-
M.travis.yml2+-
MDockerfile.app2+-
Mspec/services/reblog_service_spec.rb6++----
4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.ruby-version b/.ruby-version @@ -1 +1 @@ -ruby-2.2.4 +2.3.1 diff --git 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 @@ -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 @@ -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