update tests

GrantBirki · Dec 29, 2023 · ebb8d2b · ebb8d2b
1 parent fc0274e
commit ebb8d2b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 19 deletions.
diff --git a/__tests__/fixtures/json/with_yaml/first/test1.json b/__tests__/fixtures/json/with_yaml/first/test1.json
@@ -0,0 +1,4 @@
+{
+    "foo": 1,
+    "bar": "abc"
+}
diff --git a/__tests__/fixtures/json/with_yaml/first/test1.yml b/__tests__/fixtures/json/with_yaml/first/test1.yml
@@ -0,0 +1 @@
+key: value
diff --git a/__tests__/fixtures/json/with_yaml/second/test2.json b/__tests__/fixtures/json/with_yaml/second/test2.json
@@ -0,0 +1,4 @@
+{
+    "foo": 1,
+    "bar": "abc"
+}
diff --git a/__tests__/fixtures/json/with_yaml/second/test2.yml b/__tests__/fixtures/json/with_yaml/second/test2.yml
@@ -0,0 +1 @@
+key: value
diff --git a/__tests__/functions/json-validator.test.js b/__tests__/functions/json-validator.test.js
@@ -239,6 +239,22 @@ 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_FILES = `
+  __tests__/fixtures/json/with_yaml/**/test1.yml,
+  __tests__/fixtures/json/with_yaml/**/test*.json
+`
+
+  expect(await jsonValidator(excludeMock)).toStrictEqual({
+    failed: 0,
+    passed: 2,
+    skipped: 0,
+    success: true,
+    violations: []
+  })
+})
+
 test('processes multiple files when yaml_as_json is true and also a mixture of other json files with yaml are present', async () => {
   process.env.INPUT_YAML_AS_JSON = 'true'
   process.env.INPUT_JSON_SCHEMA = ''

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/functions/json-validator.js b/src/functions/json-validator.js
@@ -151,15 +151,15 @@ export async function jsonValidator(exclude) {
         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
+        // } 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 {