From cd765f26a9610e160ffd347637fca40d7b80164e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 11 Nov 2016 23:37:39 +0100
Subject: [PATCH] Upgrade ruby to 2.3.1
---
.ruby-version | 2 +-
.travis.yml | 2 +-
Dockerfile.app | 2 +-
spec/services/reblog_service_spec.rb | 6 ++----
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.ruby-version b/.ruby-version
index c063f5a8ae..2bf1c1ccf3 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 405cce6459..f6841779d4 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 0e47cdb028..dfc0ad5b73 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 25ea35e94b..f0a40fe91c 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
--
GitLab