diff --git a/.eslintrc.js b/.eslintrc.js index 2328397..4927647 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,6 +15,7 @@ module.exports = { }, globals: { angular: false, + beforeEach: false, define: false, describe: false, document: false, diff --git a/karma.conf.js b/karma.conf.js index 13a8708..db9b7f5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,3 +1,4 @@ +const path = require('path'); const settings = require('./settings'); module.exports = (config) => { @@ -6,37 +7,72 @@ module.exports = (config) => { customLaunchers: { SlimChromeHeadless: { base: 'ChromeHeadless', - flags: ['--headless', '--disable-gpu', '--disable-translate', '--disable-extensions'] + flags: [ + '--headless', + '--disable-gpu', + '--disable-translate', + '--disable-extensions' + ] } }, files: [ - { pattern: 'src/*.spec.js', watched: false } + { + pattern: 'src/*.spec.js', + watched: true + }, + { + pattern: 'src/**/*.spec.js', + watched: true + } ], frameworks: ['jasmine'], preprocessors: { - 'src/*.spec.js': ['webpack', 'sourcemap'] + 'src/**/*.spec.{js, jsx}': [ + 'webpack', + 'sourcemap' + ], + 'src/*.spec.{js, jsx}': [ + 'webpack', + 'sourcemap' + ] }, webpack: { devtool: 'source-map', - mode: settings.mode, externals: { jquery: { amd: 'jquery', commonjs: 'jquery', commonjs2: 'jquery', root: '_' - }, + } }, + mode: settings.mode, module: { rules: [ { - test: /\.js$/, exclude: [/node_modules/], - loaders: ['babel-loader'] + loader: 'babel-loader', + options: { + plugins: ['@babel/plugin-transform-async-to-generator'], + presets: ['@babel/preset-react'] + }, + test: /\.(js|jsx)$/ }, - { test: /\.less$/, loader: 'ignore-loader' }, - { test: /\.json$/, loader: 'ignore-loader' } + { + loader: 'ignore-loader', + test: /\.less$/ + } ] + }, + resolve: { + alias: { + 'test-utilities': path.resolve('test/test-utilities') + }, + // extensions: [ + // 'js', + // 'jsx' + // ], + modules: ['node_modules'] } } }); diff --git a/package-lock.json b/package-lock.json index 565fea0..46f78d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1332,6 +1332,17 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, + "array.prototype.flat": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz", + "integrity": "sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.10.0", + "function-bind": "^1.1.1" + } + }, "arraybuffer.slice": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", @@ -1826,6 +1837,12 @@ "multicast-dns-service-types": "^1.1.0" } }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2178,6 +2195,20 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "cheerio": { + "version": "1.0.0-rc.2", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz", + "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=", + "dev": true, + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash": "^4.15.0", + "parse5": "^3.0.1" + } + }, "chokidar": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", @@ -2230,6 +2261,12 @@ "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", "dev": true }, + "circular-json-es6": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/circular-json-es6/-/circular-json-es6-2.0.2.tgz", + "integrity": "sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ==", + "dev": true + }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -2770,6 +2807,30 @@ "source-list-map": "^2.0.0" } }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "dev": true, + "requires": { + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + } + } + }, "css-selector-tokenizer": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", @@ -2815,6 +2876,12 @@ } } }, + "css-what": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz", + "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==", + "dev": true + }, "cssesc": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", @@ -2924,6 +2991,27 @@ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", "dev": true }, + "deep-equal-ident": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz", + "integrity": "sha1-BvS4nlNxDNbOpKd4HHqVZkLejck=", + "dev": true, + "requires": { + "lodash.isequal": "^3.0" + }, + "dependencies": { + "lodash.isequal": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-3.0.4.tgz", + "integrity": "sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q=", + "dev": true, + "requires": { + "lodash._baseisequal": "^3.0.0", + "lodash._bindcallback": "^3.0.0" + } + } + } + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -3142,6 +3230,12 @@ "path-type": "^3.0.0" } }, + "discontinuous-range": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", + "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=", + "dev": true + }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -3479,6 +3573,79 @@ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true }, + "enzyme": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.8.0.tgz", + "integrity": "sha512-bfsWo5nHyZm1O1vnIsbwdfhU989jk+squU9NKvB+Puwo5j6/Wg9pN5CO0YJelm98Dao3NPjkDZk+vvgwpMwYxw==", + "dev": true, + "requires": { + "array.prototype.flat": "^1.2.1", + "cheerio": "^1.0.0-rc.2", + "function.prototype.name": "^1.1.0", + "has": "^1.0.3", + "is-boolean-object": "^1.0.0", + "is-callable": "^1.1.4", + "is-number-object": "^1.0.3", + "is-string": "^1.0.4", + "is-subset": "^0.1.1", + "lodash.escape": "^4.0.1", + "lodash.isequal": "^4.5.0", + "object-inspect": "^1.6.0", + "object-is": "^1.0.1", + "object.assign": "^4.1.0", + "object.entries": "^1.0.4", + "object.values": "^1.0.4", + "raf": "^3.4.0", + "rst-selector-parser": "^2.2.3", + "string.prototype.trim": "^1.1.2" + }, + "dependencies": { + "lodash.escape": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz", + "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=", + "dev": true + } + } + }, + "enzyme-adapter-react-16": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.9.1.tgz", + "integrity": "sha512-Egzogv1y77DUxdnq/CyHxLHaNxmSSKDDSDNNB/EiAXCZVFXdFibaNy2uUuRQ1n24T2m6KH/1Rw16XDRq+1yVEg==", + "dev": true, + "requires": { + "enzyme-adapter-utils": "^1.10.0", + "function.prototype.name": "^1.1.0", + "object.assign": "^4.1.0", + "object.values": "^1.1.0", + "prop-types": "^15.6.2", + "react-is": "^16.7.0", + "react-test-renderer": "^16.0.0-0" + } + }, + "enzyme-adapter-utils": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.10.0.tgz", + "integrity": "sha512-VnIXJDYVTzKGbdW+lgK8MQmYHJquTQZiGzu/AseCZ7eHtOMAj4Rtvk8ZRopodkfPves0EXaHkXBDkVhPa3t0jA==", + "dev": true, + "requires": { + "function.prototype.name": "^1.1.0", + "object.assign": "^4.1.0", + "object.fromentries": "^2.0.0", + "prop-types": "^15.6.2", + "semver": "^5.6.0" + } + }, + "enzyme-matchers": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-7.0.1.tgz", + "integrity": "sha512-1HmUK3frVSt7kim8icdx5LimuQm+DlklBRfy+dSlKd4SRxwlDGEM1LYTxL21/2kUZNl1XVUT5k5mec/D3k5jWw==", + "dev": true, + "requires": { + "circular-json-es6": "^2.0.1", + "deep-equal-ident": "^1.1.1" + } + }, "errno": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", @@ -5007,6 +5174,17 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "function.prototype.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.0.tgz", + "integrity": "sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "is-callable": "^1.1.3" + } + }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", @@ -6073,6 +6251,12 @@ "binary-extensions": "^1.0.0" } }, + "is-boolean-object": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz", + "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=", + "dev": true + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -6225,6 +6409,12 @@ } } }, + "is-number-object": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz", + "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=", + "dev": true + }, "is-obj": { "version": "1.0.1", "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", @@ -6324,6 +6514,18 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, + "is-string": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz", + "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=", + "dev": true + }, + "is-subset": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz", + "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=", + "dev": true + }, "is-supported-regexp-flag": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz", @@ -6431,6 +6633,15 @@ "integrity": "sha512-pa9tbBWgU0EE4SWgc85T4sa886ufuQdsgruQANhECYjwqgV4z7Vw/499aCaP8ZH79JDS4vhm8doDG9HO4+e4sA==", "dev": true }, + "jasmine-enzyme": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/jasmine-enzyme/-/jasmine-enzyme-7.0.1.tgz", + "integrity": "sha512-baCBO74WUy1pA0xow7FYBETvsEHpCekdOCEL8IB/yQzY1ulvxQqTYjRhCX7K4QRfY2jrsdef9DyQ3QmwBbgTnQ==", + "dev": true, + "requires": { + "enzyme-matchers": "^7.0.1" + } + }, "js-base64": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz", @@ -6918,6 +7129,17 @@ "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", "dev": true }, + "lodash._baseisequal": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz", + "integrity": "sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE=", + "dev": true, + "requires": { + "lodash.isarray": "^3.0.0", + "lodash.istypedarray": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "lodash._basetostring": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", @@ -6930,6 +7152,12 @@ "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, + "lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", + "dev": true + }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", @@ -6987,6 +7215,12 @@ "lodash._root": "^3.0.0" } }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -6999,6 +7233,18 @@ "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.istypedarray": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz", + "integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=", + "dev": true + }, "lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", @@ -7010,6 +7256,12 @@ "lodash.isarray": "^3.0.0" } }, + "lodash.merge": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", + "dev": true + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -7483,6 +7735,12 @@ "minimist": "0.0.8" } }, + "moo": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz", + "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==", + "dev": true + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -7572,6 +7830,19 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "nearley": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.16.0.tgz", + "integrity": "sha512-Tr9XD3Vt/EujXbZBv6UAHYoLUSMQAxSsTnm9K3koXzjzNWY195NqALeyrzLZBKzAkL3gl92BcSogqrHjD8QuUg==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "moo": "^0.4.3", + "railroad-diagrams": "^1.0.0", + "randexp": "0.4.6", + "semver": "^5.4.1" + } + }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", @@ -7711,6 +7982,15 @@ "path-key": "^2.0.0" } }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "dev": true, + "requires": { + "boolbase": "~1.0.0" + } + }, "null-check": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", @@ -7784,6 +8064,18 @@ "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", "dev": true }, + "object-inspect": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", + "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==", + "dev": true + }, + "object-is": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz", + "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=", + "dev": true + }, "object-keys": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", @@ -7823,6 +8115,30 @@ "isobject": "^3.0.0" } }, + "object.entries": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz", + "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.12.0", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.fromentries": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz", + "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.11.0", + "function-bind": "^1.1.1", + "has": "^1.0.1" + } + }, "object.getownpropertydescriptors": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", @@ -7883,6 +8199,18 @@ "make-iterator": "^1.0.0" } }, + "object.values": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", + "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.12.0", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -8171,6 +8499,15 @@ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, + "parse5": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", + "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "parseqs": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", @@ -8290,8 +8627,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true, - "optional": true + "dev": true }, "pify": { "version": "3.0.0", @@ -8763,12 +9099,37 @@ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", "dev": true }, + "raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "dev": true, + "requires": { + "performance-now": "^2.1.0" + } + }, + "railroad-diagrams": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz", + "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=", + "dev": true + }, "ramda": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz", "integrity": "sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==", "dev": true }, + "randexp": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz", + "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==", + "dev": true, + "requires": { + "discontinuous-range": "1.0.0", + "ret": "~0.1.10" + } + }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -8858,6 +9219,36 @@ "scheduler": "^0.12.0" } }, + "react-is": { + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz", + "integrity": "sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==", + "dev": true + }, + "react-test-renderer": { + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.1.tgz", + "integrity": "sha512-Bd21TN3+YVl6GZwav6O0T6m5UwGfOj+2+xZH5VH93ToD6M5uclN/c+R1DGX49ueG413KZPUx7Kw3sOYz2aJgfg==", + "dev": true, + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "react-is": "^16.8.1", + "scheduler": "^0.13.1" + }, + "dependencies": { + "scheduler": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.1.tgz", + "integrity": "sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } + } + }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -9359,6 +9750,16 @@ "inherits": "^2.0.1" } }, + "rst-selector-parser": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz", + "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=", + "dev": true, + "requires": { + "lodash.flattendeep": "^4.4.0", + "nearley": "^2.7.10" + } + }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -10222,6 +10623,17 @@ } } }, + "string.prototype.trim": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", + "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.5.0", + "function-bind": "^1.0.2" + } + }, "string_decoder": { "version": "1.1.1", "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", diff --git a/package.json b/package.json index 4584c2b..bb97401 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,8 @@ "copy-webpack-plugin": "4.5.3", "css-loader": "1.0.0", "del": "2.0.2", + "enzyme": "3.8.0", + "enzyme-adapter-react-16": "1.9.1", "eslint": "5.7.0", "eslint-loader": "2.1.1", "eslint-plugin-react": "7.11.1", @@ -32,6 +34,7 @@ "gulp-json-editor": "2.4.3", "gulp-zip": "3.0.2", "jasmine-core": "3.2.1", + "jasmine-enzyme": "7.0.1", "karma": "3.0.0", "karma-chrome-launcher": "2.2.0", "karma-jasmine": "1.1.2", @@ -39,6 +42,7 @@ "karma-webpack": "3.0.5", "less": "3.8.1", "less-loader": "4.1.0", + "lodash.merge": "4.6.1", "style-loader": "0.23.1", "stylelint": "8.4.0", "stylelint-webpack-plugin": "0.10.5", diff --git a/src/haiku.spec.js b/src/haiku.spec.js deleted file mode 100644 index 2939306..0000000 --- a/src/haiku.spec.js +++ /dev/null @@ -1,9 +0,0 @@ -/* https://randomhaiku.com */ - -describe('behind the money', () => { - describe('Canada and Panda work.', () => { - it('Tiger starts blowing.', () => { - expect(true).toBeTruthy(); - }); - }); -}); diff --git a/src/headers-table/index.componentModel.js b/src/headers-table/index.componentModel.js new file mode 100644 index 0000000..b420e0a --- /dev/null +++ b/src/headers-table/index.componentModel.js @@ -0,0 +1,5 @@ +function Model (component) { + this.component = component; +} + +export default Model; diff --git a/src/headers-table/index.spec.js b/src/headers-table/index.spec.js new file mode 100644 index 0000000..dc56b68 --- /dev/null +++ b/src/headers-table/index.spec.js @@ -0,0 +1,37 @@ +import merge from 'lodash.merge'; +import Model from './index.componentModel'; +import Component from './index.jsx'; +import { mountedComponent } from 'test-utilities'; +import sampleState from 'test-utilities/capex-sample-state'; + + +describe('', () => { + const { data, general, styling } = sampleState; + const defaultProps = { + data, + general, + styling + }; + + function setup (otherProps = {}) { + const props = merge(defaultProps, otherProps); + + return mountedComponent(Model, Component, props); + } + + it('should render without exploding when 2 dimensions', () => { + const model = setup(); + expect(model.component).toBeDefined(); + }); + + it('should render without exploding when 1 dimension', () => { + const noSecondDimensionProps = { + data: { + ...defaultProps.data.headers, + dimension2: [] + } + }; + const model = setup(noSecondDimensionProps); + expect(model.component).toBeDefined(); + }); +}); diff --git a/src/paint.jsx b/src/paint.jsx index e2bef20..bd71e23 100644 --- a/src/paint.jsx +++ b/src/paint.jsx @@ -1,9 +1,9 @@ import $ from 'jquery'; import initializeStore from './store'; import React from 'react'; +// import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom'; -import HeadersTable from './headers-table/index.jsx'; -import DataTable from './data-table/index.jsx'; +import Root from './root.jsx'; export default async function paint ($element, layout, component) { const state = await initializeStore({ @@ -13,37 +13,10 @@ export default async function paint ($element, layout, component) { }); const jsx = ( - -
- - -
-
- - -
- + ); ReactDOM.render(jsx, $element[0]); diff --git a/src/root.componentModel.js b/src/root.componentModel.js new file mode 100644 index 0000000..b420e0a --- /dev/null +++ b/src/root.componentModel.js @@ -0,0 +1,5 @@ +function Model (component) { + this.component = component; +} + +export default Model; diff --git a/src/root.jsx b/src/root.jsx new file mode 100644 index 0000000..f4d998d --- /dev/null +++ b/src/root.jsx @@ -0,0 +1,49 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import HeadersTable from './headers-table/index.jsx'; +import DataTable from './data-table/index.jsx'; + +const Root = ({ state, qlik }) => ( + +
+ + +
+
+ + +
+ +); + +Root.propTypes = { + qlik: PropTypes.shape({}).isRequired, + state: PropTypes.shape({ + data: PropTypes.object.isRequired, + general: PropTypes.object.isRequired, + styling: PropTypes.object.isRequired + }).isRequired +}; + +export default Root; diff --git a/src/root.spec.js b/src/root.spec.js new file mode 100644 index 0000000..90f8c02 --- /dev/null +++ b/src/root.spec.js @@ -0,0 +1,21 @@ +import merge from 'lodash.merge'; +import Model from './root.componentModel'; +import Component from './root.jsx'; +import { mountedComponent } from 'test-utilities'; +import sampleState from 'test-utilities/capex-sample-state'; + +describe('', () => { + const state = sampleState; + const defaultProps = { state }; + + function setup (otherProps = {}) { + const props = merge(defaultProps, otherProps); + + return mountedComponent(Model, Component, props); + } + + it('should render without exploding', () => { + const model = setup(); + expect(model.component).toBeDefined(); + }); +}); diff --git a/test/test-utilities/capex-sample-state.js b/test/test-utilities/capex-sample-state.js new file mode 100644 index 0000000..c7c83d7 --- /dev/null +++ b/test/test-utilities/capex-sample-state.js @@ -0,0 +1,5 @@ +/* eslint-disable */ +const sample = JSON.parse(`{"properties":{"ConceptMatrixColElem":[0],"ConceptMatrixColElemTable":[0,0,0,0,0],"ConceptMatrixRowElem":[5]},"data":{"headers":{"dimension1":[{"displayValue":"Direct materials","name":"Account Desc","value":"NaN"}],"dimension2":[{"displayValue":"France","name":"Country","value":"NaN"}],"measurements":[{"format":"#.##0,00m","magnitudeLabelSuffix":" (m)","name":"Balance"},{"format":"#.##0,00k","magnitudeLabelSuffix":" (k)","name":"Bal. LY"},{"format":"#.##0","magnitudeLabelSuffix":"","name":"Dif"},{"format":"0,0%","magnitudeLabelSuffix":"","name":"% Var"}]},"matrix":[[{"displayValue":"-6.320.000,00m","elementNumber":0,"format":"#.##0,00m","magnitude":"m","magnitudeLabelSuffix":" (m)","name":"Balance","value":-6320000},{"displayValue":"-6.636.000,00k","elementNumber":0,"format":"#.##0,00k","magnitude":"k","magnitudeLabelSuffix":" (k)","name":"Bal. LY","value":-6636000},{"displayValue":"316.000","elementNumber":0,"format":"#.##0","magnitude":"","magnitudeLabelSuffix":"","name":"Dif","value":316000},{"displayValue":"-4,8%","elementNumber":0,"format":"0,0%","magnitude":"","magnitudeLabelSuffix":"","name":"% Var","value":-0.04761904761904767}]],"meta":{"dimensionCount":2}},"general":{"allowExcelExport":true,"cellSuffix":"","errorMessage":"Ups! It seems you asked for too many data. Please filter more to see the whole picture.","maxLoops":2},"selection":{"dimensionSelectionCounts":[1,1]},"styling":{"colors":{"vColLibBlue":"#4575b4","vColLibBlueP":"#b3d9ff","vColLibClean":"#ffffff","vColLibCleanP":"#ffffff","vColLibCustom":"#ffcccc","vColLibCustomP":"#ffffff","vColLibDark":"#c4c4c4","vColLibDarkP":"#efefef","vColLibGreen":"#7bb51c","vColLibGreenP":"#98fb98","vColLibNight":"#808080","vColLibNightP":"#c4c4c4","vColLibOrange":"#fd6600","vColLibOrangeP":"#ffcc66","vColLibRed":"#d58b94","vColLibRedP":"#ffcccc","vColLibSoft":"#efefef","vColLibSoftP":"#ffffff","vColLibViolete":"#ccc0ff","vColLibVioleteP":"#e6e6ff"},"customCSV":{"basic":["Accounts","Revenues","Net sales revenues","Cost of goods sold","Manufacturing overhead","Net mfr overhead","Net costs of goods sold","Gross profit","Operating expenses","Total selling expenses","General & administrative expenses","Other general & admin expenses","total general & admin expenses","total operating expenses","Operating income before taxes","Financial revenue & expenses","Income before tax & extraordinary items","Extraordinary items","Net gain on sale of land","Extraordinary items after tax","Net Income (Profit)"],"count":8,"full":[["Accounts","Bold","Background","FontStyle","LetterColor","Align","Size","Comment"],["Revenues","","","","","
","",""],["Net sales revenues","","rgb(128, 191, 255)","","","","",""],["Cost of goods sold","","rgb(128, 191, 255)","","","","",""],["Manufacturing overhead","","","","","
","",""],["Net mfr overhead","","rgb(128, 191, 255)","","","","",""],["Net costs of goods sold","","rgb(128, 191, 255)","","","","",""],["Gross profit","","rgb(0, 102, 204)","","","
","",""],["Operating expenses","","","","","","",""],["Total selling expenses","","rgb(128, 191, 255)","","","","",""],["General & administrative expenses","","","","","
","",""],["Other general & admin expenses","","rgb(128, 191, 255)","","","
","",""],["total general & admin expenses","","","","","","",""],["total operating expenses","","rgb(128, 191, 255)","","","","",""],["Operating income before taxes","","rgb(0, 102, 204)","","","","",""],["Financial revenue & expenses","","","","","
","",""],["Income before tax & extraordinary items","","rgb(0, 102, 204)","","","","",""],["Extraordinary items","","","","","
","",""],["Net gain on sale of land","","rgb(0, 102, 204)","","","
","",""],["Extraordinary items after tax","","rgb(0, 102, 204)","","","
","",""],["Net Income (Profit)","","","","","
","",""]]},"hasCustomFileStyle":true,"headerOptions":{"alignment":"center","colorSchema":"#4575b4","fontSizeAdjustment":-2,"textColor":"WhiteSmoke"},"options":{"backgroundColor":"#efefef","color":"Black","fontFamily":"Calibri","fontSizeAdjustment":0},"semaphoreColors":{"fieldsToApplyTo":{"applyToAll":false,"specificFields":["Gross sales revenues","Direct materials","","","","","","",""]},"status":{},"statusColors":{"critical":{},"medium":{},"normal":{}}},"symbolForNulls":"0","usePadding":true,"useSeparatorColumns":true}}`); +/* eslint-enable */ + +export default sample; diff --git a/test/test-utilities/enzyme-setup.js b/test/test-utilities/enzyme-setup.js new file mode 100644 index 0000000..940cb34 --- /dev/null +++ b/test/test-utilities/enzyme-setup.js @@ -0,0 +1,10 @@ +import Enzyme from 'enzyme'; +import Adapter from 'enzyme-adapter-react-16'; +import jasmineEnzyme from 'jasmine-enzyme'; +Enzyme.configure({ adapter: new Adapter() }); + +beforeEach(() => { + jasmineEnzyme(); +}); + +export * from 'enzyme'; diff --git a/test/test-utilities/index.js b/test/test-utilities/index.js new file mode 100644 index 0000000..393ffb2 --- /dev/null +++ b/test/test-utilities/index.js @@ -0,0 +1,9 @@ +import React from 'react'; +import { mount } from 'test-utilities/enzyme-setup'; + +export function mountedComponent (Model, Component, props = {}) { + const component = mount(( + + )).find(Component); + return new Model(component); +}