From fedf978f9aa1909ed7bb3fad767ad120a1c6bd7b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 28 Jan 2020 15:08:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../self_monitoring/project/create_service_spec.rb | 8 ++++---- .../self_monitoring/project/delete_service_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/lib/gitlab/database_importers') diff --git a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb index 10efdd44f20..e425acd4ae5 100644 --- a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb +++ b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb @@ -103,7 +103,7 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do end it 'creates project with correct name and description' do - path = 'administration/monitoring/gitlab_instance_administration_project/index' + path = 'administration/monitoring/gitlab_self_monitoring_project/index' docs_path = Rails.application.routes.url_helpers.help_page_path(path) expect(result[:status]).to eq(:success) @@ -122,13 +122,13 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do it 'saves the project id' do expect(result[:status]).to eq(:success) - expect(application_setting.instance_administration_project_id).to eq(project.id) + expect(application_setting.self_monitoring_project_id).to eq(project.id) end it 'returns error when saving project ID fails' do allow(application_setting).to receive(:update).and_call_original allow(application_setting).to receive(:update) - .with(instance_administration_project_id: anything) + .with(self_monitoring_project_id: anything) .and_return(false) expect(result).to eq( @@ -144,7 +144,7 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do before do application_setting.instance_administrators_group_id = existing_group.id - application_setting.instance_administration_project_id = existing_project.id + application_setting.self_monitoring_project_id = existing_project.id end it 'returns success' do diff --git a/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb b/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb index 6446ab1beb4..89d816c0cf7 100644 --- a/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb +++ b/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb @@ -24,7 +24,7 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::DeleteService do let(:application_setting) do create( :application_setting, - instance_administration_project_id: project.id, + self_monitoring_project_id: project.id, instance_administrators_group_id: group.id ) end @@ -38,7 +38,7 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::DeleteService do it 'deletes project ID from application settings' do subject.execute - expect(application_setting.reload.instance_administration_project_id).to be_nil + expect(application_setting.reload.self_monitoring_project_id).to be_nil end it 'does not delete group' do -- cgit v1.2.1