diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-27 00:53:43 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-27 01:15:04 -0700 |
| commit | 73b1e2c75ece58ecad610f85cd2501eb769bcfe4 (patch) | |
| tree | 79ce50434a83a359def5702c6846916c75d65fdb | |
| parent | 5a1db0463aed2b67a3daa237ac231c25ba247eaf (diff) | |
| download | gitlab-ce-sh-enable-query-cache-in-tests.tar.gz | |
Fix static-analysis failures and a few performance testssh-enable-query-cache-in-tests
| -rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/notes_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index f82e3c8c7dc..0d0d8b3acb9 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -1290,12 +1290,14 @@ describe Projects::IssuesController do get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } RequestStore.clear! + ActiveRecord::Base.connection.clear_query_cache control_count = ActiveRecord::QueryRecorder.new do get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } end.count RequestStore.clear! + ActiveRecord::Base.connection.clear_query_cache create_list(:discussion_note_on_issue, 2, :system, noteable: issue, project: issue.project, note: cross_reference) diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 6ec84f5c528..ec25d3f8cec 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -195,12 +195,14 @@ describe Projects::NotesController do get :index, params: request_params RequestStore.clear! + ActiveRecord::Base.connection.clear_query_cache control_count = ActiveRecord::QueryRecorder.new do get :index, params: request_params end.count RequestStore.clear! + ActiveRecord::Base.connection.clear_query_cache create_list(:discussion_note_on_issue, 2, :system, noteable: issue, project: issue.project, note: cross_reference) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4d6288be22c..c68bb46a0bc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -218,7 +218,7 @@ RSpec.configure do |config| ActionController::Base.cache_store = caching_store end - config.around(:each) do |example| + config.around do |example| ActiveRecord::Base.cache do example.run end |