add mocha to & run integration tests by default in ci

.travis.yml

@@ -2,13 +2,15 @@ sudo: false
 language: node_js
 
 node_js:
-  - "4"
   - "6"
+  - "lts/*"
   - "node"
 
 cache:
   directories:
     - node_modules
     - $HOME/.npm
 
+script: "npm run test-ci"
+
 after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"

test/integration/dt2js_integration.test.js

@@ -0,0 +1,83 @@
+'use strict'
+/* global describe, it, context */
+
+/**
+ * Integration testing module (dt2js).
+ * Runs dt2js script for each file from EXAMPLES_FOLDER and
+ * performs validation of output JSON.
+ *
+ * Errors are output to console in a form:
+ *  FAIL (type of fail):
+ *  - Error message [optional line.column range]
+ *
+ * If test passes it will just log 'OK'.
+ *
+ * Tests are launched by running this file with nodejs.
+ */
+
+const helpers = require('./helpers')
+const path = require('path')
+const rewire = require('rewire')
+const Ajv = require('ajv')
+const fs = require('fs')
+
+const dt2js = rewire('../../src/dt2js')
+const getRAMLContext = dt2js.__get__('getRAMLContext')
+
+const EXAMPLES_FOLDER = path.join(__dirname, 'raml')
+
+const ajv = new Ajv({ allErrors: true, schemaId: 'id' })
+ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'))
+
+/**
+ * Log JSON validation errors.
+ */
+function logValidationError () {
+  const sep = '||'
+  const errorsText = ajv.errorsText(ajv.errors, {'separator': sep})
+  const errors = errorsText.split(sep)
+  console.log('FAIL (JSON validation):')
+  errors.forEach(function (el) {
+    console.log('-', el)
+  })
+}
+
+// FIXME: commented out line in complex_homeanimal.raml
+
+describe('dt2js integration test', () => {
+  helpers.forEachFileIn(EXAMPLES_FOLDER, (filepath) => {
+    /**
+     * Test file by running js2dt script on it and then validating
+     * with raml-1-parser.
+     */
+    context(`for file ${filepath}`, () => {
+      const ramlData = fs.readFileSync(filepath).toString()
+      dt2js.setBasePath(__dirname)
+      const ctx = getRAMLContext(ramlData, __dirname)
+      for (const typeName in ctx) {
+        it(`should convert ${typeName}`, () => {
+          const schema = dt2js.dt2js(ramlData, typeName)
+          const valid = ajv.validateSchema(schema)
+          if (!valid) {
+            logValidationError()
+            throw new Error('Invalid json')
+          }
+          // dt2js.dt2js(ramlData, typeName, function (err, schema) {
+          //   if (err) return done(err)
+          //
+          //   try {
+          //     const valid = ajv.validateSchema(schema)
+          //     if (!valid) {
+          //       logValidationError()
+          //       return done(new Error('Invalid json'))
+          //     }
+          //   } catch (error) {
+          //     return done(error)
+          //   }
+          //   done()
+          // })
+        })
+      }
+    })
+  })
+})

test/integration/helpers.js

@@ -1,6 +1,7 @@
 'use strict'
 
-var fs = require('fs')
+const fs = require('fs')
+const path = require('path')
 
 /**
  * List files in folder.
@@ -10,15 +11,13 @@ var fs = require('fs')
  * @param  {Array} fileList
  * @returns  {Array}
  */
-function getFiles (dir, fileList) {
-  fileList = fileList || []
-
-  var files = fs.readdirSync(dir)
-  for (var i in files) {
+function getFiles (dir, fileList = []) {
+  const files = fs.readdirSync(dir)
+  for (const i in files) {
     if (!files.hasOwnProperty(i)) {
       continue
     }
-    var name = dir + '/' + files[i]
+    const name = path.join(dir, files[i])
     if (fs.statSync(name).isDirectory()) {
       getFiles(name, fileList)
     } else {

test/integration/js2dt_integration.test.js

@@ -0,0 +1,62 @@
+'use strict'
+/* global describe, it */
+
+/**
+ * Integration testing module (js2dt).
+ * Runs js2dt script for each file from EXAMPLES_FOLDER and
+ * performs validation of output RAML.
+ *
+ * Errors are output to console in a form:
+ *  FAIL (type of fail):
+ *  - Error message [optional line.column range]
+ *
+ * If test passes it will just log 'OK'.
+ *
+ * Tests are launched by running this file with nodejs.
+ */
+
+const { js2dt } = require('../../src/js2dt')
+const helpers = require('./helpers')
+const path = require('path')
+const parser = require('raml-1-parser')
+const fs = require('fs')
+
+const EXAMPLES_FOLDER = path.join(__dirname, 'json')
+
+/**
+ * Log RAML validation error.
+ */
+function logValidationError (error) {
+  console.log('FAIL (RAML validation):')
+  error.parserErrors.forEach(function (el) {
+    const errMessage = '- ' + el.message + ' [' +
+      el.range.start.line + '.' + el.range.start.column + ':' +
+      el.range.end.line + '.' + el.range.end.column + ']'
+    console.log(errMessage)
+  })
+}
+
+describe('js2dt integration test', () => {
+  helpers.forEachFileIn(EXAMPLES_FOLDER, (filepath) => {
+    /**
+     * Test file by running js2dt script on it and then validating
+     * with raml-1-parser.
+     */
+    it(`should convert ${filepath}`, () => {
+      const jsonData = fs.readFileSync(filepath).toString()
+      const typeName = 'TestType'
+
+      let raml = js2dt(jsonData, typeName)
+
+      console.log(raml)
+
+      try {
+        raml = '#%RAML 1.0 Library\n' + raml
+        parser.parseRAMLSync(raml, {'rejectOnErrors': true})
+      } catch (error) {
+        logValidationError(error)
+        throw error
+      }
+    })
+  })
+})

test/integration/json/complex_cat.json

@@ -79,9 +79,6 @@
       "default": "regular cat",
       "type": "string",
       "amazing": true,
-      "facets": {
-        "amazing": "boolean"
-      },
       "example": "fluffy",
       "xml": {
         "attribute": false,

test/integration/raml/complex_homeanimal.raml

@@ -15,4 +15,4 @@ types:
     properties:
       name: string
       fangs: string
-  HomeAnimal: [ HasHome ,  Dog | Cat ]
+#  HomeAnimal: [ HasHome ,  Dog | Cat ]