Add latest changes from gitlab-org/gitlab@master

8 files changed, 235 insertions, 101 deletions

diff --git a/spec/frontend/issues/show/components/app_spec.js b/spec/frontend/issues/show/components/app_spec.js
index c4c1ee6347e..4b800a4ccc9 100644
--- a/spec/frontend/issues/show/components/app_spec.js
+++ b/spec/frontend/issues/show/components/app_spec.js
@@ -4,6 +4,7 @@ import { nextTick } from 'vue';
 import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import '~/behaviors/markdown/render_gfm';
 import { IssuableStatus, IssuableStatusText, IssuableType } from '~/issues/constants';
 import IssuableApp from '~/issues/show/components/app.vue';
@@ -647,4 +648,14 @@ describe('Issuable output', () => {
       expect(wrapper.vm.updateStoreState).toHaveBeenCalled();
     });
   });
+
+  describe('listItemReorder event', () => {
+    it('makes request to update issue', async () => {
+      const description = 'I have been updated!';
+      findDescription().vm.$emit('listItemReorder', description);
+      await waitForPromises();
+
+      expect(mock.history.put[0].data).toContain(description);
+    });
+  });
 });
diff --git a/spec/frontend/issues/show/mock_data/mock_data.js b/spec/frontend/issues/show/mock_data/mock_data.js
index 7b0b8ca686a..909789b7a0f 100644
--- a/spec/frontend/issues/show/mock_data/mock_data.js
+++ b/spec/frontend/issues/show/mock_data/mock_data.js
@@ -77,7 +77,22 @@ export const descriptionHtmlWithTask = `
   <ul data-sourcepos="1:1-3:7" class="task-list" dir="auto">
     <li data-sourcepos="1:1-1:10" class="task-list-item">
       <input type="checkbox" class="task-list-item-checkbox" disabled>
-      <a href="/gitlab-org/gitlab-test/-/issues/48" data-original="#48+" data-link="false" data-link-reference="false" data-project="1" data-issue="2" data-reference-format="+" data-reference-type="task" data-container="body" data-placement="top" title="1" class="gfm gfm-issue has-tooltip">1 (#48)</a>
+      <a href="/gitlab-org/gitlab-test/-/issues/48" data-original="#48+" data-link="false" data-link-reference="false" data-project="1" data-issue="2" data-reference-format="+" data-reference-type="task" data-container="body" data-placement="top" title="1" class="gfm gfm-issue has-tooltip" data-issue-type="task">1 (#48)</a>
+    </li>
+    <li data-sourcepos="2:1-2:7" class="task-list-item">
+      <input type="checkbox" class="task-list-item-checkbox" disabled> 2
+    </li>
+    <li data-sourcepos="3:1-3:7" class="task-list-item">
+      <input type="checkbox" class="task-list-item-checkbox" disabled> 3
+    </li>
+  </ul>
+`;
+
+export const descriptionHtmlWithIssue = `
+  <ul data-sourcepos="1:1-3:7" class="task-list" dir="auto">
+    <li data-sourcepos="1:1-1:10" class="task-list-item">
+      <input type="checkbox" class="task-list-item-checkbox" disabled>
+      <a href="/gitlab-org/gitlab-test/-/issues/48" data-original="#48+" data-link="false" data-link-reference="false" data-project="1" data-issue="2" data-reference-format="+" data-reference-type="task" data-container="body" data-placement="top" title="1" class="gfm gfm-issue has-tooltip" data-issue-type="issue">1 (#48)</a>
     </li>
     <li data-sourcepos="2:1-2:7" class="task-list-item">
       <input type="checkbox" class="task-list-item-checkbox" disabled> 2
diff --git a/spec/frontend/issues/show/utils_spec.js b/spec/frontend/issues/show/utils_spec.js
new file mode 100644
index 00000000000..e5f14cfc01a
--- /dev/null
+++ b/spec/frontend/issues/show/utils_spec.js
@@ -0,0 +1,40 @@
+import { convertDescriptionWithNewSort } from '~/issues/show/utils';
+
+describe('app/assets/javascripts/issues/show/utils.js', () => {
+  describe('convertDescriptionWithNewSort', () => {
+    it('converts markdown description with new list sort order', () => {
+      const description = `I am text
+
+- Item 1
+- Item 2
+  - Item 3
+  - Item 4
+- Item 5`;
+
+      // Drag Item 2 + children to Item 1's position
+      const html = `<ul data-sourcepos="3:1-8:0">
+        <li data-sourcepos="4:1-4:8">
+          Item 2
+          <ul data-sourcepos="5:1-6:10">
+            <li data-sourcepos="5:1-5:10">Item 3</li>
+            <li data-sourcepos="6:1-6:10">Item 4</li>
+          </ul>
+        </li>
+        <li data-sourcepos="3:1-3:8">Item 1</li>
+        <li data-sourcepos="7:1-8:0">Item 5</li>
+      <ul>`;
+      const list = document.createElement('div');
+      list.innerHTML = html;
+
+      const expected = `I am text
+
+- Item 2
+  - Item 3
+  - Item 4
+- Item 1
+- Item 5`;
+
+      expect(convertDescriptionWithNewSort(description, list.firstChild)).toBe(expected);
+    });
+  });
+});
diff --git a/spec/frontend/jobs/components/stuck_block_spec.js b/spec/frontend/jobs/components/stuck_block_spec.js
index 4db73eaaaec..1580ed45e46 100644
--- a/spec/frontend/jobs/components/stuck_block_spec.js
+++ b/spec/frontend/jobs/components/stuck_block_spec.js
@@ -32,7 +32,7 @@ describe('Stuck Block Job component', () => {
   describe('with no runners for project', () => {
     beforeEach(() => {
       createWrapper({
-        hasNoRunnersForProject: true,
+        hasOfflineRunnersForProject: true,
         runnersPath: '/root/project/runners#js-runners-settings',
       });
     });
@@ -53,7 +53,7 @@ describe('Stuck Block Job component', () => {
   describe('with tags', () => {
     beforeEach(() => {
       createWrapper({
-        hasNoRunnersForProject: false,
+        hasOfflineRunnersForProject: false,
         tags,
         runnersPath: '/root/project/runners#js-runners-settings',
       });
@@ -81,7 +81,7 @@ describe('Stuck Block Job component', () => {
   describe('without active runners', () => {
     beforeEach(() => {
       createWrapper({
-        hasNoRunnersForProject: false,
+        hasOfflineRunnersForProject: false,
         runnersPath: '/root/project/runners#js-runners-settings',
       });
     });
diff --git a/spec/frontend/jobs/store/getters_spec.js b/spec/frontend/jobs/store/getters_spec.js
index 7a0fe2b8202..c13b051c672 100644
--- a/spec/frontend/jobs/store/getters_spec.js
+++ b/spec/frontend/jobs/store/getters_spec.js
@@ -208,7 +208,7 @@ describe('Job Store Getters', () => {
     });
   });
 
-  describe('hasRunnersForProject', () => {
+  describe('hasOfflineRunnersForProject', () => {
     describe('with available and offline runners', () => {
       it('returns true', () => {
         localState.job.runners = {
@@ -216,7 +216,7 @@ describe('Job Store Getters', () => {
           online: false,
         };
 
-        expect(getters.hasRunnersForProject(localState)).toEqual(true);
+        expect(getters.hasOfflineRunnersForProject(localState)).toEqual(true);
       });
     });
 
@@ -227,7 +227,7 @@ describe('Job Store Getters', () => {
           online: false,
         };
 
-        expect(getters.hasRunnersForProject(localState)).toEqual(false);
+        expect(getters.hasOfflineRunnersForProject(localState)).toEqual(false);
       });
     });
 
@@ -238,7 +238,7 @@ describe('Job Store Getters', () => {
           online: true,
         };
 
-        expect(getters.hasRunnersForProject(localState)).toEqual(false);
+        expect(getters.hasOfflineRunnersForProject(localState)).toEqual(false);
       });
     });
   });
diff --git a/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb b/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb
index fae09c32c20..d06077d69b6 100644
--- a/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb
+++ b/spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb
@@ -5,6 +5,8 @@ require 'spec_helper'
 RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
   let_it_be(:project) { create(:project) }
 
+  let(:supported_dast_versions) { described_class::SUPPORTED_VERSIONS[:dast].join(', ') }
+
   let(:scanner) do
     {
       'id' => 'gemnasium',
@@ -22,7 +24,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       expect(described_class::SUPPORTED_VERSIONS.keys).to eq(described_class::DEPRECATED_VERSIONS.keys)
     end
 
-    context 'files under schema path are explicitly listed' do
+    context 'when a schema JSON file exists for a particular report type version' do
       # We only care about the part that comes before report-format.json
       # https://rubular.com/r/N8Juz7r8hYDYgD
       filename_regex = /(?<report_type>[-\w]*)\-report-format.json/
@@ -36,14 +38,14 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           matches = filename_regex.match(file)
           report_type = matches[:report_type].tr("-", "_").to_sym
 
-          it "#{report_type} #{version}" do
+          it "#{report_type} #{version} is in the constant" do
             expect(described_class::SUPPORTED_VERSIONS[report_type]).to include(version)
           end
         end
       end
     end
 
-    context 'every SUPPORTED_VERSION has a corresponding JSON file' do
+    context 'when every SUPPORTED_VERSION has a corresponding JSON file' do
       described_class::SUPPORTED_VERSIONS.each_key do |report_type|
         # api_fuzzing is covered by DAST schema
         next if report_type == :api_fuzzing
@@ -66,7 +68,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { described_class::SUPPORTED_VERSIONS[report_type].last }
 
-      context 'and the report is valid' do
+      context 'when the report is valid' do
         let(:report_data) do
           {
             'version' => report_version,
@@ -77,7 +79,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         it { is_expected.to be_truthy }
       end
 
-      context 'and the report is invalid' do
+      context 'when the report is invalid' do
         let(:report_data) do
           {
             'version' => report_version
@@ -116,7 +118,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         stub_const("#{described_class}::DEPRECATED_VERSIONS", deprecations_hash)
       end
 
-      context 'and the report passes schema validation' do
+      context 'when the report passes schema validation' do
         let(:report_data) do
           {
             'version' => '10.0.0',
@@ -141,8 +143,8 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         end
       end
 
-      context 'and the report does not pass schema validation' do
-        context 'and enforce_security_report_validation is enabled' do
+      context 'when the report does not pass schema validation' do
+        context 'when enforce_security_report_validation is enabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: true)
           end
@@ -156,7 +158,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           it { is_expected.to be_falsey }
         end
 
-        context 'and enforce_security_report_validation is disabled' do
+        context 'when enforce_security_report_validation is disabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: false)
           end
@@ -176,12 +178,12 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { "12.37.0" }
 
-      context 'if enforce_security_report_validation is enabled' do
+      context 'when enforce_security_report_validation is enabled' do
         before do
           stub_feature_flags(enforce_security_report_validation: true)
         end
 
-        context 'and the report is valid' do
+        context 'when the report is valid' do
           let(:report_data) do
             {
               'version' => report_version,
@@ -206,14 +208,14 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           end
         end
 
-        context 'and the report is invalid' do
+        context 'when the report is invalid' do
           let(:report_data) do
             {
               'version' => report_version
             }
           end
 
-          context 'and scanner information is empty' do
+          context 'when scanner information is empty' do
             let(:scanner) { {} }
 
             it 'logs related information' do
@@ -245,12 +247,12 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         end
       end
 
-      context 'if enforce_security_report_validation is disabled' do
+      context 'when enforce_security_report_validation is disabled' do
         before do
           stub_feature_flags(enforce_security_report_validation: false)
         end
 
-        context 'and the report is valid' do
+        context 'when the report is valid' do
           let(:report_data) do
             {
               'version' => report_version,
@@ -261,7 +263,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           it { is_expected.to be_truthy }
         end
 
-        context 'and the report is invalid' do
+        context 'when the report is invalid' do
           let(:report_data) do
             {
               'version' => report_version
@@ -272,6 +274,30 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         end
       end
     end
+
+    context 'when not given a schema version' do
+      let(:report_type) { :dast }
+      let(:report_version) { nil }
+      let(:report_data) do
+        {
+          'vulnerabilities' => []
+        }
+      end
+
+      before do
+        stub_feature_flags(enforce_security_report_validation: true)
+      end
+
+      it { is_expected.to be_falsey }
+
+      context 'when enforce_security_report_validation is disabled' do
+        before do
+          stub_feature_flags(enforce_security_report_validation: false)
+        end
+
+        it { is_expected.to be_truthy }
+      end
+    end
   end
 
   describe '#errors' do
@@ -281,7 +307,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { described_class::SUPPORTED_VERSIONS[report_type].last }
 
-      context 'and the report is valid' do
+      context 'when the report is valid' do
         let(:report_data) do
           {
             'version' => report_version,
@@ -289,19 +315,17 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           }
         end
 
-        let(:expected_errors) { [] }
-
-        it { is_expected.to match_array(expected_errors) }
+        it { is_expected.to be_empty }
       end
 
-      context 'and the report is invalid' do
+      context 'when the report is invalid' do
         let(:report_data) do
           {
             'version' => report_version
           }
         end
 
-        context 'if enforce_security_report_validation is enabled' do
+        context 'when enforce_security_report_validation is enabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: project)
           end
@@ -315,14 +339,12 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           it { is_expected.to match_array(expected_errors) }
         end
 
-        context 'if enforce_security_report_validation is disabled' do
+        context 'when enforce_security_report_validation is disabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: false)
           end
 
-          let(:expected_errors) { [] }
-
-          it { is_expected.to match_array(expected_errors) }
+          it { is_expected.to be_empty }
         end
       end
     end
@@ -341,7 +363,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         stub_const("#{described_class}::DEPRECATED_VERSIONS", deprecations_hash)
       end
 
-      context 'and the report passes schema validation' do
+      context 'when the report passes schema validation' do
         let(:report_data) do
           {
             'version' => '10.0.0',
@@ -349,13 +371,11 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           }
         end
 
-        let(:expected_errors) { [] }
-
-        it { is_expected.to match_array(expected_errors) }
+        it { is_expected.to be_empty }
       end
 
-      context 'and the report does not pass schema validation' do
-        context 'and enforce_security_report_validation is enabled' do
+      context 'when the report does not pass schema validation' do
+        context 'when enforce_security_report_validation is enabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: true)
           end
@@ -376,7 +396,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           it { is_expected.to match_array(expected_errors) }
         end
 
-        context 'and enforce_security_report_validation is disabled' do
+        context 'when enforce_security_report_validation is disabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: false)
           end
@@ -387,9 +407,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
             }
           end
 
-          let(:expected_errors) { [] }
-
-          it { is_expected.to match_array(expected_errors) }
+          it { is_expected.to be_empty }
         end
       end
     end
@@ -398,12 +416,12 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { "12.37.0" }
 
-      context 'if enforce_security_report_validation is enabled' do
+      context 'when enforce_security_report_validation is enabled' do
         before do
           stub_feature_flags(enforce_security_report_validation: true)
         end
 
-        context 'and the report is valid' do
+        context 'when the report is valid' do
           let(:report_data) do
             {
               'version' => report_version,
@@ -413,14 +431,14 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
 
           let(:expected_errors) do
             [
-              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: 14.0.0, 14.0.1, 14.0.2, 14.0.3, 14.0.4, 14.0.5, 14.0.6, 14.1.0, 14.1.1, 14.1.2"
+              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: #{supported_dast_versions}"
             ]
           end
 
           it { is_expected.to match_array(expected_errors) }
         end
 
-        context 'and the report is invalid' do
+        context 'when the report is invalid' do
           let(:report_data) do
             {
               'version' => report_version
@@ -429,7 +447,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
 
           let(:expected_errors) do
             [
-              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: 14.0.0, 14.0.1, 14.0.2, 14.0.3, 14.0.4, 14.0.5, 14.0.6, 14.1.0, 14.1.1, 14.1.2",
+              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: #{supported_dast_versions}",
               "root is missing required keys: vulnerabilities"
             ]
           end
@@ -438,12 +456,12 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         end
       end
 
-      context 'if enforce_security_report_validation is disabled' do
+      context 'when enforce_security_report_validation is disabled' do
         before do
           stub_feature_flags(enforce_security_report_validation: false)
         end
 
-        context 'and the report is valid' do
+        context 'when the report is valid' do
           let(:report_data) do
             {
               'version' => report_version,
@@ -451,22 +469,45 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
             }
           end
 
-          let(:expected_errors) { [] }
-
-          it { is_expected.to match_array(expected_errors) }
+          it { is_expected.to be_empty }
         end
 
-        context 'and the report is invalid' do
+        context 'when the report is invalid' do
           let(:report_data) do
             {
               'version' => report_version
             }
           end
 
-          let(:expected_errors) { [] }
+          it { is_expected.to be_empty }
+        end
+      end
+    end
+
+    context 'when not given a schema version' do
+      let(:report_type) { :dast }
+      let(:report_version) { nil }
+      let(:report_data) do
+        {
+          'vulnerabilities' => []
+        }
+      end
 
-          it { is_expected.to match_array(expected_errors) }
+      let(:expected_errors) do
+        [
+          "root is missing required keys: version",
+          "Report version not provided, dast report type supports versions: #{supported_dast_versions}"
+        ]
+      end
+
+      it { is_expected.to match_array(expected_errors) }
+
+      context 'when enforce_security_report_validation is disabled' do
+        before do
+          stub_feature_flags(enforce_security_report_validation: false)
         end
+
+        it { is_expected.to be_empty }
       end
     end
   end
@@ -478,9 +519,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { described_class::SUPPORTED_VERSIONS[report_type].last }
 
-      let(:expected_deprecation_warnings) { [] }
-
-      context 'and the report is valid' do
+      context 'when the report is valid' do
         let(:report_data) do
           {
             'version' => report_version,
@@ -488,17 +527,17 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           }
         end
 
-        it { is_expected.to match_array(expected_deprecation_warnings) }
+        it { is_expected.to be_empty }
       end
 
-      context 'and the report is invalid' do
+      context 'when the report is invalid' do
         let(:report_data) do
           {
             'version' => report_version
           }
         end
 
-        it { is_expected.to match_array(expected_deprecation_warnings) }
+        it { is_expected.to be_empty }
       end
     end
 
@@ -513,7 +552,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_version) { described_class::DEPRECATED_VERSIONS[report_type].last }
       let(:expected_deprecation_warnings) do
         [
-          "Version V2.7.0 for report type dast has been deprecated, supported versions for this report type are: 14.0.0, 14.0.1, 14.0.2, 14.0.3, 14.0.4, 14.0.5, 14.0.6, 14.1.0, 14.1.1, 14.1.2"
+          "Version V2.7.0 for report type dast has been deprecated, supported versions for this report type are: #{supported_dast_versions}"
         ]
       end
 
@@ -521,7 +560,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         stub_const("#{described_class}::DEPRECATED_VERSIONS", deprecations_hash)
       end
 
-      context 'and the report passes schema validation' do
+      context 'when the report passes schema validation' do
         let(:report_data) do
           {
             'version' => report_version,
@@ -532,7 +571,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         it { is_expected.to match_array(expected_deprecation_warnings) }
       end
 
-      context 'and the report does not pass schema validation' do
+      context 'when the report does not pass schema validation' do
         let(:report_data) do
           {
             'version' => 'V2.7.0'
@@ -565,7 +604,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { described_class::SUPPORTED_VERSIONS[report_type].last }
 
-      context 'and the report is valid' do
+      context 'when the report is valid' do
         let(:report_data) do
           {
             'version' => report_version,
@@ -573,29 +612,25 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
           }
         end
 
-        let(:expected_warnings) { [] }
-
-        it { is_expected.to match_array(expected_warnings) }
+        it { is_expected.to be_empty }
       end
 
-      context 'and the report is invalid' do
+      context 'when the report is invalid' do
         let(:report_data) do
           {
             'version' => report_version
           }
         end
 
-        context 'if enforce_security_report_validation is enabled' do
+        context 'when enforce_security_report_validation is enabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: project)
           end
 
-          let(:expected_warnings) { [] }
-
-          it { is_expected.to match_array(expected_warnings) }
+          it { is_expected.to be_empty }
         end
 
-        context 'if enforce_security_report_validation is disabled' do
+        context 'when enforce_security_report_validation is disabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: false)
           end
@@ -625,36 +660,32 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         stub_const("#{described_class}::DEPRECATED_VERSIONS", deprecations_hash)
       end
 
-      context 'and the report passes schema validation' do
+      context 'when the report passes schema validation' do
         let(:report_data) do
           {
             'vulnerabilities' => []
           }
         end
 
-        let(:expected_warnings) { [] }
-
-        it { is_expected.to match_array(expected_warnings) }
+        it { is_expected.to be_empty }
       end
 
-      context 'and the report does not pass schema validation' do
+      context 'when the report does not pass schema validation' do
         let(:report_data) do
           {
             'version' => 'V2.7.0'
           }
         end
 
-        context 'and enforce_security_report_validation is enabled' do
+        context 'when enforce_security_report_validation is enabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: true)
           end
 
-          let(:expected_warnings) { [] }
-
-          it { is_expected.to match_array(expected_warnings) }
+          it { is_expected.to be_empty }
         end
 
-        context 'and enforce_security_report_validation is disabled' do
+        context 'when enforce_security_report_validation is disabled' do
           before do
             stub_feature_flags(enforce_security_report_validation: false)
           end
@@ -675,12 +706,12 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
       let(:report_type) { :dast }
       let(:report_version) { "12.37.0" }
 
-      context 'if enforce_security_report_validation is enabled' do
+      context 'when enforce_security_report_validation is enabled' do
         before do
           stub_feature_flags(enforce_security_report_validation: true)
         end
 
-        context 'and the report is valid' do
+        context 'when the report is valid' do
           let(:report_data) do
             {
               'version' => report_version,
@@ -688,30 +719,26 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
             }
           end
 
-          let(:expected_warnings) { [] }
-
-          it { is_expected.to match_array(expected_warnings) }
+          it { is_expected.to be_empty }
         end
 
-        context 'and the report is invalid' do
+        context 'when the report is invalid' do
           let(:report_data) do
             {
               'version' => report_version
             }
           end
 
-          let(:expected_warnings) { [] }
-
-          it { is_expected.to match_array(expected_warnings) }
+          it { is_expected.to be_empty }
         end
       end
 
-      context 'if enforce_security_report_validation is disabled' do
+      context 'when enforce_security_report_validation is disabled' do
         before do
           stub_feature_flags(enforce_security_report_validation: false)
         end
 
-        context 'and the report is valid' do
+        context 'when the report is valid' do
           let(:report_data) do
             {
               'version' => report_version,
@@ -721,14 +748,14 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
 
           let(:expected_warnings) do
             [
-              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: 14.0.0, 14.0.1, 14.0.2, 14.0.3, 14.0.4, 14.0.5, 14.0.6, 14.1.0, 14.1.1, 14.1.2"
+              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: #{supported_dast_versions}"
             ]
           end
 
           it { is_expected.to match_array(expected_warnings) }
         end
 
-        context 'and the report is invalid' do
+        context 'when the report is invalid' do
           let(:report_data) do
             {
               'version' => report_version
@@ -737,7 +764,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
 
           let(:expected_warnings) do
             [
-              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: 14.0.0, 14.0.1, 14.0.2, 14.0.3, 14.0.4, 14.0.5, 14.0.6, 14.1.0, 14.1.1, 14.1.2",
+              "Version 12.37.0 for report type dast is unsupported, supported versions for this report type are: #{supported_dast_versions}",
               "root is missing required keys: vulnerabilities"
             ]
           end
@@ -746,5 +773,32 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Validators::SchemaValidator do
         end
       end
     end
+
+    context 'when not given a schema version' do
+      let(:report_type) { :dast }
+      let(:report_version) { nil }
+      let(:report_data) do
+        {
+          'vulnerabilities' => []
+        }
+      end
+
+      it { is_expected.to be_empty }
+
+      context 'when enforce_security_report_validation is disabled' do
+        before do
+          stub_feature_flags(enforce_security_report_validation: false)
+        end
+
+        let(:expected_warnings) do
+          [
+            "root is missing required keys: version",
+            "Report version not provided, dast report type supports versions: #{supported_dast_versions}"
+          ]
+        end
+
+        it { is_expected.to match_array(expected_warnings) }
+      end
+    end
   end
 end
diff --git a/spec/requests/pwa_controller_spec.rb b/spec/requests/pwa_controller_spec.rb
new file mode 100644
index 00000000000..f74f37ea9d0
--- /dev/null
+++ b/spec/requests/pwa_controller_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe PwaController do
+  describe 'GET #offline' do
+    it 'responds with static HTML page' do
+      get offline_path
+
+      expect(response.body).to include('You are currently offline')
+      expect(response).to have_gitlab_http_status(:success)
+    end
+  end
+end
diff --git a/spec/views/shared/notes/_form.html.haml_spec.rb b/spec/views/shared/notes/_form.html.haml_spec.rb
index b7bad4c5d78..ccf1e08b7e7 100644
--- a/spec/views/shared/notes/_form.html.haml_spec.rb
+++ b/spec/views/shared/notes/_form.html.haml_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'shared/notes/_form' do
       let(:note) { build(:"note_on_#{noteable}", project: project) }
 
       it 'says that markdown and quick actions are supported' do
-        expect(rendered).to have_content('Markdown and quick actions are supported')
+        expect(rendered).to have_content('Supports Markdown. For quick actions, type /.')
       end
     end
   end