From bbba64328879ed31bc3fa294ebaca508df03eee4 Mon Sep 17 00:00:00 2001 From: Nikolay Rozhkov Date: Tue, 27 Jun 2023 15:30:22 +0300 Subject: [PATCH] Rmoved unnecessary imports in tests --- .../sankey/parser/sankey-arrow.spec.js | 25 +++++++++---------- .../src/diagrams/sankey/parser/sankey.spec.ts | 11 +++----- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey-arrow.spec.js b/packages/mermaid/src/diagrams/sankey/parser/sankey-arrow.spec.js index 2172801dc..a180b9a28 100644 --- a/packages/mermaid/src/diagrams/sankey/parser/sankey-arrow.spec.js +++ b/packages/mermaid/src/diagrams/sankey/parser/sankey-arrow.spec.js @@ -1,19 +1,18 @@ -import diagram from './sankey-arrow.jison'; -import { parser } from './sankey-arrow.jison'; +// @ts-ignore: jison doesn't export types +import sankey from './sankey-arrow.jison'; import db from '../sankeyDB.js'; describe('sankey-beta diagram', function () { describe('when parsing an info graph it', function () { beforeEach(function () { - parser.yy = db; - diagram.parser.yy = db; - diagram.parser.yy.clear(); + sankey.parser.yy = db; + sankey.parser.yy.clear(); }); it('recognizes its type', () => { const str = `sankey-beta`; - parser.parse(str); + sankey.parser.parse(str); }); it('recognizes one flow', () => { @@ -22,7 +21,7 @@ describe('sankey-beta diagram', function () { node_a -> 30 -> node_b -> 20 -> node_c `; - parser.parse(str); + sankey.parser.parse(str); }); it('recognizes multiple flows', () => { @@ -33,7 +32,7 @@ describe('sankey-beta diagram', function () { node_c -> 40 -> node_e -> 12 -> node_q `; - parser.parse(str); + sankey.parser.parse(str); }); it('parses node as a string', () => { @@ -44,7 +43,7 @@ describe('sankey-beta diagram', function () { "node c" -> 40 -> "node e" -> 12 -> "node q" `; - parser.parse(str); + sankey.parser.parse(str); }); describe('while attributes parsing', () => { @@ -54,7 +53,7 @@ describe('sankey-beta diagram', function () { 1st -> 200 -> 2nd -> 180 -> 3rd; `; - parser.parse(str); + sankey.parser.parse(str); }); it('parses different quotless variations', () => { @@ -70,7 +69,7 @@ describe('sankey-beta diagram', function () { node[x1dfqowie attr1 = 23413 attr2] `; - parser.parse(str); + sankey.parser.parse(str); }); it('parses strings as values', () => { @@ -80,7 +79,7 @@ describe('sankey-beta diagram', function () { node[title="hello, mister \\"sankey-beta\\", backslash for you \\\\"] `; - parser.parse(str); + sankey.parser.parse(str); }); it('parses real example', () => { @@ -95,7 +94,7 @@ describe('sankey-beta diagram', function () { "Biofuel imports" -> 35 -> "Liquid" `; - parser.parse(str); + sankey.parser.parse(str); }); }); }); diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.ts b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.ts index eef8ae3c6..4517ca01f 100644 --- a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.ts +++ b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.ts @@ -1,7 +1,5 @@ // @ts-ignore: jison doesn't export types -import diagram from './sankey.jison'; -// @ts-ignore: jison doesn't export types -import { parser } from './sankey.jison'; +import sankey from './sankey.jison'; import db from '../sankeyDB.js'; import { cleanupComments } from '../../../diagram-api/comments.js'; import { prepareTextForParsing } from '../sankeyUtils.js'; @@ -11,9 +9,8 @@ import * as path from 'path'; describe('Sankey diagram', function () { describe('when parsing an info graph it', function () { beforeEach(function () { - parser.yy = db; - diagram.parser.yy = db; - diagram.parser.yy.clear(); + sankey.parser.yy = db; + sankey.parser.yy.clear(); }); it('parses csv', async () => { @@ -21,7 +18,7 @@ describe('Sankey diagram', function () { const data = fs.readFileSync(csv, 'utf8'); const graphDefinition = prepareTextForParsing(cleanupComments('sankey-beta\n\n ' + data)); - parser.parse(graphDefinition); + sankey.parser.parse(graphDefinition); }); }); });