diff options
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r-- | spec/frontend/fixtures/integrations.rb (renamed from spec/frontend/fixtures/services.rb) | 6 | ||||
-rw-r--r-- | spec/frontend/fixtures/prometheus_integration.rb (renamed from spec/frontend/fixtures/prometheus_service.rb) | 6 | ||||
-rw-r--r-- | spec/frontend/fixtures/runner.rb | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/spec/frontend/fixtures/services.rb b/spec/frontend/fixtures/integrations.rb index f0bb8fb962f..1bafb0bfe78 100644 --- a/spec/frontend/fixtures/services.rb +++ b/spec/frontend/fixtures/integrations.rb @@ -2,11 +2,11 @@ require 'spec_helper' -RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::Settings::IntegrationsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} - let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } + let(:project) { create(:project_empty_repo, namespace: namespace, path: 'integrations-project') } let!(:service) { create(:custom_issue_tracker_integration, project: project) } let(:user) { project.first_owner } @@ -20,7 +20,7 @@ RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :con remove_repository(project) end - it 'services/edit_service.html' do + it 'settings/integrations/edit.html' do get :edit, params: { namespace_id: namespace, project_id: project, diff --git a/spec/frontend/fixtures/prometheus_service.rb b/spec/frontend/fixtures/prometheus_integration.rb index aed73dc1096..883dbb929a2 100644 --- a/spec/frontend/fixtures/prometheus_service.rb +++ b/spec/frontend/fixtures/prometheus_integration.rb @@ -2,11 +2,11 @@ require 'spec_helper' -RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::Settings::IntegrationsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} - let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } + let(:project) { create(:project_empty_repo, namespace: namespace, path: 'integrations-project') } let!(:integration) { create(:prometheus_integration, project: project) } let(:user) { project.first_owner } @@ -20,7 +20,7 @@ RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :con remove_repository(project) end - it 'services/prometheus/prometheus_service.html' do + it 'integrations/prometheus/prometheus_integration.html' do get :edit, params: { namespace_id: namespace, project_id: project, diff --git a/spec/frontend/fixtures/runner.rb b/spec/frontend/fixtures/runner.rb index e17e73a93c4..a79982fa647 100644 --- a/spec/frontend/fixtures/runner.rb +++ b/spec/frontend/fixtures/runner.rb @@ -26,6 +26,12 @@ RSpec.describe 'Runner (JavaScript fixtures)' do remove_repository(project) end + before do + allow(Gitlab::Ci::RunnerUpgradeCheck.instance) + .to receive(:check_runner_upgrade_status) + .and_return(:not_available) + end + describe do before do sign_in(admin) |