Revert "Merge branch 'require-all-templates-to-include-default-stages' into 'master'"

This reverts merge request !26954

2 files changed, 37 insertions, 30 deletions

diff --git a/spec/lib/gitlab/ci/templates/templates_spec.rb b/spec/lib/gitlab/ci/templates/templates_spec.rb
index b52064b3036..4e3681cd943 100644
--- a/spec/lib/gitlab/ci/templates/templates_spec.rb
+++ b/spec/lib/gitlab/ci/templates/templates_spec.rb
@@ -3,32 +3,46 @@
 require 'spec_helper'
 
 describe "CI YML Templates" do
-  using RSpec::Parameterized::TableSyntax
-
-  subject { Gitlab::Ci::YamlProcessor.new(content) }
-
-  where(:template_name) do
-    Gitlab::Template::GitlabCiYmlTemplate.all.map(&:full_name)
+  ABSTRACT_TEMPLATES = %w[Serverless].freeze
+  # These templates depend on the presence of the `project`
+  # param to enable processing of `include:` within CI config.
+  PROJECT_DEPENDENT_TEMPLATES = %w[Auto-DevOps DAST].freeze
+
+  def self.concrete_templates
+    Gitlab::Template::GitlabCiYmlTemplate.all.reject do |template|
+      ABSTRACT_TEMPLATES.include?(template.name)
+    end
   end
 
-  with_them do
-    let(:content) do
-      <<~EOS
-        include:
-          - template: #{template_name}
-
-        concrete_build_implemented_by_a_user:
-          stage: test
-          script: do something
-      EOS
+  def self.abstract_templates
+    Gitlab::Template::GitlabCiYmlTemplate.all.select do |template|
+      ABSTRACT_TEMPLATES.include?(template.name)
     end
+  end
+
+  describe 'concrete templates with CI/CD jobs' do
+    concrete_templates.each do |template|
+      it "#{template.name} template should be valid" do
+        # Trigger processing of included files
+        project = create(:project, :test_repo) if PROJECT_DEPENDENT_TEMPLATES.include?(template.name)
 
-    it 'is valid' do
-      expect { subject }.not_to raise_error
+        expect { Gitlab::Ci::YamlProcessor.new(template.content, project: project) }
+          .not_to raise_error
+      end
     end
+  end
 
-    it 'require default stages to be included' do
-      expect(subject.stages).to include(*Gitlab::Ci::Config::Entry::Stages.default)
+  describe 'abstract templates without concrete jobs defined' do
+    abstract_templates.each do |template|
+      it "#{template.name} template should be valid after being implemented" do
+        content = template.content + <<~EOS
+          concrete_build_implemented_by_a_user:
+            stage: build
+            script: do something
+        EOS
+
+        expect { Gitlab::Ci::YamlProcessor.new(content) }.not_to raise_error
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index 2bea17ed030..8b39c4e4dd0 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -626,8 +626,8 @@ module Gitlab
           context "when an array is provided" do
             let(:include_content) { ["/local.gitlab-ci.yml"] }
 
-            it "returns a validation error" do
-              expect { subject }.to raise_error(Gitlab::Ci::YamlProcessor::ValidationError, /does not have project/)
+            it "does not return any error" do
+              expect { subject }.not_to raise_error
             end
           end
 
@@ -643,18 +643,11 @@ module Gitlab
             let(:include_content) do
               [
                 'https://gitlab.com/awesome-project/raw/master/.before-script-template.yml',
+                '/templates/.after-script-template.yml',
                 { template: 'Auto-DevOps.gitlab-ci.yml' }
               ]
             end
 
-            before do
-              WebMock.stub_request(:get, 'https://gitlab.com/awesome-project/raw/master/.before-script-template.yml')
-                .to_return(
-                  status: 200,
-                  headers: { 'Content-Type' => 'application/json' },
-                  body: 'prepare: { script: ls -al }')
-            end
-
             it "does not return any error" do
               expect { subject }.not_to raise_error
             end