summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-10-31 12:53:58 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-10-31 12:53:58 +0000
commit3645e684bf854b3588f5b5a8e069c6a6778a184a (patch)
treefd6f70538011fb91b8da57540ba77c3136865bf2 /spec/controllers/projects
parent05f6736d885ec48554fc0e4e8284f4f5c7fa6dd9 (diff)
parent0badbef83658ab2c23c7f7ea0aef81284c96c55b (diff)
downloadgitlab-ce-3645e684bf854b3588f5b5a8e069c6a6778a184a.tar.gz
Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master'
Optimize Event queries by removing default order See merge request !7130
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r--spec/controllers/projects/milestones_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb
index 4e3ef5dc6fa..7c5f33c63b8 100644
--- a/spec/controllers/projects/milestones_controller_spec.rb
+++ b/spec/controllers/projects/milestones_controller_spec.rb
@@ -20,7 +20,7 @@ describe Projects::MilestonesController do
delete :destroy, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid, format: :js
expect(response).to be_success
- expect(Event.first.action).to eq(Event::DESTROYED)
+ expect(Event.recent.first.action).to eq(Event::DESTROYED)
expect { Milestone.find(milestone.id) }.to raise_exception(ActiveRecord::RecordNotFound)
issue.reload