diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-30 07:52:00 +0000 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-12-01 12:15:49 -0300 |
| commit | 93ee6811c0e01bffa8d59ea4647bed8ca8bab5e2 (patch) | |
| tree | 29bc15f4443e9562917518d983dfdb1fb17eb1de | |
| parent | 212cd962a404e8f5c6c6e77228708d6d7d984583 (diff) | |
| download | gitlab-ce-93ee6811c0e01bffa8d59ea4647bed8ca8bab5e2.tar.gz | |
Merge branch '24772-fix-transient-failing-spec' into 'master'
Fix a transient spec failure
Closes #24772
See merge request !7825
| -rw-r--r-- | spec/requests/projects/cycle_analytics_events_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb index 705dbb7d1c0..5c90fd9bad9 100644 --- a/spec/requests/projects/cycle_analytics_events_spec.rb +++ b/spec/requests/projects/cycle_analytics_events_spec.rb @@ -40,7 +40,7 @@ describe 'cycle analytics events' do expect(json_response['events']).not_to be_empty - first_mr_iid = MergeRequest.order(created_at: :desc).pluck(:iid).first.to_s + first_mr_iid = project.merge_requests.order(id: :desc).pluck(:iid).first.to_s expect(json_response['events'].first['iid']).to eq(first_mr_iid) end |