Improve compatibility with REST YAML test format

Author: JoshMock

test/integration/index.js

@@ -51,7 +51,7 @@ const getAllFiles = dir => {
       const name = join(dir, file)
       if (statSync(name).isDirectory()) {
         return [...files, ...getAllFiles(name)]
-      } else if (!name.endsWith('.yaml') && !name.endsWith('.yml')) {
+      } else if (!name.includes(`${sep}tests${sep}`) && (!name.endsWith('.yaml') || !name.endsWith('.yml'))) {
         return files
       } else {
         return [...files, name]
@@ -91,7 +91,7 @@ async function start ({ client }) {
   }
   const folders = getAllFiles(yamlFolder)
     .reduce((arr, file) => {
-      const path = file.slice(file.indexOf('/tests'), file.lastIndexOf('/'))
+      const path = file.slice(file.lastIndexOf(`${sep}tests`), file.lastIndexOf(sep))
       let inserted = false
       for (let i = 0; i < arr.length; i++) {
         if (arr[i][0].includes(path)) {
@@ -107,7 +107,7 @@ async function start ({ client }) {
   const totalTime = now()
   for (const folder of folders) {
     // pretty name
-    const apiName = folder[0].split(`${sep}tests${sep}`)[1]
+    const apiName = folder[0].split(`${sep}tests${sep}`)[1].split(sep)[0]
 
     log('Testing ' + apiName)
     const apiTime = now()

test/integration/test-runner.js

@@ -420,10 +420,10 @@ function build (opts = {}) {
         const key = Object.keys(action.match)[0]
         match(
           // in some cases, the yaml refers to the body with an empty string
-          key === '$body' || key === ''
+          key.split('.')[0] === '$body' || key === ''
             ? response
             : delve(response, fillStashedValues(key)),
-          key === '$body'
+          key.split('.')[0] === '$body'
             ? action.match[key]
             : fillStashedValues(action.match)[key],
           action.match
@@ -544,6 +544,8 @@ function match (val1, val2, action) {
     // 'm' adds the support for multiline regex
     assert.match(val1, new RegExp(regStr, 'm'), `should match pattern provided: ${val2}, but got: ${val1}`)
   // everything else
+  } else if (typeof val1 === 'string' && typeof val2 === 'string') {
+    assert.include(val1, val2, `should match pattern provided: ${val2}, but got: ${val1}`)
   } else {
     assert.equal(val1, val2, `should be equal: ${val1} - ${val2}, action: ${JSON.stringify(action)}`)
   }
@@ -640,6 +642,10 @@ function length (val, len) {
  */
 function parseDo (action) {
   action = JSON.parse(JSON.stringify(action))
+
+  if (typeof action === 'string') action = {[action]: {}}
+  if (Array.isArray(action)) action = action[0]
+
   return Object.keys(action).reduce((acc, val) => {
     switch (val) {
       case 'catch':