diff --git a/cypress/integration/ui/accessibility.js b/cypress/integration/ui/accessibility.js index 3baa23b5..e0d8b594 100644 --- a/cypress/integration/ui/accessibility.js +++ b/cypress/integration/ui/accessibility.js @@ -1,6 +1,6 @@ describe('UI - Accessibility', function () { beforeEach(() => { - cy.visit('/instrumented/svg-editor-es.html'); + cy.visit('/instrumented/editor/svg-editor-es.html'); cy.injectAxe(); }); diff --git a/cypress/integration/unit/contextmenu.js b/cypress/integration/unit/contextmenu.js index e851e8a7..575cbc00 100644 --- a/cypress/integration/unit/contextmenu.js +++ b/cypress/integration/unit/contextmenu.js @@ -1,5 +1,5 @@ -import '../../../instrumented/jquery.min.js'; -import * as contextmenu from '../../../instrumented/contextmenu.js'; +import '../../../instrumented/editor/jquery.min.js'; +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 d7388662..54ccea26 100644 --- a/cypress/integration/unit/coords.js +++ b/cypress/integration/unit/coords.js @@ -1,8 +1,8 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import * as coords from '../../../instrumented/coords.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as utilities from '../../../instrumented/common/utilities.js'; +import * as coords from '../../../instrumented/svgcanvas/coords.js'; describe('coords', function () { let elemId = 1; diff --git a/cypress/integration/unit/draw.js b/cypress/integration/unit/draw.js index 450db7d1..b7207b58 100644 --- a/cypress/integration/unit/draw.js +++ b/cypress/integration/unit/draw.js @@ -1,8 +1,8 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as draw from '../../../instrumented/draw.js'; -import * as units from '../../../instrumented/units.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as draw from '../../../instrumented/svgcanvas/draw.js'; +import * as units from '../../../instrumented/common/units.js'; describe('draw.Drawing', function () { const addOwnSpies = (obj) => { diff --git a/cypress/integration/unit/history.js b/cypress/integration/unit/history.js index 8a66401d..b4306b7d 100644 --- a/cypress/integration/unit/history.js +++ b/cypress/integration/unit/history.js @@ -1,9 +1,9 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as transformlist from '../../../instrumented/svgtransformlist.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import * as hstory from '../../../instrumented/history.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as transformlist from '../../../instrumented/common/svgtransformlist.js'; +import * as utilities from '../../../instrumented/common/utilities.js'; +import * as hstory from '../../../instrumented/svgcanvas/history.js'; describe('history', function () { // TODO(codedread): Write tests for handling history events. diff --git a/cypress/integration/unit/math.js b/cypress/integration/unit/math.js index 2aacab41..8c3c665c 100644 --- a/cypress/integration/unit/math.js +++ b/cypress/integration/unit/math.js @@ -1,7 +1,7 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as math from '../../../instrumented/math.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as math from '../../../instrumented/common/math.js'; describe('math', function () { const svg = document.createElementNS(NS.SVG, 'svg'); diff --git a/cypress/integration/unit/path.js b/cypress/integration/unit/path.js index 82e54bd5..443c24bd 100644 --- a/cypress/integration/unit/path.js +++ b/cypress/integration/unit/path.js @@ -1,11 +1,11 @@ /* globals SVGPathSeg */ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import '../../../instrumented/svgpathseg.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import * as pathModule from '../../../instrumented/path.js'; -import {init as unitsInit} from '../../../instrumented/units.js'; +import '../../../instrumented/common/svgpathseg.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as utilities from '../../../instrumented/common/utilities.js'; +import * as pathModule from '../../../instrumented/svgcanvas/path.js'; +import {init as unitsInit} from '../../../instrumented/common/units.js'; describe('path', function () { /** diff --git a/cypress/integration/unit/recalculate.js b/cypress/integration/unit/recalculate.js index aec3d447..dde47f4e 100644 --- a/cypress/integration/unit/recalculate.js +++ b/cypress/integration/unit/recalculate.js @@ -1,9 +1,9 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import * as coords from '../../../instrumented/coords.js'; -import * as recalculate from '../../../instrumented/recalculate.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as utilities from '../../../instrumented/common/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 diff --git a/cypress/integration/unit/sanitize.js b/cypress/integration/unit/sanitize.js index f2c1a887..4ff4f853 100644 --- a/cypress/integration/unit/sanitize.js +++ b/cypress/integration/unit/sanitize.js @@ -1,7 +1,7 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as sanitize from '../../../instrumented/sanitize.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as sanitize from '../../../instrumented/svgcanvas/sanitize.js'; describe('sanitize', function () { const svg = document.createElementNS(NS.SVG, 'svg'); diff --git a/cypress/integration/unit/select.js b/cypress/integration/unit/select.js index 0b025720..b01ca71a 100644 --- a/cypress/integration/unit/select.js +++ b/cypress/integration/unit/select.js @@ -1,7 +1,7 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import * as select from '../../../instrumented/select.js'; -import {NS} from '../../../instrumented/namespaces.js'; +import * as select from '../../../instrumented/svgcanvas/select.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; describe('select', function () { const sandbox = document.createElement('div'); diff --git a/cypress/integration/unit/svgtransformlist.js b/cypress/integration/unit/svgtransformlist.js index 7072c080..fb7c0a86 100644 --- a/cypress/integration/unit/svgtransformlist.js +++ b/cypress/integration/unit/svgtransformlist.js @@ -1,8 +1,8 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as transformlist from '../../../instrumented/svgtransformlist.js'; -import {disableSupportsNativeTransformLists} from '../../../instrumented/browser.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as transformlist from '../../../instrumented/common/svgtransformlist.js'; +import {disableSupportsNativeTransformLists} from '../../../instrumented/common/browser.js'; import almostEqualsPlugin from '../../support/assert-almostEquals.js'; import expectOutOfBoundsExceptionPlugin from '../../support/assert-expectOutOfBoundsException.js'; diff --git a/cypress/integration/unit/test1.js b/cypress/integration/unit/test1.js index 5ff34974..07a2ab6f 100644 --- a/cypress/integration/unit/test1.js +++ b/cypress/integration/unit/test1.js @@ -1,8 +1,8 @@ -import '../../../instrumented/jquery.min.js'; -import '../../../instrumented/jquery-ui/jquery-ui-1.8.17.custom.min.js'; +import '../../../instrumented/editor/jquery.min.js'; +import '../../../instrumented/editor/jquery-ui/jquery-ui-1.8.17.custom.min.js'; -import '../../../instrumented/svgpathseg.js'; -import SvgCanvas from '../../../instrumented/svgcanvas.js'; +import '../../../instrumented/common/svgpathseg.js'; +import SvgCanvas from '../../../instrumented/svgcanvas/svgcanvas.js'; describe('Basic Module', function () { // helper functions diff --git a/cypress/integration/unit/units.js b/cypress/integration/unit/units.js index c626e1e7..0519f1e2 100644 --- a/cypress/integration/unit/units.js +++ b/cypress/integration/unit/units.js @@ -1,6 +1,6 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import * as units from '../../../instrumented/units.js'; +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 bc5b5b6b..c2be9af9 100644 --- a/cypress/integration/unit/utilities-bbox.js +++ b/cypress/integration/unit/utilities-bbox.js @@ -1,11 +1,11 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import '../../../instrumented/svgpathseg.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import * as transformlist from '../../../instrumented/svgtransformlist.js'; -import * as math from '../../../instrumented/math.js'; -import * as path from '../../../instrumented/path.js'; +import '../../../instrumented/common/svgpathseg.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as utilities from '../../../instrumented/common/utilities.js'; +import * as transformlist from '../../../instrumented/common/svgtransformlist.js'; +import * as math from '../../../instrumented/common/math.js'; +import * as path from '../../../instrumented/svgcanvas/path.js'; import setAssertionMethods from '../../support/assert-close.js'; chai.use(setAssertionMethods); diff --git a/cypress/integration/unit/utilities-performance.js b/cypress/integration/unit/utilities-performance.js index 4e1e0e9a..41d304d8 100644 --- a/cypress/integration/unit/utilities-performance.js +++ b/cypress/integration/unit/utilities-performance.js @@ -1,10 +1,10 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import '../../../instrumented/svgpathseg.js'; -import {NS} from '../../../instrumented/namespaces.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import * as transformlist from '../../../instrumented/svgtransformlist.js'; -import * as math from '../../../instrumented/math.js'; +import '../../../instrumented/common/svgpathseg.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; +import * as utilities from '../../../instrumented/common/utilities.js'; +import * as transformlist from '../../../instrumented/common/svgtransformlist.js'; +import * as math from '../../../instrumented/common/math.js'; describe('utilities performance', function () { let currentLayer, groupWithMatrixTransform, textWithMatrixTransform; diff --git a/cypress/integration/unit/utilities.js b/cypress/integration/unit/utilities.js index 417103b7..8bc8e3ca 100644 --- a/cypress/integration/unit/utilities.js +++ b/cypress/integration/unit/utilities.js @@ -1,8 +1,8 @@ -import '../../../instrumented/jquery.min.js'; +import '../../../instrumented/editor/jquery.min.js'; -import * as browser from '../../../instrumented/browser.js'; -import * as utilities from '../../../instrumented/utilities.js'; -import {NS} from '../../../instrumented/namespaces.js'; +import * as browser from '../../../instrumented/common/browser.js'; +import * as utilities from '../../../instrumented/common/utilities.js'; +import {NS} from '../../../instrumented/common/namespaces.js'; describe('utilities', function () { /** diff --git a/cypress/support/ui-test-helper.js b/cypress/support/ui-test-helper.js index 95ffea94..69d28514 100644 --- a/cypress/support/ui-test-helper.js +++ b/cypress/support/ui-test-helper.js @@ -4,7 +4,7 @@ export const approveStorage = () => { }; export const visitAndApproveStorage = () => { - cy.visit('/instrumented/svg-editor-es.html'); + cy.visit('/instrumented/editor/svg-editor-es.html'); approveStorage(); };