removes redundant code from database.rb29056-backport-ee-cleanup-database-file

2 files changed, 48 insertions, 4 deletions

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 4ac79454647..bc43bcf0714 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -175,6 +175,50 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
     end
   end
 
+  describe '#true_value' do
+    context 'using PostgreSQL' do
+      before do
+        expect(Gitlab::Database).to receive(:postgresql?).and_return(true)
+      end
+
+      it 'returns the appropriate value' do
+        expect(model.true_value).to eq("'t'")
+      end
+    end
+
+    context 'using MySQL' do
+      before do
+        expect(Gitlab::Database).to receive(:postgresql?).and_return(false)
+      end
+
+      it 'returns the appropriate value' do
+        expect(model.true_value).to eq(1)
+      end
+    end
+  end
+
+  describe '#false_value' do
+    context 'using PostgreSQL' do
+      before do
+        expect(Gitlab::Database).to receive(:postgresql?).and_return(true)
+      end
+
+      it 'returns the appropriate value' do
+        expect(model.false_value).to eq("'f'")
+      end
+    end
+
+    context 'using MySQL' do
+      before do
+        expect(Gitlab::Database).to receive(:postgresql?).and_return(false)
+      end
+
+      it 'returns the appropriate value' do
+        expect(model.false_value).to eq(0)
+      end
+    end
+  end
+
   describe '#update_column_in_batches' do
     before do
       create_list(:empty_project, 5)
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 4ce4e6e1034..9b1d66a1b1c 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -150,13 +150,13 @@ describe Gitlab::Database, lib: true do
     it 'returns correct value for PostgreSQL' do
       expect(described_class).to receive(:postgresql?).and_return(true)
 
-      expect(MigrationTest.new.true_value).to eq "'t'"
+      expect(described_class.true_value).to eq "'t'"
     end
 
     it 'returns correct value for MySQL' do
       expect(described_class).to receive(:postgresql?).and_return(false)
 
-      expect(MigrationTest.new.true_value).to eq 1
+      expect(described_class.true_value).to eq 1
     end
   end
 
@@ -164,13 +164,13 @@ describe Gitlab::Database, lib: true do
     it 'returns correct value for PostgreSQL' do
       expect(described_class).to receive(:postgresql?).and_return(true)
 
-      expect(MigrationTest.new.false_value).to eq "'f'"
+      expect(described_class.false_value).to eq "'f'"
     end
 
     it 'returns correct value for MySQL' do
       expect(described_class).to receive(:postgresql?).and_return(false)
 
-      expect(MigrationTest.new.false_value).to eq 0
+      expect(described_class.false_value).to eq 0
     end
   end
 end