From 1aabb195b6025fec60a79e1dbe144bdc3bd4fa20 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 21:02:00 +0200 Subject: [PATCH 1/7] temporarily disable tests that will fail with Graphviz upgrade These tests would otherwise fail when Graphviz is upgraded to version 8.1.0 in the next commit in this series. The reason is that the Graphviz issue "Failure of arrowhead and arrowtail to respect penwidth" (https://gitlab.com/graphviz/graphviz/-/issues/372) was fixed for the use cases in these tests in version 8.1.0 so the data has slightly changed. The tests will be updated and re-enabled in separate upcoming commits in this series. --- test/dot-data-test.js | 2 +- test/drawEdge-test.js | 2 +- test/drawNode-shape-egg-test.js | 2 +- test/drawNode-shape-triangle-test.js | 2 +- test/graphviz-test.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/dot-data-test.js b/test/dot-data-test.js index 4854ce36..d00a498f 100644 --- a/test/dot-data-test.js +++ b/test/dot-data-test.js @@ -5,7 +5,7 @@ import deepEqualData from "./deepEqualData.js"; import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; -it("data extraction", async () => { +xit("data extraction", async () => { var window = global.window = jsdom('
'); global.document = window.document; diff --git a/test/drawEdge-test.js b/test/drawEdge-test.js index ebf33dd6..2fa4e336 100644 --- a/test/drawEdge-test.js +++ b/test/drawEdge-test.js @@ -4,7 +4,7 @@ import jsdom from "./jsdom.js"; import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; -it("Check our understanding of how Graphviz draws edges.", async () => { +xit("Check our understanding of how Graphviz draws edges.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var graphviz = d3_graphviz.graphviz("#graph"); diff --git a/test/drawNode-shape-egg-test.js b/test/drawNode-shape-egg-test.js index 380fa5f5..3b6a4596 100644 --- a/test/drawNode-shape-egg-test.js +++ b/test/drawNode-shape-egg-test.js @@ -6,7 +6,7 @@ import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; import {translatePointsAttribute} from "../src/svg.js" -it("Verify that egg shape is drawn exactly as Graphviz does.", async () => { +xit("Verify that egg shape is drawn exactly as Graphviz does.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var expectedGraph = d3.select("#expected-graph"); diff --git a/test/drawNode-shape-triangle-test.js b/test/drawNode-shape-triangle-test.js index 0e2f7875..879d0a4f 100644 --- a/test/drawNode-shape-triangle-test.js +++ b/test/drawNode-shape-triangle-test.js @@ -7,7 +7,7 @@ import * as d3_graphviz from "../index.js"; import {translatePointsAttribute} from "../src/svg.js"; import {roundTo2Decimals} from "./utils.js"; -it("Verify that triangle shape is drawn exactly as Graphviz does.", async () => { +xit("Verify that triangle shape is drawn exactly as Graphviz does.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var expectedGraph = d3.select("#expected-graph"); diff --git a/test/graphviz-test.js b/test/graphviz-test.js index fbbe7e34..02078e4c 100644 --- a/test/graphviz-test.js +++ b/test/graphviz-test.js @@ -4,7 +4,7 @@ import jsdom from "./jsdom.js"; import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; -it("graphviz().render() renders an SVG from graphviz DOT.", async () => { +xit("graphviz().render() renders an SVG from graphviz DOT.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var graphviz = d3_graphviz.graphviz("#graph"); From 02fb540781c1ab18347a51625493242ac9e4d68f Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 14:58:17 +0200 Subject: [PATCH 2/7] upgrade @hpcc-js/wasm to 2.13.1 (Graphviz 8.1.0) --- CHANGELOG.md | 1 + package-lock.json | 66 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f52d004d..310630fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* Upgrade @hpcc-js/wasm to 2.13.1 (Graphviz 8.1.0) ## [5.0.2] – 2022-12-27 diff --git a/package-lock.json b/package-lock.json index cc3af8d7..3af48752 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "5.0.2", "license": "BSD-3-Clause", "dependencies": { - "@hpcc-js/wasm": "2.5.0", + "@hpcc-js/wasm": "2.13.1", "d3-dispatch": "^3.0.1", "d3-format": "^3.1.0", "d3-interpolate": "^3.0.1", @@ -1696,11 +1696,11 @@ "dev": true }, "node_modules/@hpcc-js/wasm": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.5.0.tgz", - "integrity": "sha512-G26BamgaHW46f6P8bmkygapgNcy+tTDMwIvCzmMzdp39sxUS1u4gaT/vR2SSDc4x3SfL5RE4B2B8ef/wd429Hg==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz", + "integrity": "sha512-dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA==", "dependencies": { - "yargs": "17.6.2" + "yargs": "17.7.2" }, "bin": { "dot-wasm": "bin/dot-wasm.js" @@ -2614,6 +2614,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "dev": true, "engines": { "node": ">=12" } @@ -2646,6 +2647,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", + "dev": true, "engines": { "node": ">=12" } @@ -2654,6 +2656,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", + "dev": true, "dependencies": { "d3-dispatch": "1 - 3", "d3-selection": "3" @@ -2712,6 +2715,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "dev": true, "engines": { "node": ">=12" } @@ -2746,6 +2750,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "dev": true, "engines": { "node": ">=12" } @@ -2775,6 +2780,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "dev": true, "dependencies": { "d3-color": "1 - 3" }, @@ -2786,6 +2792,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", + "dev": true, "engines": { "node": ">=12" } @@ -2850,6 +2857,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "dev": true, "engines": { "node": ">=12" } @@ -2894,6 +2902,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "dev": true, "engines": { "node": ">=12" } @@ -2902,6 +2911,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", + "dev": true, "dependencies": { "d3-color": "1 - 3", "d3-dispatch": "1 - 3", @@ -2920,6 +2930,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", + "dev": true, "dependencies": { "d3-dispatch": "1 - 3", "d3-drag": "2 - 3", @@ -5915,9 +5926,9 @@ } }, "node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -7150,11 +7161,11 @@ "dev": true }, "@hpcc-js/wasm": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.5.0.tgz", - "integrity": "sha512-G26BamgaHW46f6P8bmkygapgNcy+tTDMwIvCzmMzdp39sxUS1u4gaT/vR2SSDc4x3SfL5RE4B2B8ef/wd429Hg==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz", + "integrity": "sha512-dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA==", "requires": { - "yargs": "17.6.2" + "yargs": "17.7.2" } }, "@istanbuljs/schema": { @@ -7847,7 +7858,8 @@ "d3-color": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", - "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==" + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "dev": true }, "d3-contour": { "version": "4.0.0", @@ -7870,12 +7882,14 @@ "d3-dispatch": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", - "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==" + "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", + "dev": true }, "d3-drag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", + "dev": true, "requires": { "d3-dispatch": "1 - 3", "d3-selection": "3" @@ -7912,7 +7926,8 @@ "d3-ease": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", - "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==" + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "dev": true }, "d3-fetch": { "version": "3.0.1", @@ -7937,7 +7952,8 @@ "d3-format": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", - "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==" + "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "dev": true }, "d3-geo": { "version": "3.1.0", @@ -7958,6 +7974,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "dev": true, "requires": { "d3-color": "1 - 3" } @@ -7965,7 +7982,8 @@ "d3-path": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", - "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==" + "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", + "dev": true }, "d3-polygon": { "version": "3.0.1", @@ -8011,7 +8029,8 @@ "d3-selection": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", - "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==" + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "dev": true }, "d3-shape": { "version": "3.2.0", @@ -8043,12 +8062,14 @@ "d3-timer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", - "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==" + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "dev": true }, "d3-transition": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", + "dev": true, "requires": { "d3-color": "1 - 3", "d3-dispatch": "1 - 3", @@ -8061,6 +8082,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", + "dev": true, "requires": { "d3-dispatch": "1 - 3", "d3-drag": "2 - 3", @@ -10286,9 +10308,9 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "requires": { "cliui": "^8.0.1", "escalade": "^3.1.1", diff --git a/package.json b/package.json index 37a2dd08..09e8c74f 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "tiny-worker": "^2.1.2" }, "dependencies": { - "@hpcc-js/wasm": "2.5.0", + "@hpcc-js/wasm": "2.13.1", "d3-dispatch": "^3.0.1", "d3-format": "^3.1.0", "d3-interpolate": "^3.0.1", From 53c2bebc678a413f1e50d94b1b5583a3577e18f3 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 15:29:17 +0200 Subject: [PATCH 3/7] update data in dot-data-test.js to Graphviz version 8.1.0 format The Graphviz issue "Failure of arrowhead and arrowtail to respect penwidth" (https://gitlab.com/graphviz/graphviz/-/issues/372) was fixed for the use cases here in version 8.1.0 so the data has slightly changed. See https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md#700-2022-10-22 --- test/dot-data-test.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/dot-data-test.js b/test/dot-data-test.js index d00a498f..34a357f6 100644 --- a/test/dot-data-test.js +++ b/test/dot-data-test.js @@ -5,7 +5,7 @@ import deepEqualData from "./deepEqualData.js"; import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; -xit("data extraction", async () => { +it("data extraction", async () => { var window = global.window = jsdom('
'); global.document = window.document; @@ -458,17 +458,17 @@ var basic_data = { "attributes": { "fill": "none", "stroke": "black", - "d": "M27,-71.7C27,-64.41 27,-55.73 27,-47.54" + "d": "M27,-71.7C27,-64.24 27,-55.32 27,-46.97" }, "bbox": { "x": 27, "y": -71.7, "width": 0, - "height": 24.160000000000004 + "height": 24.730000000000004 }, "center": { "x": 27, - "y": -59.620000000000005 + "y": -59.335 }, "totalLength": 100, "parent": "[Circular ~.children.1.children.15]", @@ -490,17 +490,17 @@ var basic_data = { "attributes": { "fill": "black", "stroke": "black", - "points": "30.5,-47.62 27,-37.62 23.5,-47.62 30.5,-47.62" + "points": "30.5,-47.1 27,-37.1 23.5,-47.1 30.5,-47.1" }, "bbox": { "x": 23.5, - "y": -47.62, + "y": -47.1, "width": 7, "height": 10 }, "center": { "x": 27, - "y": -42.62 + "y": -42.1 }, "parent": "[Circular ~.children.1.children.15]", "children": [], From 4f99c5ec1d5bfaa3f79b174bf578e698f7893543 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 21:37:40 +0200 Subject: [PATCH 4/7] update data in drawNode-shape-triangle-test.js to Graphviz version 8.1.0 format The Graphviz issue "Failure of arrowhead and arrowtail to respect penwidth" (https://gitlab.com/graphviz/graphviz/-/issues/372) was fixed for the use cases here in version 8.1.0 so the data has slightly changed. See https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md#700-2022-10-22 --- test/drawNode-shape-triangle-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/drawNode-shape-triangle-test.js b/test/drawNode-shape-triangle-test.js index 879d0a4f..e3e88764 100644 --- a/test/drawNode-shape-triangle-test.js +++ b/test/drawNode-shape-triangle-test.js @@ -7,7 +7,7 @@ import * as d3_graphviz from "../index.js"; import {translatePointsAttribute} from "../src/svg.js"; import {roundTo2Decimals} from "./utils.js"; -xit("Verify that triangle shape is drawn exactly as Graphviz does.", async () => { +it("Verify that triangle shape is drawn exactly as Graphviz does.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var expectedGraph = d3.select("#expected-graph"); @@ -37,7 +37,7 @@ xit("Verify that triangle shape is drawn exactly as Graphviz does.", async () => }); var x = 30.64645; - var y = -30.9504; + var y = -31.0004; actualGraphviz .drawNode(x, y, 'a', { shape: 'triangle', id: 'node1' }) .insertDrawnNode('a'); From d5197d1f65a8ddc660c0505f9bfc84f45d71b3a5 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 21:37:40 +0200 Subject: [PATCH 5/7] update data in drawNode-shape-egg-test.js to Graphviz version 8.1.0 format The Graphviz issue "Failure of arrowhead and arrowtail to respect penwidth" (https://gitlab.com/graphviz/graphviz/-/issues/372) was fixed for the use cases here in version 8.1.0 so the data has slightly changed. See https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md#700-2022-10-22 --- test/drawNode-shape-egg-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/drawNode-shape-egg-test.js b/test/drawNode-shape-egg-test.js index 3b6a4596..b805e272 100644 --- a/test/drawNode-shape-egg-test.js +++ b/test/drawNode-shape-egg-test.js @@ -6,7 +6,7 @@ import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; import {translatePointsAttribute} from "../src/svg.js" -xit("Verify that egg shape is drawn exactly as Graphviz does.", async () => { +it("Verify that egg shape is drawn exactly as Graphviz does.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var expectedGraph = d3.select("#expected-graph"); @@ -35,7 +35,7 @@ xit("Verify that egg shape is drawn exactly as Graphviz does.", async () => { .renderDot('digraph {}', resolve); }); - var x = 28.74; + var x = 28.745; var y = -18; actualGraphviz .drawNode(x, y, 'a', { shape: 'egg', id: 'node1' }) From ed7c73be6f388edfdbad90fe8ecc01c85412c4fe Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 21:37:40 +0200 Subject: [PATCH 6/7] update data in graphviz-test.js to Graphviz version 8.1.0 format The Graphviz issue "Failure of arrowhead and arrowtail to respect penwidth" (https://gitlab.com/graphviz/graphviz/-/issues/372) was fixed for the use cases here in version 8.1.0 so the data has slightly changed. See https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md#700-2022-10-22 --- test/graphviz-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/graphviz-test.js b/test/graphviz-test.js index 02078e4c..e4fa7704 100644 --- a/test/graphviz-test.js +++ b/test/graphviz-test.js @@ -4,7 +4,7 @@ import jsdom from "./jsdom.js"; import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; -xit("graphviz().render() renders an SVG from graphviz DOT.", async () => { +it("graphviz().render() renders an SVG from graphviz DOT.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var graphviz = d3_graphviz.graphviz("#graph"); @@ -30,8 +30,8 @@ xit("graphviz().render() renders an SVG from graphviz DOT.", async () => { a->b - - + + `; From d7a6e33e4970c7683d02c6bfdc1b7d37335e675f Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 31 Jul 2023 21:37:40 +0200 Subject: [PATCH 7/7] update data in drawEdge-test.js to Graphviz version 8.1.0 format The Graphviz issue "Failure of arrowhead and arrowtail to respect penwidth" (https://gitlab.com/graphviz/graphviz/-/issues/372) was fixed for the use cases here in version 8.1.0 so the data has slightly changed. See https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md#700-2022-10-22 --- test/drawEdge-test.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/drawEdge-test.js b/test/drawEdge-test.js index 2fa4e336..12c73045 100644 --- a/test/drawEdge-test.js +++ b/test/drawEdge-test.js @@ -4,7 +4,7 @@ import jsdom from "./jsdom.js"; import * as d3 from "d3-selection"; import * as d3_graphviz from "../index.js"; -xit("Check our understanding of how Graphviz draws edges.", async () => { +it("Check our understanding of how Graphviz draws edges.", async () => { var window = global.window = jsdom('
'); global.document = window.document; var graphviz = d3_graphviz.graphviz("#graph"); @@ -30,12 +30,12 @@ xit("Check our understanding of how Graphviz draws edges.", async () => { assert.equal(d3.selectAll('path').size(), num_edges, 'Number of initial paths'); const arrowHeadLength = 10; const arrowHeadWidth = 7; - const margin = -0.1; + const margin = -0.14; // start of edge tail const x1 = 54.4; const y1 = -18; // end of edge arrowhead - const x2 = 88.1; + const x2 = 88.62; const y2 = -18.000; const line = d3.selectAll('.edge').selectAll('path').filter(function (d) { @@ -55,9 +55,9 @@ xit("Check our understanding of how Graphviz draws edges.", async () => { var expected_y = []; expected_x.push(x1); expected_y.push(y1); - expected_x.push(61.89); + expected_x.push(62.06); expected_y.push(y1); - expected_x.push(70.18); + expected_x.push(70.57); expected_y.push(y1); expected_x.push(Math.round((x2 - margin - arrowHeadLength) * 1000) / 1000); expected_y.push(y2);