diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 18:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 18:06:24 +0000 |
| commit | 8263f6ee3131cdea3c6041785c32771a6af0b24f (patch) | |
| tree | 3dde0ed2466b10fa223eacbd51c78beb32009fbd /spec/serializers | |
| parent | eac0da9a47f0c7b8b970833d7d5b96cfee057bf7 (diff) | |
| download | gitlab-ce-8263f6ee3131cdea3c6041785c32771a6af0b24f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
| -rw-r--r-- | spec/serializers/pipeline_serializer_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb index 7661c8acc13..f1f761a6fd0 100644 --- a/spec/serializers/pipeline_serializer_spec.rb +++ b/spec/serializers/pipeline_serializer_spec.rb @@ -130,10 +130,10 @@ describe PipelineSerializer do it 'preloads related merge requests' do recorded = ActiveRecord::QueryRecorder.new { subject } + expected_query = "SELECT \"merge_requests\".* FROM \"merge_requests\" " \ + "WHERE \"merge_requests\".\"id\" IN (#{merge_request_1.id}, #{merge_request_2.id})" - expect(recorded.log) - .to include("SELECT \"merge_requests\".* FROM \"merge_requests\" " \ - "WHERE \"merge_requests\".\"id\" IN (#{merge_request_1.id}, #{merge_request_2.id})") + expect(recorded.log).to include(a_string_starting_with(expected_query)) end end |