diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
commit | d17844e6d1ad700df0f704972e2ce16e8693d33b (patch) | |
tree | ada49442558fb14c6cf97e79fb6e2dcaa237c7a6 /spec/controllers/api/salmon_controller_spec.rb | |
parent | 96c3d26870d4c8db1978c86b259e85d060d6f271 (diff) | |
parent | 4c4ff05a461eddafbf38c603b1bf2029be36a0b9 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/controllers/api/salmon_controller_spec.rb')
-rw-r--r-- | spec/controllers/api/salmon_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/api/salmon_controller_spec.rb b/spec/controllers/api/salmon_controller_spec.rb index 8ce4913a5..235a29af0 100644 --- a/spec/controllers/api/salmon_controller_spec.rb +++ b/spec/controllers/api/salmon_controller_spec.rb @@ -15,7 +15,7 @@ RSpec.describe Api::SalmonController, type: :controller do describe 'POST #update' do context 'with valid post data' do before do - post :update, params: { id: account.id }, body: File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml')) + post :update, params: { id: account.id }, body: File.read(Rails.root.join('spec', 'fixtures', 'salmon', 'mention.xml')) end it 'contains XML in the request body' do @@ -54,7 +54,7 @@ RSpec.describe Api::SalmonController, type: :controller do service = double(call: false) allow(VerifySalmonService).to receive(:new).and_return(service) - post :update, params: { id: account.id }, body: File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml')) + post :update, params: { id: account.id }, body: File.read(Rails.root.join('spec', 'fixtures', 'salmon', 'mention.xml')) end it 'returns http client error' do |