Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
index ea5192375f3..dad95760306 100644
--- a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
+++ b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
@@ -26,11 +26,11 @@ RSpec.describe MigrateIssueTrackersData do
     services.create!(type: 'BugzillaService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service) do
+  let!(:youtrack_integration) do
     services.create!(type: 'YoutrackService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service_empty) do
+  let!(:youtrack_integration_empty) do
     services.create!(type: 'YoutrackService', properties: '', category: 'issue_tracker')
   end
 
@@ -56,7 +56,7 @@ RSpec.describe MigrateIssueTrackersData do
         migrate!
 
         expect(migration_name).to be_scheduled_delayed_migration(3.minutes, jira_integration.id, bugzilla_integration.id)
-        expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_service.id, gitlab_service.id)
+        expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_integration.id, gitlab_service.id)
         expect(BackgroundMigrationWorker.jobs.size).to eq(2)
       end
     end
diff --git a/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb b/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
index 90bbdca4d9c..cf8bc608483 100644
--- a/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
+++ b/spec/migrations/20200130145430_reschedule_migrate_issue_trackers_data_spec.rb
@@ -26,11 +26,11 @@ RSpec.describe RescheduleMigrateIssueTrackersData do
     services.create!(id: 12, type: 'BugzillaService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service) do
+  let!(:youtrack_integration) do
     services.create!(id: 13, type: 'YoutrackService', properties: properties, category: 'issue_tracker')
   end
 
-  let!(:youtrack_service_empty) do
+  let!(:youtrack_integration_empty) do
     services.create!(id: 14, type: 'YoutrackService', properties: '', category: 'issue_tracker')
   end
 
@@ -57,7 +57,7 @@ RSpec.describe RescheduleMigrateIssueTrackersData do
           migrate!
 
           expect(migration_name).to be_scheduled_delayed_migration(3.minutes, jira_integration.id, bugzilla_integration.id)
-          expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_service.id, gitlab_service.id)
+          expect(migration_name).to be_scheduled_delayed_migration(6.minutes, youtrack_integration.id, gitlab_service.id)
           expect(BackgroundMigrationWorker.jobs.size).to eq(2)
         end
       end