summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-10-05 18:51:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-10-05 18:51:04 +0000
commit81e435c4a570af757f477e296a2fb3be8e073b8b (patch)
tree89b3e333c17ca451f327fbea08b88e59a9854f8d /spec/models
parentb1d8cd2eec6759ad2db7e119ed220fa00196b800 (diff)
parentcc339aa60877214820f9445336b5cf7766601176 (diff)
downloadgitlab-ce-81e435c4a570af757f477e296a2fb3be8e073b8b.tar.gz
Merge branch '43109-ci_environments_status-json-executes-more-than-100-queries' into 'master'
Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries" Closes #43109 See merge request gitlab-org/gitlab-ce!21996
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_spec.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 8b71919544e..ff259dc12b3 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -4037,6 +4037,20 @@ describe Project do
expect(result).to be_empty
end
end
+
+ describe "#find_or_initialize_service" do
+ subject { build(:project) }
+
+ it 'avoids N+1 database queries' do
+ allow(Service).to receive(:available_services_names).and_return(%w(prometheus pushover))
+
+ control_count = ActiveRecord::QueryRecorder.new { project.find_or_initialize_service('prometheus') }.count
+
+ allow(Service).to receive(:available_services_names).and_call_original
+
+ expect { project.find_or_initialize_service('prometheus') }.not_to exceed_query_limit(control_count)
+ end
+ end
end
def rugged_config