diff --git a/spec/requests/api/v1/experiments_controller_spec.rb b/spec/requests/api/v1/experiments_controller_spec.rb index e76d41697..0fcaef14d 100644 --- a/spec/requests/api/v1/experiments_controller_spec.rb +++ b/spec/requests/api/v1/experiments_controller_spec.rb @@ -241,7 +241,7 @@ RSpec.describe "Api::V1::ExperimentsController", type: :request do describe 'PATCH experiment, #update' do before :all do @valid_headers['Content-Type'] = 'application/json' - @experiment = @valid_project.experiments.first + @experiment = @valid_project.experiments.active.first end let(:action) do diff --git a/spec/requests/api/v1/projects_controller_spec.rb b/spec/requests/api/v1/projects_controller_spec.rb index 696247759..25fcaea14 100644 --- a/spec/requests/api/v1/projects_controller_spec.rb +++ b/spec/requests/api/v1/projects_controller_spec.rb @@ -238,7 +238,7 @@ RSpec.describe 'Api::V1::ProjectsController', type: :request do describe 'PATCH project, #update' do before :all do @valid_headers['Content-Type'] = 'application/json' - @project = @user.teams.first.projects.first + @project = @user.teams.first.projects.active.first end let(:action) do diff --git a/spec/requests/api/v1/protocol_templates_controller_spec.rb b/spec/requests/api/v1/protocol_templates_controller_spec.rb index 7fa54470f..debd0ba3c 100644 --- a/spec/requests/api/v1/protocol_templates_controller_spec.rb +++ b/spec/requests/api/v1/protocol_templates_controller_spec.rb @@ -27,13 +27,14 @@ RSpec.describe 'Api::V1::ProtocolTemplateController', type: :request do team_id: @team.id ), headers: @valid_headers expect { hash_body = json }.not_to raise_exception - expect(hash_body[:data]).to match( - JSON.parse( - ActiveModelSerializers::SerializableResource - .new(Protocol.latest_available_versions(@team), each_serializer: Api::V1::ProtocolTemplateSerializer) - .to_json - )['data'] - ) + + parsed_data = JSON.parse( + ActiveModelSerializers::SerializableResource + .new(Protocol.latest_available_versions(@team), each_serializer: Api::V1::ProtocolTemplateSerializer) + .to_json + )['data'] + + expect(hash_body[:data]).to match_array(parsed_data) end it 'When invalid request, user in not member of the team' do @@ -63,13 +64,13 @@ RSpec.describe 'Api::V1::ProtocolTemplateController', type: :request do get api_v1_team_protocol_template_path(id: @protocol_published_original.id, team_id: @team.id), headers: @valid_headers expect { hash_body = json }.not_to raise_exception - expect(hash_body[:data]).to match( - JSON.parse( - ActiveModelSerializers::SerializableResource - .new(@protocol_published_original, serializer: Api::V1::ProtocolTemplateSerializer) - .to_json - )['data'] - ) + parsed_data = JSON.parse( + ActiveModelSerializers::SerializableResource + .new(@protocol_published_original, serializer: Api::V1::ProtocolTemplateSerializer) + .to_json + )['data'] + + expect(hash_body[:data]).to match_array(parsed_data) end it 'When invalid request, user in not member of the team' do diff --git a/spec/requests/api/v1/tasks_controller_spec.rb b/spec/requests/api/v1/tasks_controller_spec.rb index 0b43c1976..52f525fa4 100644 --- a/spec/requests/api/v1/tasks_controller_spec.rb +++ b/spec/requests/api/v1/tasks_controller_spec.rb @@ -285,7 +285,7 @@ RSpec.describe 'Api::V1::TasksController', type: :request do @valid_headers['Content-Type'] = 'application/json' end - let(:task) { @valid_experiment.my_modules.take } + let(:task) { @valid_experiment.my_modules.active.first } let(:action) do patch(