diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-04 09:38:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-04 09:38:41 +0000 |
| commit | b1e1990ee263bcae73f0e55526a55cff66103220 (patch) | |
| tree | 2fd52f6813c7bf6b276c4d0a4550423a8ff84e9f /spec/requests/api/v3 | |
| parent | 066499b8246d733c39cc9d58a8acdbf2550960d5 (diff) | |
| parent | 87a437995e4bec0c9b84c1ae2833cf7186709911 (diff) | |
| download | gitlab-ce-b1e1990ee263bcae73f0e55526a55cff66103220.tar.gz | |
Merge branch 'osw-introduce-merge-request-statistics' into 'master'
Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json
See merge request gitlab-org/gitlab-ce!15642
Diffstat (limited to 'spec/requests/api/v3')
| -rw-r--r-- | spec/requests/api/v3/milestones_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/v3/notes_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/v3/milestones_spec.rb b/spec/requests/api/v3/milestones_spec.rb index 9ee71ea9c5d..6021600e09c 100644 --- a/spec/requests/api/v3/milestones_spec.rb +++ b/spec/requests/api/v3/milestones_spec.rb @@ -161,7 +161,7 @@ describe API::V3::Milestones do describe 'PUT /projects/:id/milestones/:milestone_id to test observer on close' do it 'creates an activity event when an milestone is closed' do - expect(Event).to receive(:create) + expect(Event).to receive(:create!) put v3_api("/projects/#{project.id}/milestones/#{milestone.id}", user), state_event: 'close' diff --git a/spec/requests/api/v3/notes_spec.rb b/spec/requests/api/v3/notes_spec.rb index 6428d9daaba..5532795ab02 100644 --- a/spec/requests/api/v3/notes_spec.rb +++ b/spec/requests/api/v3/notes_spec.rb @@ -302,7 +302,7 @@ describe API::V3::Notes do describe "POST /projects/:id/noteable/:noteable_id/notes to test observer on create" do it "creates an activity event when an issue note is created" do - expect(Event).to receive(:create) + expect(Event).to receive(:create!) post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user), body: 'hi!' end |