test

__tests__/functions/json-validator.test.js

@@ -241,6 +241,8 @@ test('successfully validates a yaml file with a schema when yaml_as_json is true
 
 test('successfully validates a json file and skips over the yaml one in the json processor', async () => {
   process.env.INPUT_YAML_AS_JSON = 'false'
+  process.env.INPUT_BASE_DIR = '.'
+  process.env.INPUT_JSON_SCHEMA = ''
   process.env.INPUT_FILES = `
   __tests__/fixtures/json/with_yaml/**/test1.yml,
   __tests__/fixtures/json/with_yaml/**/test*.json

src/functions/json-validator.js

@@ -139,28 +139,31 @@ export async function jsonValidator(exclude) {
       continue
     }
 
+    // if the file is a yaml file but it should not be treated as json
+    // skipped++ does not need to be called here as the file should be validated later...
+    // ...on as yaml with the yaml-validator
+    if (
+      yamlAsJson === false &&
+      (fullPath.endsWith(yamlExtension) ||
+        fullPath.endsWith(yamlExtensionShort))
+    ) {
+      core.debug(
+        `the json-validator found a yaml file so it will be skipped here: '${fullPath}'`
+      )
+      continue
+    }
+
     var data
     try {
       // if the file is a yaml file but being treated as json and yamlAsJson is true
       if (
-        yamlAsJson &&
+        yamlAsJson === true &&
         (fullPath.endsWith(yamlExtension) ||
           fullPath.endsWith(yamlExtensionShort))
       ) {
         core.debug(`attempting to process yaml file: '${fullPath}' as json`)
         data = parse(readFileSync(fullPath, 'utf8'))
 
-        // if the file is a yaml file but it should not be treated as json
-        // } else if (
-        //   yamlAsJson === false &&
-        //   (fullPath.endsWith(yamlExtension) ||
-        //     fullPath.endsWith(yamlExtensionShort))
-        // ) {
-        //   core.debug(
-        //     `the json-validator found a yaml file so it will be skipped here: '${fullPath}'`
-        //   )
-        //   continue
-
         // if the file is a json file
       } else {
         data = JSON.parse(readFileSync(fullPath, 'utf8'))