1 files changed, 39 insertions, 34 deletions
diff --git a/spec/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data_spec.rb b/spec/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data_spec.rb
index 7dae28f72a5..4411dca3fd9 100644
--- a/spec/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data_spec.rb
+++ b/spec/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data_spec.rb
@@ -4,40 +4,45 @@ require 'spec_helper'
 describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema: 20200130145430 do
   let(:services) { table(:services) }
 
-  # we need to define the classes due to encryption
-  class IssueTrackerData < ApplicationRecord
-    self.table_name = 'issue_tracker_data'
-
-    def self.encryption_options
-      {
-        key: Settings.attr_encrypted_db_key_base_32,
-        encode: true,
-        mode: :per_attribute_iv,
-        algorithm: 'aes-256-gcm'
-      }
+  before do
+    # we need to define the classes due to encryption
+    issue_tracker_data = Class.new(ApplicationRecord) do
+      self.table_name = 'issue_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 :project_url, encryption_options
+      attr_encrypted :issues_url, encryption_options
+      attr_encrypted :new_issue_url, encryption_options
     end
 
-    attr_encrypted :project_url, encryption_options
-    attr_encrypted :issues_url, encryption_options
-    attr_encrypted :new_issue_url, encryption_options
-  end
+    jira_tracker_data = Class.new(ApplicationRecord) do
+      self.table_name = 'jira_tracker_data'
 
-  class JiraTrackerData < ApplicationRecord
-    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
 
-    def self.encryption_options
-      {
-        key: Settings.attr_encrypted_db_key_base_32,
-        encode: true,
-        mode: :per_attribute_iv,
-        algorithm: 'aes-256-gcm'
-      }
+      attr_encrypted :url, encryption_options
+      attr_encrypted :api_url, encryption_options
+      attr_encrypted :username, encryption_options
+      attr_encrypted :password, encryption_options
     end
 
-    attr_encrypted :url, encryption_options
-    attr_encrypted :api_url, encryption_options
-    attr_encrypted :username, encryption_options
-    attr_encrypted :password, encryption_options
+    stub_const('IssueTrackerData', issue_tracker_data)
+    stub_const('JiraTrackerData', jira_tracker_data)
   end
 
   let(:url) { 'http://base-url.tracker.com' }
@@ -90,7 +95,7 @@ describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema:
     end
   end
 
-  context 'with jira service' do
+  context 'with Jira service' do
     let!(:service) do
       services.create(id: 10, type: 'JiraService', title: nil, properties: jira_properties.to_json, category: 'issue_tracker')
     end
@@ -202,7 +207,7 @@ describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema:
     end
   end
 
-  context 'with jira service which has data fields record inconsistent with properties field' do
+  context 'with Jira service which has data fields record inconsistent with properties field' do
     let!(:service) do
       services.create(id: 16, type: 'CustomIssueTrackerService', description: 'Existing description', properties: jira_properties.to_json, category: 'issue_tracker').tap do |service|
         JiraTrackerData.create!(service_id: service.id, url: 'http://other_jira_url')
@@ -241,7 +246,7 @@ describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema:
     end
   end
 
-  context 'jira service with empty properties' do
+  context 'Jira service with empty properties' do
     let!(:service) do
       services.create(id: 18, type: 'JiraService', properties: '', category: 'issue_tracker')
     end
@@ -253,7 +258,7 @@ describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema:
     end
   end
 
-  context 'jira service with nil properties' do
+  context 'Jira service with nil properties' do
     let!(:service) do
       services.create(id: 18, type: 'JiraService', properties: nil, category: 'issue_tracker')
     end
@@ -265,7 +270,7 @@ describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema:
     end
   end
 
-  context 'jira service with invalid properties' do
+  context 'Jira service with invalid properties' do
     let!(:service) do
       services.create(id: 18, type: 'JiraService', properties: 'invalid data', category: 'issue_tracker')
     end
@@ -277,7 +282,7 @@ describe Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData, schema:
     end
   end
 
-  context 'with jira service with invalid properties, valid jira service and valid bugzilla service' do
+  context 'with Jira service with invalid properties, valid Jira service and valid bugzilla service' do
     let!(:jira_service_invalid) do
       services.create(id: 19, title: 'invalid - title', description: 'invalid - description', type: 'JiraService', properties: 'invalid data', category: 'issue_tracker')
     end