diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-30 07:52:00 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-30 07:52:00 +0000 |
| commit | 098066050d148deb024fdec6c36bfe9320c674bd (patch) | |
| tree | 9f772c8efb4f443fb74ddb36ca42e7ca9617cdd1 | |
| parent | 4ecb95949230e2a7000b129a35096e25d0c6572c (diff) | |
| parent | 46859cb984523affdcbc5ba9697883b290c1bf0f (diff) | |
| download | gitlab-ce-098066050d148deb024fdec6c36bfe9320c674bd.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 |