Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 9 deletions

diff --git a/spec/lib/gitlab/database/count/reltuples_count_strategy_spec.rb b/spec/lib/gitlab/database/count/reltuples_count_strategy_spec.rb
index 9d49db1f018..e7b9c5fcd02 100644
--- a/spec/lib/gitlab/database/count/reltuples_count_strategy_spec.rb
+++ b/spec/lib/gitlab/database/count/reltuples_count_strategy_spec.rb
@@ -5,24 +5,24 @@ require 'spec_helper'
 RSpec.describe Gitlab::Database::Count::ReltuplesCountStrategy do
   before do
     create_list(:project, 3)
-    create(:identity)
+    create_list(:ci_instance_variable, 2)
   end
 
   subject { described_class.new(models).count }
 
   describe '#count' do
-    let(:models) { [Project, Identity] }
+    let(:models) { [Project, Ci::InstanceVariable] }
 
     context 'when reltuples is up to date' do
       before do
-        ActiveRecord::Base.connection.execute('ANALYZE projects')
-        ActiveRecord::Base.connection.execute('ANALYZE identities')
+        Project.connection.execute('ANALYZE projects')
+        Ci::InstanceVariable.connection.execute('ANALYZE ci_instance_variables')
       end
 
       it 'uses statistics to do the count' do
         models.each { |model| expect(model).not_to receive(:count) }
 
-        expect(subject).to eq({ Project => 3, Identity => 1 })
+        expect(subject).to eq({ Project => 3, Ci::InstanceVariable => 2 })
       end
     end
 
@@ -31,7 +31,7 @@ RSpec.describe Gitlab::Database::Count::ReltuplesCountStrategy do
 
       before do
         models.each do |model|
-          ActiveRecord::Base.connection.execute("ANALYZE #{model.table_name}")
+          model.connection.execute("ANALYZE #{model.table_name}")
         end
       end
 
@@ -45,7 +45,9 @@ RSpec.describe Gitlab::Database::Count::ReltuplesCountStrategy do
 
     context 'insufficient permissions' do
       it 'returns an empty hash' do
-        allow(ActiveRecord::Base).to receive(:transaction).and_raise(PG::InsufficientPrivilege)
+        Gitlab::Database.database_base_models.each_value do |base_model|
+          allow(base_model).to receive(:transaction).and_raise(PG::InsufficientPrivilege)
+        end
 
         expect(subject).to eq({})
       end
diff --git a/spec/lib/gitlab/database/count/tablesample_count_strategy_spec.rb b/spec/lib/gitlab/database/count/tablesample_count_strategy_spec.rb
index 2f261aebf02..37d3e13a7ab 100644
--- a/spec/lib/gitlab/database/count/tablesample_count_strategy_spec.rb
+++ b/spec/lib/gitlab/database/count/tablesample_count_strategy_spec.rb
@@ -5,11 +5,12 @@ require 'spec_helper'
 RSpec.describe Gitlab::Database::Count::TablesampleCountStrategy do
   before do
     create_list(:project, 3)
+    create_list(:ci_instance_variable, 2)
     create(:identity)
     create(:group)
   end
 
-  let(:models) { [Project, Identity, Group, Namespace] }
+  let(:models) { [Project, Ci::InstanceVariable, Identity, Group, Namespace] }
   let(:strategy) { described_class.new(models) }
 
   subject { strategy.count }
@@ -20,7 +21,8 @@ RSpec.describe Gitlab::Database::Count::TablesampleCountStrategy do
         Project => threshold + 1,
         Identity => threshold - 1,
         Group => threshold + 1,
-        Namespace => threshold + 1
+        Namespace => threshold + 1,
+        Ci::InstanceVariable => threshold + 1
       }
     end
 
@@ -43,12 +45,14 @@ RSpec.describe Gitlab::Database::Count::TablesampleCountStrategy do
         expect(Project).not_to receive(:count)
         expect(Group).not_to receive(:count)
         expect(Namespace).not_to receive(:count)
+        expect(Ci::InstanceVariable).not_to receive(:count)
 
         result = subject
         expect(result[Project]).to eq(3)
         expect(result[Group]).to eq(1)
         # 1-Group, 3 namespaces for each project and 3 project namespaces for each project
         expect(result[Namespace]).to eq(7)
+        expect(result[Ci::InstanceVariable]).to eq(2)
       end
     end