From 13f31ab91aeb5233a7b64f2740fee246294161fc Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 4 Aug 2022 09:10:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 ...acker_data_deployment_type_based_on_url_spec.rb | 48 ------------------
 ...acker_data_deployment_type_based_on_url_spec.rb | 58 ++++++++++++++++++++++
 2 files changed, 58 insertions(+), 48 deletions(-)
 delete mode 100644 spec/migrations/20210421163509_schedule_update_jira_tracker_data_deployment_type_based_on_url_spec.rb
 create mode 100644 spec/migrations/20220725150127_update_jira_tracker_data_deployment_type_based_on_url_spec.rb

(limited to 'spec/migrations')

diff --git a/spec/migrations/20210421163509_schedule_update_jira_tracker_data_deployment_type_based_on_url_spec.rb b/spec/migrations/20210421163509_schedule_update_jira_tracker_data_deployment_type_based_on_url_spec.rb
deleted file mode 100644
index 9a59c739ecd..00000000000
--- a/spec/migrations/20210421163509_schedule_update_jira_tracker_data_deployment_type_based_on_url_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require_migration!
-
-RSpec.describe ScheduleUpdateJiraTrackerDataDeploymentTypeBasedOnUrl, :migration do
-  let(:services_table) { table(:services) }
-  let(:service_jira_cloud) { services_table.create!(id: 1, type: 'JiraService') }
-  let(:service_jira_server) { services_table.create!(id: 2, type: 'JiraService') }
-
-  before do
-    jira_tracker_data = Class.new(ApplicationRecord) do
-      self.table_name = 'jira_tracker_data'
-
-      def self.encryption_options
-        {
-          key: Settings.attr_encrypted_db_key_base_32,
-          encode: true,
-          mode: :per_attribute_iv,
-          algorithm: 'aes-256-gcm'
-        }
-      end
-
-      attr_encrypted :url, encryption_options
-      attr_encrypted :api_url, encryption_options
-      attr_encrypted :username, encryption_options
-      attr_encrypted :password, encryption_options
-    end
-
-    stub_const('JiraTrackerData', jira_tracker_data)
-    stub_const("#{described_class}::BATCH_SIZE", 1)
-  end
-
-  let!(:tracker_data_cloud) { JiraTrackerData.create!(id: 1, service_id: service_jira_cloud.id, url: "https://test-domain.atlassian.net", deployment_type: 0) }
-  let!(:tracker_data_server) { JiraTrackerData.create!(id: 2, service_id: service_jira_server.id, url: "http://totally-not-jira-server.company.org", deployment_type: 0) }
-
-  around do |example|
-    freeze_time { Sidekiq::Testing.fake! { example.run } }
-  end
-
-  it 'schedules background migration' do
-    migrate!
-
-    expect(BackgroundMigrationWorker.jobs.size).to eq(2)
-    expect(described_class::MIGRATION).to be_scheduled_migration(tracker_data_cloud.id, tracker_data_cloud.id)
-    expect(described_class::MIGRATION).to be_scheduled_migration(tracker_data_server.id, tracker_data_server.id)
-  end
-end
diff --git a/spec/migrations/20220725150127_update_jira_tracker_data_deployment_type_based_on_url_spec.rb b/spec/migrations/20220725150127_update_jira_tracker_data_deployment_type_based_on_url_spec.rb
new file mode 100644
index 00000000000..a471b00592c
--- /dev/null
+++ b/spec/migrations/20220725150127_update_jira_tracker_data_deployment_type_based_on_url_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe UpdateJiraTrackerDataDeploymentTypeBasedOnUrl, :migration do
+  let(:integrations_table) { table(:integrations) }
+  let(:service_jira_cloud) { integrations_table.create!(id: 1, type_new: 'JiraService') }
+  let(:service_jira_server) { integrations_table.create!(id: 2, type_new: 'JiraService') }
+
+  before do
+    jira_tracker_data = Class.new(ApplicationRecord) do
+      self.table_name = 'jira_tracker_data'
+
+      def self.encryption_options
+        {
+          key: Settings.attr_encrypted_db_key_base_32,
+          encode: true,
+          mode: :per_attribute_iv,
+          algorithm: 'aes-256-gcm'
+        }
+      end
+
+      attr_encrypted :url, encryption_options
+      attr_encrypted :api_url, encryption_options
+      attr_encrypted :username, encryption_options
+      attr_encrypted :password, encryption_options
+    end
+
+    stub_const('JiraTrackerData', jira_tracker_data)
+    stub_const("#{described_class}::BATCH_SIZE", 1)
+    stub_const("#{described_class}::SUB_BATCH_SIZE", 1)
+  end
+
+  # rubocop:disable Layout/LineLength
+  # rubocop:disable RSpec/ScatteredLet
+  let!(:tracker_data_cloud) { JiraTrackerData.create!(id: 1, service_id: service_jira_cloud.id, url: "https://test-domain.atlassian.net", deployment_type: 0) }
+  let!(:tracker_data_server) { JiraTrackerData.create!(id: 2, service_id: service_jira_server.id, url: "http://totally-not-jira-server.company.org", deployment_type: 0) }
+  # rubocop:enable Layout/LineLength
+  # rubocop:enable RSpec/ScatteredLet
+
+  around do |example|
+    freeze_time { Sidekiq::Testing.fake! { example.run } }
+  end
+
+  let(:migration) { described_class::MIGRATION } # rubocop:disable RSpec/ScatteredLet
+
+  it 'schedules background migration' do
+    migrate!
+
+    expect(migration).to have_scheduled_batched_migration(
+      table_name: :jira_tracker_data,
+      column_name: :id,
+      interval: described_class::DELAY_INTERVAL,
+      gitlab_schema: :gitlab_main
+    )
+  end
+end
-- 
cgit v1.2.3