From a549d1ae6b33d93743a0c0c3fb1575f07a58492a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2017 16:21:08 +0200 Subject: [PATCH] Bump to 1.5.0rc1 (#4318) --- lib/mastodon/version.rb | 10 +++++++--- spec/workers/pubsubhubbub/confirmation_worker_spec.rb | 2 +- spec/workers/pubsubhubbub/delivery_worker_spec.rb | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 3c92ce4179..07969aff4b 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -9,23 +9,27 @@ module Mastodon end def minor - 4 + 5 end def patch - 7 + 0 end def pre nil end + def flags + 'rc1' + end + def to_a [major, minor, patch, pre].compact end def to_s - to_a.join('.') + [to_a.join('.'), flags].join end end end diff --git a/spec/workers/pubsubhubbub/confirmation_worker_spec.rb b/spec/workers/pubsubhubbub/confirmation_worker_spec.rb index 8f66b4520c..1eecdd2b5b 100644 --- a/spec/workers/pubsubhubbub/confirmation_worker_spec.rb +++ b/spec/workers/pubsubhubbub/confirmation_worker_spec.rb @@ -83,6 +83,6 @@ describe Pubsubhubbub::ConfirmationWorker do end def http_headers - { 'Connection' => 'close', 'Host' => 'example.com', 'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)' } + { 'Connection' => 'close', 'Host' => 'example.com' } end end diff --git a/spec/workers/pubsubhubbub/delivery_worker_spec.rb b/spec/workers/pubsubhubbub/delivery_worker_spec.rb index b720015680..c0e0d51866 100644 --- a/spec/workers/pubsubhubbub/delivery_worker_spec.rb +++ b/spec/workers/pubsubhubbub/delivery_worker_spec.rb @@ -59,7 +59,6 @@ describe Pubsubhubbub::DeliveryWorker do 'Content-Type' => 'application/atom+xml', 'Host' => 'example.com', 'Link' => "; rel=\"hub\", ; rel=\"self\"", - 'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)', }.tap do |basic| known_digest = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret.to_s, payload) basic.merge('X-Hub-Signature' => "sha1=#{known_digest}") if subscription.secret?