scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 03:46:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix failing tests [SCI-3988]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2019-11-18 15:15:44 +01:00
parent 244c003137
commit 5e8afae1f0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/templates_service.rb
View file

@ -7,7 +7,7 @@ class TemplatesService
@experiment_templates = {} @experiment_templates = {}
Dir.glob(templates_dir_pattern).each do |tmplt_dir| Dir.glob(templates_dir_pattern).each do |tmplt_dir|
id = /[0-9]+/.match(tmplt_dir.split('/').last)[0] 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] .match(File.read(tmplt_dir + 'experiment.json'))[1]
@experiment_templates[uuid] = id.to_i @experiment_templates[uuid] = id.to_i
end end

6
spec/requests/api/v1/results_controller_spec.rb
View file

@ -369,7 +369,7 @@ RSpec.describe 'Api::V1::ResultsController', type: :request do
describe 'PUT result, #update' do describe 'PUT result, #update' do
context 'when resultType is file' 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(:file) { fixture_file_upload('files/test.jpg', 'image/jpg') }
let(:second_file) { fixture_file_upload('files/apple.jpg', 'image/jpg') } let(:second_file) { fixture_file_upload('files/apple.jpg', 'image/jpg') }
let(:request_body) do 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) ), params: @valid_text_hash_body.to_json, headers: @valid_headers)
end end
it 'returns status 500' do it 'returns status 200' do
action action
expect(response).to have_http_status 500 expect(response).to have_http_status 200
end end
end end
end end