updated: prepare the tests setup

Author: GianlucaGuarini

Makefile

@@ -20,7 +20,7 @@ clean:
 
 test:
 	@ make build
-	@ $(ISTANBUL) cover $(MOCHA) -- test/index.js
+	@ $(ISTANBUL) cover $(MOCHA) -- test/*.specs.js
 
 lint:
 	@ $(ESLINT) src test

src/index.js

@@ -21,14 +21,14 @@ const parsers = {
 
 /**
  * Create the sourcemap instance
- * @param   { String } source - source file
- * @param   { String } code - original code
- * @param   { String } generated - generated file
+ * @param   { String } input - input file
+ * @param   { String } output - generated file
+ * @param   { String } source - original code
  * @returns { SourceMapGenerator } a SourceMapGenerator instance
  */
-export function sourcemap(source, code, generated) {
-  const map = new SourceMapGenerator({ file: generated })
-  map.setSourceContent(source, code)
+export function sourcemap(input, output, source) {
+  const map = new SourceMapGenerator({ file: output })
+  map.setSourceContent(input, source)
   return map
 }
 
@@ -69,7 +69,7 @@ export function preparse(preparser, source) {
  * @param   { SourceMapGenerator } map - SourceMapGenerator instance
  * @returns { Object } output - result generated by the compiler
  * @returns { String } output.code - component code
- * @returns {  } output.code - component code
+ * @returns { SourceMapGenerator } output.map - SourceMapGenerator instance
  */
 export function generate(name, {template, javascript, css}, map) {
   return {
@@ -141,7 +141,7 @@ export function compile(source, options = {}) {
     .then(({ code }) => {
       const parser = tagParser({ brackets: ['{', '}'] })
       const { output } = parser.parse(code)
-      const map = options.src && options.dist ? sourcemap(options.src, code, options.dist) : ''
+      const map = options.input && options.output ? sourcemap(options.input, code, options.output) : ''
       return generate(output.html.name, output, map)
     })
 }

test/api.specs.js

@@ -0,0 +1,13 @@
+const { normalise } = require('../dist')
+const { expect } = require('chai')
+const { getFixture } = require('./helpers')
+
+describe('Riot compiler - API specs', () => {
+  describe('compiler.normalise', () => {
+    it('Leave the code untouched if no extra preparser are defined', () => {
+      return normalise(getFixture('my-component')).then(res => {
+        expect(res.code).to.be.equal(getFixture('my-component'))
+      })
+    })
+  })
+})

test/index.js renamed to test/core.specs.js

@@ -1,18 +1,8 @@
 const { compile } = require('../dist')
 const { expect } = require('chai')
-const sh = require('shelljs')
-const FIXTURES_DIR = './test/fixtures/'
-const EXPECTED_DIR = './test/expected/'
+const { getFixture, getExpected } = require('./helpers')
 
-function getFixture(name) {
-  return String(sh.cat(`${FIXTURES_DIR}${name}.tag`))
-}
-
-function getExpected(name) {
-  return String(sh.cat(`${EXPECTED_DIR}${name}.js`))
-}
-
-describe('Riot compiler', () => {
+describe('Riot compiler - Core specs', () => {
   describe('Simple tags', () => {
     it('It can compile a simple template properly', () => {
       return compile(getFixture('my-component')).then(res => {

test/helpers.js

@@ -0,0 +1,12 @@
+const sh = require('shelljs')
+const FIXTURES_DIR = './test/fixtures/'
+const EXPECTED_DIR = './test/expected/'
+
+module.exports = {
+  getFixture(name) {
+    return String(sh.cat(`${FIXTURES_DIR}${name}.tag`))
+  },
+  getExpected(name) {
+    return String(sh.cat(`${EXPECTED_DIR}${name}.js`))
+  }
+}