Merge pull request #74 from remarkablemark/refactor-test

Refactor tests to use ES6 syntax

Author: remarkablemark

.eslintrc

@@ -1,11 +1,14 @@
 {
   "env": {
-    "node": true,
     "browser": true,
+    "commonjs": true,
     "mocha": true,
-    "commonjs": true
+    "node": true
   },
   "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": 6
+  },
   "plugins": ["prettier"],
   "rules": {
     "prettier/prettier": "error"

test/attributes-to-props.js

@@ -1,20 +1,9 @@
-'use strict';
+const assert = require('assert');
+const attributesToProps = require('../lib/attributes-to-props');
 
-/**
- * Module dependencies.
- */
-var assert = require('assert');
-var attributesToProps = require('../lib/attributes-to-props');
-
-/**
- * Tests for attributes to props helper.
- */
-describe('attributes to props helper', function() {
-  /**
-   * HTML DOM property to React prop.
-   */
-  describe('HTML DOM', function() {
-    it('converts attributes to React props', function() {
+describe('attributesToProps', () => {
+  describe('HTML DOM', () => {
+    it('converts attributes to React props', () => {
       assert.deepEqual(
         attributesToProps({
           class: 'ic',
@@ -29,7 +18,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('converts standard properties to React props', function() {
+    it('converts standard properties to React props', () => {
       assert.deepEqual(
         attributesToProps({
           allowfullscreen: true,
@@ -44,7 +33,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('converts RDFa properties to React props', function() {
+    it('converts RDFa properties to React props', () => {
       assert.deepEqual(
         attributesToProps({
           property: 'foo',
@@ -57,7 +46,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('converts non-standard properties to React props', function() {
+    it('converts non-standard properties to React props', () => {
       assert.deepEqual(
         attributesToProps({
           itemscope: true,
@@ -70,7 +59,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('keeps `data-` and `aria-` attributes as is', function() {
+    it('keeps `data-` and `aria-` attributes as is', () => {
       assert.deepEqual(
         attributesToProps({
           'data-foo': 'bar',
@@ -83,7 +72,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('converts properties with weird capitalization', function() {
+    it('converts properties with weird capitalization', () => {
       assert.deepEqual(
         attributesToProps({
           'ACCEPT-CHARSET': 'ISO-8859-1',
@@ -100,7 +89,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('converts bool properties', function() {
+    it('converts bool properties', () => {
       assert.deepEqual(
         attributesToProps({
           readonly: ''
@@ -121,11 +110,8 @@ describe('attributes to props helper', function() {
     });
   });
 
-  /**
-   * SVG DOM property to React prop.
-   */
-  describe('SVG DOM properties', function() {
-    it('converts attributes/properties to React props', function() {
+  describe('SVG DOM properties', () => {
+    it('converts attributes/properties to React props', () => {
       assert.deepEqual(
         attributesToProps({
           edgeMode: 'edgeMode',
@@ -148,7 +134,7 @@ describe('attributes to props helper', function() {
       );
     });
 
-    it('does not convert incorrectly capitalized properties', function() {
+    it('does not convert incorrectly capitalized properties', () => {
       assert.deepEqual(
         attributesToProps({
           'XLINK:HREF': '#',
@@ -157,20 +143,17 @@ describe('attributes to props helper', function() {
         }),
         {
           /*
-                    xlinkHref: '#',
-                    yChannelSelector: 'G',
-                    zoomAndPan: 'disable'
-                    */
+          xlinkHref: '#',
+          yChannelSelector: 'G',
+          zoomAndPan: 'disable'
+          */
         }
       );
     });
   });
 
-  /**
-   * Style string to object.
-   */
-  describe('style', function() {
-    it('converts CSS style string to JS style object', function() {
+  describe('style', () => {
+    it('converts CSS style string to JS style object', () => {
       // proper css
       assert.deepEqual(
         attributesToProps({

test/benchmark.js

@@ -1,23 +1,20 @@
-'use strict';
+const Benchmark = require('benchmark');
+const { data } = require('./helpers/');
+const Parser = require('../');
 
-var Benchmark = require('benchmark');
-var helpers = require('./helpers/');
-var Parser = require('../');
-
-var suite = new Benchmark.Suite();
-var mocks = helpers.mocks;
+const suite = new Benchmark.Suite();
 
 suite
-  .add('html-to-react - Single', function() {
-    Parser(mocks.html.single);
+  .add('html-to-react - Single', () => {
+    Parser(data.html.single);
   })
-  .add('html-to-react - Multiple', function() {
-    Parser(mocks.html.multiple);
+  .add('html-to-react - Multiple', () => {
+    Parser(data.html.multiple);
   })
-  .add('html-to-react - Complex', function() {
-    Parser(mocks.html.complex);
+  .add('html-to-react - Complex', () => {
+    Parser(data.html.complex);
   })
-  .on('cycle', function(event) {
+  .on('cycle', event => {
     process.stdout.write(String(event.target) + '\n');
   })
   .run({

test/dom-to-react.js

@@ -1,33 +1,23 @@
-'use strict';
-
-/**
- * Module dependencies.
- */
-var assert = require('assert');
-var React = require('react');
-var htmlToDOM = require('html-dom-parser');
-var domToReact = require('../lib/dom-to-react');
-var helpers = require('./helpers/');
-var mocks = helpers.mocks;
-var render = helpers.render;
-
-/**
- * Tests for `domToReact`.
- */
-describe('dom-to-react parser', function() {
-  it('converts single DOM node to React', function() {
-    var html = mocks.html.single;
-    var reactElement = domToReact(htmlToDOM(html));
+const assert = require('assert');
+const React = require('react');
+const htmlToDOM = require('html-dom-parser');
+const domToReact = require('../lib/dom-to-react');
+const { data, render } = require('./helpers/');
+
+describe('dom-to-react parser', () => {
+  it('converts single DOM node to React', () => {
+    const html = data.html.single;
+    const reactElement = domToReact(htmlToDOM(html));
 
     assert(React.isValidElement(reactElement));
     assert.deepEqual(reactElement, React.createElement('p', {}, 'foo'));
   });
 
-  it('converts multiple DOM nodes to React', function() {
-    var html = mocks.html.multiple;
-    var reactElements = domToReact(htmlToDOM(html));
+  it('converts multiple DOM nodes to React', () => {
+    const html = data.html.multiple;
+    const reactElements = domToReact(htmlToDOM(html));
 
-    reactElements.forEach(function(reactElement) {
+    reactElements.forEach(reactElement => {
       assert(React.isValidElement(reactElement));
       assert(reactElement.key);
     });
@@ -39,9 +29,9 @@ describe('dom-to-react parser', function() {
   });
 
   // https://facebook.github.io/react/docs/forms.html#why-textarea-value
-  it('converts <textarea> correctly', function() {
-    var html = mocks.html.textarea;
-    var reactElement = domToReact(htmlToDOM(html));
+  it('converts <textarea> correctly', () => {
+    const html = data.html.textarea;
+    const reactElement = domToReact(htmlToDOM(html));
 
     assert(React.isValidElement(reactElement));
     assert.deepEqual(
@@ -56,9 +46,9 @@ describe('dom-to-react parser', function() {
     );
   });
 
-  it('does not escape <script> content', function() {
-    var html = mocks.html.script;
-    var reactElement = domToReact(htmlToDOM(html));
+  it('does not escape <script> content', () => {
+    const html = data.html.script;
+    const reactElement = domToReact(htmlToDOM(html));
 
     assert(React.isValidElement(reactElement));
     assert.deepEqual(
@@ -75,9 +65,9 @@ describe('dom-to-react parser', function() {
     );
   });
 
-  it('does not escape <style> content', function() {
-    var html = mocks.html.style;
-    var reactElement = domToReact(htmlToDOM(html));
+  it('does not escape <style> content', () => {
+    const html = data.html.style;
+    const reactElement = domToReact(htmlToDOM(html));
 
     assert(React.isValidElement(reactElement));
     assert.deepEqual(
@@ -94,30 +84,30 @@ describe('dom-to-react parser', function() {
     );
   });
 
-  it('does not have `children` for void elements', function() {
-    var html = mocks.html.img;
-    var reactElement = domToReact(htmlToDOM(html));
+  it('does not have `children` for void elements', () => {
+    const html = data.html.img;
+    const reactElement = domToReact(htmlToDOM(html));
     assert(!reactElement.props.children);
   });
 
-  it('does not throw an error for void elements', function() {
-    var html = mocks.html.void;
-    var reactElements = domToReact(htmlToDOM(html));
-    assert.doesNotThrow(function() {
+  it('does not throw an error for void elements', () => {
+    const html = data.html.void;
+    const reactElements = domToReact(htmlToDOM(html));
+    assert.doesNotThrow(() => {
       render(React.createElement('div', {}, reactElements));
     });
   });
 
-  it('skips doctype and comments', function() {
-    var html = [
-      mocks.html.doctype,
-      mocks.html.single,
-      mocks.html.comment,
-      mocks.html.single
+  it('skips doctype and comments', () => {
+    const html = [
+      data.html.doctype,
+      data.html.single,
+      data.html.comment,
+      data.html.single
     ].join('');
 
-    var reactElements = domToReact(htmlToDOM(html));
-    reactElements.forEach(function(reactElement) {
+    const reactElements = domToReact(htmlToDOM(html));
+    reactElements.forEach(reactElement => {
       assert(React.isValidElement(reactElement));
       assert(reactElement.key);
     });
@@ -130,9 +120,9 @@ describe('dom-to-react parser', function() {
     ]);
   });
 
-  it("handles svg's with a viewBox", function() {
-    var html = mocks.svg.simple;
-    var reactElement = domToReact(
+  it("handles svg's with a viewBox", () => {
+    const html = data.svg.simple;
+    const reactElement = domToReact(
       htmlToDOM(html, { lowerCaseAttributeNames: false })
     );
 

test/helpers/mocks.json renamed to test/helpers/data.json

@@ -1,28 +1,21 @@
-'use strict';
+const { isValidElement } = require('react');
+const { renderToStaticMarkup } = require('react-dom/server');
+const data = require('./data');
 
 /**
- * Module dependencies.
- */
-var React = require('react');
-var ReactDOMServer = require('react-dom/server');
-
-/**
- * Render a React element to static HTML markup.
+ * Renders a React element to static HTML markup.
  *
  * @param  {ReactElement} reactElement - The React element.
  * @return {String}                    - The static HTML markup.
  */
-function render(reactElement) {
-  if (!React.isValidElement(reactElement)) {
+const render = reactElement => {
+  if (!isValidElement(reactElement)) {
     throw new Error(reactElement, 'is not a valid React element.');
   }
-  return ReactDOMServer.renderToStaticMarkup(reactElement);
-}
+  return renderToStaticMarkup(reactElement);
+};
 
-/**
- * Export assert helpers.
- */
 module.exports = {
-  render: render,
-  mocks: require('./mocks')
+  render,
+  data
 };