From 9f3d4c0aa673d4c236ab40dfe3a05c2aa42b07bb Mon Sep 17 00:00:00 2001
From: Zehua Zhang <zhzhang@jihulab.com>
Date: Fri, 12 Aug 2022 14:57:50 +0800
Subject: [PATCH] Remove unused functions about CI template tests
---
ee/spec/lib/ee/gitlab/ci/config_spec.rb | 2 --
.../config/security_orchestration_policies/processor_spec.rb | 2 --
.../lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb | 2 --
.../services/app_sec/dast/scan_configs/fetch_service_spec.rb | 2 --
ee/spec/services/app_sec/dast/scans/run_service_spec.rb | 2 --
.../ci_configuration_service_spec.rb | 2 --
.../on_demand_scan_pipeline_configuration_service_spec.rb | 2 --
spec/graphql/types/project_type_spec.rb | 1 -
.../security/ci_configuration/sast_parser_service_spec.rb | 2 --
spec/support/helpers/ci/template_helpers.rb | 4 ----
10 files changed, 21 deletions(-)
diff --git a/ee/spec/lib/ee/gitlab/ci/config_spec.rb b/ee/spec/lib/ee/gitlab/ci/config_spec.rb
index 5185b4b85d13c..80b41eb2b1c61 100644
--- a/ee/spec/lib/ee/gitlab/ci/config_spec.rb
+++ b/ee/spec/lib/ee/gitlab/ci/config_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe Gitlab::Ci::Config do
- include Ci::TemplateHelpers
-
let_it_be(:ci_yml) do
<<-EOS
sample_job:
diff --git a/ee/spec/lib/gitlab/ci/config/security_orchestration_policies/processor_spec.rb b/ee/spec/lib/gitlab/ci/config/security_orchestration_policies/processor_spec.rb
index d6970d066d5ff..d488fe1830847 100644
--- a/ee/spec/lib/gitlab/ci/config/security_orchestration_policies/processor_spec.rb
+++ b/ee/spec/lib/gitlab/ci/config/security_orchestration_policies/processor_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do
- include Ci::TemplateHelpers
-
subject { described_class.new(config, project, ref, source).perform }
let_it_be(:config) { { image: 'image:1.0.0' } }
diff --git a/ee/spec/lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb b/ee/spec/lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb
index 7e98090733450..3c503ceeddbd0 100644
--- a/ee/spec/lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb
+++ b/ee/spec/lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe 'Secure-Binaries.gitlab-ci.yml' do
- include Ci::TemplateHelpers
-
subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Secure-Binaries') }
specify { expect(template).not_to be_nil }
diff --git a/ee/spec/services/app_sec/dast/scan_configs/fetch_service_spec.rb b/ee/spec/services/app_sec/dast/scan_configs/fetch_service_spec.rb
index 9730168b4466e..f1151b0bea60b 100644
--- a/ee/spec/services/app_sec/dast/scan_configs/fetch_service_spec.rb
+++ b/ee/spec/services/app_sec/dast/scan_configs/fetch_service_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe AppSec::Dast::ScanConfigs::FetchService do
- include Ci::TemplateHelpers
-
let_it_be(:user) { create(:user) }
let_it_be(:namespace) { create(:namespace, owner: user) }
let_it_be(:project) { create(:project, :repository, namespace: namespace) }
diff --git a/ee/spec/services/app_sec/dast/scans/run_service_spec.rb b/ee/spec/services/app_sec/dast/scans/run_service_spec.rb
index 0536b50306320..e4c1879e29078 100644
--- a/ee/spec/services/app_sec/dast/scans/run_service_spec.rb
+++ b/ee/spec/services/app_sec/dast/scans/run_service_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe AppSec::Dast::Scans::RunService do
- include Ci::TemplateHelpers
-
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project, :repository, creator: user) }
let_it_be(:dast_site_profile) { create(:dast_site_profile, :with_dast_submit_field, project: project) }
diff --git a/ee/spec/services/security/security_orchestration_policies/ci_configuration_service_spec.rb b/ee/spec/services/security/security_orchestration_policies/ci_configuration_service_spec.rb
index 360b7f7a50e9a..51b8495b73eac 100644
--- a/ee/spec/services/security/security_orchestration_policies/ci_configuration_service_spec.rb
+++ b/ee/spec/services/security/security_orchestration_policies/ci_configuration_service_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe Security::SecurityOrchestrationPolicies::CiConfigurationService do
- include Ci::TemplateHelpers
-
describe '#execute' do
let_it_be(:service) { described_class.new }
let_it_be(:ci_variables) do
diff --git a/ee/spec/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service_spec.rb b/ee/spec/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service_spec.rb
index cce81b785fd31..477e8bd7a8551 100644
--- a/ee/spec/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service_spec.rb
+++ b/ee/spec/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe Security::SecurityOrchestrationPolicies::OnDemandScanPipelineConfigurationService do
- include Ci::TemplateHelpers
-
describe '#execute' do
let_it_be_with_reload(:project) { create(:project, :repository) }
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index 94e6a90e8db51..5f513fa9da24f 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -4,7 +4,6 @@
RSpec.describe GitlabSchema.types['Project'] do
include GraphqlHelpers
- include Ci::TemplateHelpers
specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Project) }
diff --git a/spec/services/security/ci_configuration/sast_parser_service_spec.rb b/spec/services/security/ci_configuration/sast_parser_service_spec.rb
index 1fd196cdcee85..7a004e2915cde 100644
--- a/spec/services/security/ci_configuration/sast_parser_service_spec.rb
+++ b/spec/services/security/ci_configuration/sast_parser_service_spec.rb
@@ -3,8 +3,6 @@
require 'spec_helper'
RSpec.describe Security::CiConfiguration::SastParserService do
- include Ci::TemplateHelpers
-
describe '#configuration' do
include_context 'read ci configuration for sast enabled project'
diff --git a/spec/support/helpers/ci/template_helpers.rb b/spec/support/helpers/ci/template_helpers.rb
index 119f8d001a1ce..2e9b6f748cd0e 100644
--- a/spec/support/helpers/ci/template_helpers.rb
+++ b/spec/support/helpers/ci/template_helpers.rb
@@ -2,10 +2,6 @@
module Ci
module TemplateHelpers
- def secure_analyzers_prefix
- 'registry.gitlab.com/security-products'
- end
-
def template_registry_host
'registry.gitlab.com'
end
--
GitLab