diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-09 12:11:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 12:11:14 +0200 |
| commit | 4134a10549a833ad5ab18b3c579304919d594ce1 (patch) | |
| tree | 696f4b453ad029ffda3d0925c484c11b27b95cc6 /spec/controllers/api/subscriptions_controller_spec.rb | |
| parent | d0b1369a853dc2e5b7934c148547f71f8d103859 (diff) | |
| parent | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff) | |
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/api/subscriptions_controller_spec.rb')
| -rw-r--r-- | spec/controllers/api/subscriptions_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/api/subscriptions_controller_spec.rb b/spec/controllers/api/subscriptions_controller_spec.rb index b46971a54..7a4252fe6 100644 --- a/spec/controllers/api/subscriptions_controller_spec.rb +++ b/spec/controllers/api/subscriptions_controller_spec.rb @@ -33,7 +33,7 @@ RSpec.describe Api::SubscriptionsController, type: :controller do end describe 'POST #update' do - let(:feed) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'push', 'feed.atom')) } + let(:feed) { File.read(Rails.root.join('spec', 'fixtures', 'push', 'feed.atom')) } before do stub_request(:post, "https://quitter.no/main/push/hub").to_return(:status => 200, :body => "", :headers => {}) |