Add latest changes from gitlab-org/gitlab@master

3 files changed, 86 insertions, 1 deletions

diff --git a/spec/frontend/boards/components/issue_board_filtered_search_spec.js b/spec/frontend/boards/components/issue_board_filtered_search_spec.js
index af2ad90396f..76e8b84d8ef 100644
--- a/spec/frontend/boards/components/issue_board_filtered_search_spec.js
+++ b/spec/frontend/boards/components/issue_board_filtered_search_spec.js
@@ -1,3 +1,4 @@
+import { orderBy } from 'lodash';
 import { shallowMount } from '@vue/test-utils';
 import BoardFilteredSearch from 'ee_else_ce/boards/components/board_filtered_search.vue';
 import IssueBoardFilteredSpec from '~/boards/components/issue_board_filtered_search.vue';
@@ -62,7 +63,7 @@ describe('IssueBoardFilter', () => {
           isSignedIn,
         );
 
-        expect(findBoardsFilteredSearch().props('tokens')).toEqual(tokens);
+        expect(findBoardsFilteredSearch().props('tokens')).toEqual(orderBy(tokens, ['title']));
       },
     );
   });
diff --git a/spec/lib/gitlab/background_migration/update_timelogs_null_spent_at_spec.rb b/spec/lib/gitlab/background_migration/update_timelogs_null_spent_at_spec.rb
new file mode 100644
index 00000000000..982e3319063
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/update_timelogs_null_spent_at_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::UpdateTimelogsNullSpentAt, schema: 20211215090620 do
+  let_it_be(:previous_time) { 10.days.ago }
+  let_it_be(:namespace) { table(:namespaces).create!(name: 'namespace', path: 'namespace') }
+  let_it_be(:project) { table(:projects).create!(namespace_id: namespace.id) }
+  let_it_be(:issue) { table(:issues).create!(project_id: project.id) }
+  let_it_be(:merge_request) { table(:merge_requests).create!(target_project_id: project.id, source_branch: 'master', target_branch: 'feature') }
+  let_it_be(:timelog1) { create_timelog!(issue_id: issue.id) }
+  let_it_be(:timelog2) { create_timelog!(merge_request_id: merge_request.id) }
+  let_it_be(:timelog3) { create_timelog!(issue_id: issue.id, spent_at: previous_time) }
+  let_it_be(:timelog4) { create_timelog!(merge_request_id: merge_request.id, spent_at: previous_time) }
+
+  subject(:background_migration) { described_class.new }
+
+  before_all do
+    table(:timelogs).where.not(id: [timelog3.id, timelog4.id]).update_all(spent_at: nil)
+  end
+
+  describe '#perform' do
+    it 'sets correct spent_at' do
+      background_migration.perform(timelog1.id, timelog4.id)
+
+      expect(timelog1.reload.spent_at).to be_like_time(timelog1.created_at)
+      expect(timelog2.reload.spent_at).to be_like_time(timelog2.created_at)
+      expect(timelog3.reload.spent_at).to be_like_time(previous_time)
+      expect(timelog4.reload.spent_at).to be_like_time(previous_time)
+      expect(timelog3.reload.spent_at).not_to be_like_time(timelog3.created_at)
+      expect(timelog4.reload.spent_at).not_to be_like_time(timelog4.created_at)
+    end
+  end
+
+  private
+
+  def create_timelog!(**args)
+    table(:timelogs).create!(**args, time_spent: 1)
+  end
+end
diff --git a/spec/migrations/schedule_update_timelogs_null_spent_at_spec.rb b/spec/migrations/schedule_update_timelogs_null_spent_at_spec.rb
new file mode 100644
index 00000000000..a81059518e6
--- /dev/null
+++ b/spec/migrations/schedule_update_timelogs_null_spent_at_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe ScheduleUpdateTimelogsNullSpentAt do
+  let_it_be(:namespace) { table(:namespaces).create!(name: 'namespace', path: 'namespace') }
+  let_it_be(:project) { table(:projects).create!(namespace_id: namespace.id) }
+  let_it_be(:issue) { table(:issues).create!(project_id: project.id) }
+  let_it_be(:merge_request) { table(:merge_requests).create!(target_project_id: project.id, source_branch: 'master', target_branch: 'feature') }
+  let_it_be(:timelog1) { create_timelog!(merge_request_id: merge_request.id) }
+  let_it_be(:timelog2) { create_timelog!(merge_request_id: merge_request.id) }
+  let_it_be(:timelog3) { create_timelog!(merge_request_id: merge_request.id) }
+  let_it_be(:timelog4) { create_timelog!(issue_id: issue.id) }
+  let_it_be(:timelog5) { create_timelog!(issue_id: issue.id) }
+
+  before_all do
+    table(:timelogs).where.not(id: timelog3.id).update_all(spent_at: nil)
+  end
+
+  it 'correctly schedules background migrations' do
+    stub_const("#{described_class}::BATCH_SIZE", 2)
+
+    Sidekiq::Testing.fake! do
+      freeze_time do
+        migrate!
+
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(2.minutes, timelog1.id, timelog2.id)
+
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(4.minutes, timelog4.id, timelog5.id)
+
+        expect(BackgroundMigrationWorker.jobs.size).to eq(2)
+      end
+    end
+  end
+
+  private
+
+  def create_timelog!(**args)
+    table(:timelogs).create!(**args, time_spent: 1)
+  end
+end