refactors tests

lib/gitlab/database.rb

@@ -24,7 +24,7 @@ module Gitlab
     def self.nulls_last_order(field, direction = 'ASC')
       order = "#{field} #{direction}"
 
-      if Gitlab::Database.postgresql?
+      if postgresql?
         order << ' NULLS LAST'
       else
         # `field IS NULL` will be `0` for non-NULL columns and `1` for NULL
@@ -38,7 +38,7 @@ module Gitlab
     def self.nulls_first_order(field, direction = 'ASC')
       order = "#{field} #{direction}"
 
-      if Gitlab::Database.postgresql?
+      if postgresql?
         order << ' NULLS FIRST'
       else
         # `field IS NULL` will be `0` for non-NULL columns and `1` for NULL
@@ -50,15 +50,15 @@ module Gitlab
     end
 
     def self.random
-      Gitlab::Database.postgresql? ? "RANDOM()" : "RAND()"
+      postgresql? ? "RANDOM()" : "RAND()"
     end
 
     def self.minute_interval(value)
-      Gitlab::Database.postgresql? ? "#{value} * '1 minute'::interval" : "INTERVAL #{value} MINUTE"
+      postgresql? ? "#{value} * '1 minute'::interval" : "INTERVAL #{value} MINUTE"
     end
 
     def true_value
-      if Gitlab::Database.postgresql?
+      if postgresql?
         "'t'"
       else
         1
@@ -66,7 +66,7 @@ module Gitlab
     end
 
     def false_value
-      if Gitlab::Database.postgresql?
+      if postgresql?
         "'f'"
       else
         0

spec/workers/update_all_mirrors_worker_spec.rb

@@ -7,14 +7,10 @@ describe UpdateAllMirrorsWorker do
   end
 
   describe '#perform' do
-    project_count_with_time = { DateTime.now.beginning_of_hour + 15.minutes => 2,
-                                DateTime.now.beginning_of_hour => 3,
-                                DateTime.now.beginning_of_day => 4
-                              }
-
     let!(:mirror1) { create(:empty_project, :mirror, sync_time: Gitlab::Mirror::FIFTEEN) }
     let!(:mirror2) { create(:empty_project, :mirror, sync_time: Gitlab::Mirror::HOURLY) }
     let!(:mirror3) { create(:empty_project, :mirror, sync_time: Gitlab::Mirror::DAILY) }
+    let!(:mirror4) { create(:empty_project, :mirror) }
 
     it 'fails stuck mirrors' do
       worker = described_class.new
@@ -24,19 +20,65 @@ describe UpdateAllMirrorsWorker do
       worker.perform
     end
 
-    project_count_with_time.each do |time, project_count|
-      describe "at #{time}" do
-        let!(:mirror4) { create(:empty_project, :mirror, sync_time: Gitlab::Mirror::DAILY, mirror_last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes }
-        let(:mirrors) { Project.mirror.where("mirror_last_successful_update_at + #{Gitlab::Database.minute_interval('sync_time')} <= ? OR sync_time IN (?)", time, Gitlab::Mirror.sync_times) }
+    describe 'update times' do
+      after do
+        Timecop.return
+      end
+
+      describe 'fifteen' do
+        before do
+          time = DateTime.now.beginning_of_hour + 15.minutes
+
+          Timecop.freeze(time)
+          mirror4.update_attributes(mirror_last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes)
+        end
+
+        it 'enqueues a job on mirrored Projects' do
+          mirrors = [mirror1, mirror4]
+          worker = described_class.new
+
+          mirrors.each do |mirror|
+            expect(worker).to receive(:rand).with((mirror.sync_time / 2).minutes).and_return(mirror.sync_time / 2)
+            expect(RepositoryUpdateMirrorDispatchWorker).to receive(:perform_in).with(mirror.sync_time / 2, mirror.id)
+          end
+
+          worker.perform
+        end
+      end
 
+      describe 'hourly' do
         before do
+          time = DateTime.now.beginning_of_hour
+
+          Timecop.freeze(time)
+          mirror4.update_attributes(mirror_last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes)
+        end
+
+        it 'enqueues a job on mirrored Projects' do
+          mirrors = [mirror1, mirror2, mirror4]
+          worker = described_class.new
+
+          mirrors.each do |mirror|
+            expect(worker).to receive(:rand).with((mirror.sync_time / 2).minutes).and_return(mirror.sync_time / 2)
+            expect(RepositoryUpdateMirrorDispatchWorker).to receive(:perform_in).with(mirror.sync_time / 2, mirror.id)
+          end
+
+          worker.perform
+        end
+      end
+
+      describe 'daily' do
+        before do
+          time = DateTime.now.beginning_of_day
+
           Timecop.freeze(time)
+          mirror4.update_attributes(mirror_last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes)
         end
 
         it 'enqueues a job on mirrored Projects' do
+          mirrors = [mirror1, mirror2, mirror3, mirror4]
           worker = described_class.new
 
-          expect(mirrors.count).to eq(project_count)
           mirrors.each do |mirror|
             expect(worker).to receive(:rand).with((mirror.sync_time / 2).minutes).and_return(mirror.sync_time / 2)
             expect(RepositoryUpdateMirrorDispatchWorker).to receive(:perform_in).with(mirror.sync_time / 2, mirror.id)

spec/workers/update_all_remote_mirrors_worker.rb

@@ -2,14 +2,11 @@ require 'rails_helper'
 
 describe UpdateAllRemoteMirrorsWorker do
   describe "#perform" do
-    project_count_with_time = { DateTime.now.beginning_of_hour + 15.minutes => 2,
-                                DateTime.now.beginning_of_hour => 3,
-                                DateTime.now.beginning_of_day => 4
-                              }
 
     let!(:mirror1) { create(:project, :remote_mirror, sync_time: Gitlab::Mirror::FIFTEEN) }
     let!(:mirror2) { create(:project, :remote_mirror, sync_time: Gitlab::Mirror::HOURLY) }
     let!(:mirror3) { create(:project, :remote_mirror, sync_time: Gitlab::Mirror::DAILY) }
+    let!(:mirror4) { create(:project, :remote_mirror, sync_time: Gitlab::Mirror::DAILY) }
 
     it 'fails stuck mirrors' do
       worker = described_class.new
@@ -19,20 +16,63 @@ describe UpdateAllRemoteMirrorsWorker do
       worker.perform
     end
 
-    project_count_with_time.each do |time, project_count|
-      describe "at #{time}" do
-        let!(:mirror4) { create(:project, :remote_mirror, sync_time: Gitlab::Mirror::DAILY) }
-        let(:mirrors) { RemoteMirror.where("last_successful_update_at + #{Gitlab::Database.minute_interval('sync_time')} <= ? OR sync_time IN (?)", time, Gitlab::Mirror.sync_times) }
+    describe 'update times' do
+      after do
+        Timecop.return
+      end
+
+      describe 'fifteen' do
+        before do
+          time = DateTime.now.beginning_of_hour + 15.minutes
+
+          Timecop.freeze(time)
+          mirror4.remote_mirrors.first.update_attributes(last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes)
+        end
+
+        it 'enqueues a job on mirrored Projects' do
+          mirrors = [mirror1, mirror4]
+          worker = described_class.new
+
+          mirrors.each do |mirror|
+            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(mirror.id)
+          end
+
+          worker.perform
+        end
+      end
 
+      describe "hourly" do
         before do
+          time = DateTime.now.beginning_of_hour
+
+          Timecop.freeze(time)
+          mirror4.remote_mirrors.first.update_attributes(last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes)
+        end
+
+        it 'enqueues a job on mirrored Projects' do
+          mirrors = [mirror1, mirror2, mirror4]
+          worker = described_class.new
+
+          mirrors.each do |mirror|
+            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(mirror.id)
+          end
+
+          worker.perform
+        end
+      end
+
+      describe "daily" do
+        before do
+          time = DateTime.now.beginning_of_day
+
           Timecop.freeze(time)
           mirror4.remote_mirrors.first.update_attributes(last_successful_update_at: time - (Gitlab::Mirror::DAILY + 5).minutes)
         end
 
         it 'enqueues a job on mirrored Projects' do
+          mirrors = [mirror1, mirror2, mirror3, mirror4]
           worker = described_class.new
 
-          expect(mirrors.count).to eq(project_count)
           mirrors.each do |mirror|
             expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(mirror.id)
           end