summaryrefslogtreecommitdiff
path: root/spec/models/concerns/where_composite_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/models/concerns/where_composite_spec.rb
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/models/concerns/where_composite_spec.rb')
-rw-r--r--spec/models/concerns/where_composite_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/concerns/where_composite_spec.rb b/spec/models/concerns/where_composite_spec.rb
index fb23e6bfe1d..5e67f2f5b65 100644
--- a/spec/models/concerns/where_composite_spec.rb
+++ b/spec/models/concerns/where_composite_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe WhereComposite do
let(:model) do
tbl_name = test_table_name
- Class.new(ActiveRecord::Base) do
+ Class.new(ApplicationRecord) do
self.table_name = tbl_name
include WhereComposite
@@ -16,7 +16,7 @@ RSpec.describe WhereComposite do
end
def connection
- ActiveRecord::Base.connection
+ ApplicationRecord.connection
end
before_all do