From 5e8afae1f09f66ee8f9b71b1fbe8ca11592e1bb9 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 18 Nov 2019 15:15:44 +0100 Subject: [PATCH] Fix failing tests [SCI-3988] --- app/services/templates_service.rb | 2 +- spec/requests/api/v1/results_controller_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/templates_service.rb b/app/services/templates_service.rb index 0ff844240..b9346f321 100644 --- a/app/services/templates_service.rb +++ b/app/services/templates_service.rb @@ -7,7 +7,7 @@ class TemplatesService @experiment_templates = {} Dir.glob(templates_dir_pattern).each do |tmplt_dir| id = /[0-9]+/.match(tmplt_dir.split('/').last)[0] - uuid = /\"uuid\":\"([a-fA-F0-9\-]{36})\"/ + uuid = /\"uuid\": \"([a-fA-F0-9\-]{36})\"/ .match(File.read(tmplt_dir + 'experiment.json'))[1] @experiment_templates[uuid] = id.to_i end diff --git a/spec/requests/api/v1/results_controller_spec.rb b/spec/requests/api/v1/results_controller_spec.rb index d346ae686..87fe6c98c 100644 --- a/spec/requests/api/v1/results_controller_spec.rb +++ b/spec/requests/api/v1/results_controller_spec.rb @@ -369,7 +369,7 @@ RSpec.describe 'Api::V1::ResultsController', type: :request do describe 'PUT result, #update' do context 'when resultType is file' do - let(:result_file) { @valid_task.results.last } + let(:result_file) { @valid_task.results.joins(:result_asset).last } let(:file) { fixture_file_upload('files/test.jpg', 'image/jpg') } let(:second_file) { fixture_file_upload('files/apple.jpg', 'image/jpg') } let(:request_body) do @@ -481,10 +481,10 @@ RSpec.describe 'Api::V1::ResultsController', type: :request do ), params: @valid_text_hash_body.to_json, headers: @valid_headers) end - it 'returns status 500' do + it 'returns status 200' do action - expect(response).to have_http_status 500 + expect(response).to have_http_status 200 end end end