diff --git a/ee/spec/lib/ee/gitlab/ci/config_spec.rb b/ee/spec/lib/ee/gitlab/ci/config_spec.rb index 5185b4b85d13c9279668537768c98e959a55f3c9..80b41eb2b1c61862586c0081319c0205c4b98b27 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 d6970d066d5ff36c45e21194b914d9ce75f8eeab..d488fe183084734503aeebfb7dca17b49c1015ed 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 7e9809073345009dc255dd12687f135e00e5c6aa..3c503ceeddbd0ebe291edf4d4611d4b104b97d65 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 9730168b4466e610f0c360ba33a4f7971959b989..f1151b0bea60b3bbdcf86453d5c026077b3222f7 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 0536b50306320f9dacaa1e59954c488c6072de3c..e4c1879e290784d53380c3b24cfc82f56c64c21f 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 360b7f7a50e9ae99b2cd631af1c5c4c1343ea93f..51b8495b73eac97d607e8c14a7b01ae49a994c66 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 cce81b785fd31c1fc4fdb8d00831dd633b125652..477e8bd7a8551569e60d95af666c71a33126a90c 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 94e6a90e8db51f3d206e863a7a5a000dcb1b87ff..5f513fa9da24fbce7b44dd7400ecb850b6eab888 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 1fd196cdcee852a9be3e2c56ad62aa9ebdf660f6..7a004e2915cdeb95a5f1e64f9405bd0b7b66b7b2 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 119f8d001a1ce2b4a6cf54632d85bdd8418b1917..2e9b6f748cd0e1b01135a9d347e06b7a721e029d 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