From 01a7af965c0027d3c60cf0897b565cee59031ccf Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 3 Jun 2020 17:28:57 +0200 Subject: [PATCH] refactoring of es6 test skeleton --- package-lock.json | 78 ------------------- spec-es6/attribute_parser.spec.js | 10 +++ ...attribute_parser.spec.mjs => mini_test.js} | 28 +++---- ...tribute_parser.mjs => attribute_parser.js} | 0 4 files changed, 21 insertions(+), 95 deletions(-) create mode 100644 spec-es6/attribute_parser.spec.js rename spec-es6/{attribute_parser.spec.mjs => mini_test.js} (56%) rename src/public/app/services/{attribute_parser.mjs => attribute_parser.js} (100%) diff --git a/package-lock.json b/package-lock.json index e7042bfa0..4a9d5e0ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6372,63 +6372,6 @@ } } }, - "jasmine-console-reporter": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jasmine-console-reporter/-/jasmine-console-reporter-3.1.0.tgz", - "integrity": "sha512-fNP6XlgkIyNvfr6JVMJudZL9qWNY2K7l934Ojj4k8J09/QXf4xYf2Mc7MUgcsDhqIb2zTkLd2LsBJWFvJz41/w==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "chalk": "^2.4.1", - "ci-info": "^1.4.0", - "node-emoji": "^1.8.1", - "ora": "^3.0.0", - "perfy": "^1.1.5" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "jasmine-core": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz", @@ -7012,12 +6955,6 @@ "lodash.escape": "^3.0.0" } }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", - "dev": true - }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", @@ -8089,15 +8026,6 @@ } } }, - "node-emoji": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", - "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", - "dev": true, - "requires": { - "lodash.toarray": "^4.4.0" - } - }, "node-gyp": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz", @@ -8857,12 +8785,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "perfy": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/perfy/-/perfy-1.1.5.tgz", - "integrity": "sha512-/ieVBpMaPTJf83YTUl2TImsSwMEJ23qGP2w27pE6aX+NrB/ZRGqOnQZpl7J719yFwd+ebDiHguPNFeMSamyK7w==", - "dev": true - }, "phin": { "version": "2.9.3", "resolved": "https://registry.npmjs.org/phin/-/phin-2.9.3.tgz", diff --git a/spec-es6/attribute_parser.spec.js b/spec-es6/attribute_parser.spec.js new file mode 100644 index 000000000..a69118589 --- /dev/null +++ b/spec-es6/attribute_parser.spec.js @@ -0,0 +1,10 @@ +import attributeParser from '../src/public/app/services/attribute_parser.js'; +import {describe, it, expect, execute} from './mini_test.js'; + +describe("Lexer fulltext", () => { + it("simple label", () => { + expect(attributeParser.lexer("#label")).toEqual(["#label"]); + }); +}); + +execute(); diff --git a/spec-es6/attribute_parser.spec.mjs b/spec-es6/mini_test.js similarity index 56% rename from spec-es6/attribute_parser.spec.mjs rename to spec-es6/mini_test.js index 482cbfec9..58b743115 100644 --- a/spec-es6/attribute_parser.spec.mjs +++ b/spec-es6/mini_test.js @@ -1,12 +1,10 @@ -import attributeParser from '../src/public/app/services/attribute_parser.mjs'; - -function describe(name, cb) { +export function describe(name, cb) { console.log(`Running ${name}`); cb(); } -function it(name, cb) { +export async function it(name, cb) { console.log(` Running ${name}`); cb(); @@ -14,7 +12,7 @@ function it(name, cb) { let errorCount = 0; -function expect(val) { +export function expect(val) { return { toEqual: comparedVal => { const jsonVal = JSON.stringify(val); @@ -31,17 +29,13 @@ function expect(val) { } } -describe("Lexer fulltext", () => { - it("simple label", () => { - expect(attributeParser.lexer("#label")).toEqual(["#labe"]); - }); -}); +export function execute() { + console.log(""); -console.log(""); - -if (errorCount) { - console.log(`!!!${errorCount} tests failed!!!`); -} -else { - console.log("All tests passed!"); + if (errorCount) { + console.log(`!!!${errorCount} tests failed!!!`); + } + else { + console.log("All tests passed!"); + } } diff --git a/src/public/app/services/attribute_parser.mjs b/src/public/app/services/attribute_parser.js similarity index 100% rename from src/public/app/services/attribute_parser.mjs rename to src/public/app/services/attribute_parser.js