diff --git a/badges/tests-badge.svg b/badges/tests-badge.svg index 6a74ce81..ecc8fc46 100644 --- a/badges/tests-badge.svg +++ b/badges/tests-badge.svg @@ -1 +1 @@ -TestsTests21/2121/21 \ No newline at end of file +TestsTests139/139139/139 \ No newline at end of file diff --git a/cypress/integration/unit/contextmenu.js b/cypress/integration/unit/contextmenu.js index 63e15a2f..dfe7b212 100644 --- a/cypress/integration/unit/contextmenu.js +++ b/cypress/integration/unit/contextmenu.js @@ -1,4 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; +import $ from 'jquery'; +window.$ = $; import * as contextmenu from '../../../instrumented/editor/contextmenu.js'; describe('contextmenu', function () { diff --git a/cypress/integration/unit/coords.js b/cypress/integration/unit/coords.js index 22fcd23f..412a07be 100644 --- a/cypress/integration/unit/coords.js +++ b/cypress/integration/unit/coords.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import * as coords from '../../../instrumented/svgcanvas/coords.js'; diff --git a/cypress/integration/unit/draw.js b/cypress/integration/unit/draw.js index 8164f80d..89cf4791 100644 --- a/cypress/integration/unit/draw.js +++ b/cypress/integration/unit/draw.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as draw from '../../../instrumented/svgcanvas/draw.js'; import * as units from '../../../instrumented/common/units.js'; diff --git a/cypress/integration/unit/history.js b/cypress/integration/unit/history.js index f9d13e2a..4082bb79 100644 --- a/cypress/integration/unit/history.js +++ b/cypress/integration/unit/history.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as transformlist from '../../../instrumented/svgcanvas/svgtransformlist.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/math.js b/cypress/integration/unit/math.js index deba647d..1235c02c 100644 --- a/cypress/integration/unit/math.js +++ b/cypress/integration/unit/math.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as math from '../../../instrumented/svgcanvas/math.js'; diff --git a/cypress/integration/unit/path.js b/cypress/integration/unit/path.js index 1636b79c..6b58535d 100644 --- a/cypress/integration/unit/path.js +++ b/cypress/integration/unit/path.js @@ -1,7 +1,7 @@ /* globals SVGPathSeg */ import 'pathseg'; - -import '../../../instrumented/editor/jquery.min.js'; +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/recalculate.js b/cypress/integration/unit/recalculate.js index 3817c681..00272765 100644 --- a/cypress/integration/unit/recalculate.js +++ b/cypress/integration/unit/recalculate.js @@ -1,10 +1,11 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import * as coords from '../../../instrumented/svgcanvas/coords.js'; import * as recalculate from '../../../instrumented/svgcanvas/recalculate.js'; + describe('recalculate', function () { // eslint-disable-next-line no-shadow const root = document.createElement('div'); diff --git a/cypress/integration/unit/sanitize.js b/cypress/integration/unit/sanitize.js index 45a95a98..9ba73846 100644 --- a/cypress/integration/unit/sanitize.js +++ b/cypress/integration/unit/sanitize.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as sanitize from '../../../instrumented/svgcanvas/sanitize.js'; diff --git a/cypress/integration/unit/select.js b/cypress/integration/unit/select.js index 0ee2a376..803549ba 100644 --- a/cypress/integration/unit/select.js +++ b/cypress/integration/unit/select.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import * as select from '../../../instrumented/svgcanvas/select.js'; import { NS } from '../../../instrumented/common/namespaces.js'; diff --git a/cypress/integration/unit/svgtransformlist.js b/cypress/integration/unit/svgtransformlist.js index 888b4a3e..b910a5fc 100644 --- a/cypress/integration/unit/svgtransformlist.js +++ b/cypress/integration/unit/svgtransformlist.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as transformlist from '../../../instrumented/svgcanvas/svgtransformlist.js'; import { disableSupportsNativeTransformLists } from '../../../instrumented/common/browser.js'; diff --git a/cypress/integration/unit/test1.js b/cypress/integration/unit/test1.js index 07f8aa66..eaecadbe 100644 --- a/cypress/integration/unit/test1.js +++ b/cypress/integration/unit/test1.js @@ -1,5 +1,6 @@ /* eslint-disable max-len, no-console */ -import '../../../instrumented/editor/jquery.min.js'; +import $ from 'jquery'; +window.$ = $; import SvgCanvas from '../../../instrumented/svgcanvas/svgcanvas.js'; diff --git a/cypress/integration/unit/units.js b/cypress/integration/unit/units.js index 6134ea55..9bfeec35 100644 --- a/cypress/integration/unit/units.js +++ b/cypress/integration/unit/units.js @@ -1,5 +1,5 @@ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import * as units from '../../../instrumented/common/units.js'; describe('units', function () { diff --git a/cypress/integration/unit/utilities-bbox.js b/cypress/integration/unit/utilities-bbox.js index 433c1d44..fb730f18 100644 --- a/cypress/integration/unit/utilities-bbox.js +++ b/cypress/integration/unit/utilities-bbox.js @@ -1,7 +1,7 @@ /* eslint-disable max-len */ import 'pathseg'; - -import '../../../instrumented/editor/jquery.min.js'; +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/utilities-performance.js b/cypress/integration/unit/utilities-performance.js index 449070f2..f71f1fe3 100644 --- a/cypress/integration/unit/utilities-performance.js +++ b/cypress/integration/unit/utilities-performance.js @@ -1,6 +1,7 @@ /* eslint-disable max-len, no-console */ import 'pathseg'; -import '../../../instrumented/editor/jquery.min.js'; +import $ from 'jquery'; +window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/utilities.js b/cypress/integration/unit/utilities.js index 3e590bff..5ce45891 100644 --- a/cypress/integration/unit/utilities.js +++ b/cypress/integration/unit/utilities.js @@ -1,6 +1,6 @@ /* eslint-disable max-len */ -import '../../../instrumented/editor/jquery.min.js'; - +import $ from 'jquery'; +window.$ = $; import * as browser from '../../../instrumented/common/browser.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import { NS } from '../../../instrumented/common/namespaces.js';