diff --git a/spec/helpers/toLookLike.mjs b/spec/helpers/toLookLike.mjs new file mode 100644 index 0000000..8ba02b8 --- /dev/null +++ b/spec/helpers/toLookLike.mjs @@ -0,0 +1,5 @@ +import {matchers} from '../image/ImageSimilarity.mjs'; + +beforeAll(() => { + jasmine.addMatchers(matchers); +}); diff --git a/scripts/image/Blur.mjs b/spec/image/Blur.mjs similarity index 100% rename from scripts/image/Blur.mjs rename to spec/image/Blur.mjs diff --git a/scripts/image/Blur_spec.mjs b/spec/image/Blur_spec.mjs similarity index 100% rename from scripts/image/Blur_spec.mjs rename to spec/image/Blur_spec.mjs diff --git a/scripts/image/Composition.mjs b/spec/image/Composition.mjs similarity index 100% rename from scripts/image/Composition.mjs rename to spec/image/Composition.mjs diff --git a/scripts/image/Composition_spec.mjs b/spec/image/Composition_spec.mjs similarity index 100% rename from scripts/image/Composition_spec.mjs rename to spec/image/Composition_spec.mjs diff --git a/scripts/image/ImageRegion.mjs b/spec/image/ImageRegion.mjs similarity index 100% rename from scripts/image/ImageRegion.mjs rename to spec/image/ImageRegion.mjs diff --git a/scripts/image/ImageRegion_spec.mjs b/spec/image/ImageRegion_spec.mjs similarity index 98% rename from scripts/image/ImageRegion_spec.mjs rename to spec/image/ImageRegion_spec.mjs index a62d93c..b37b471 100644 --- a/scripts/image/ImageRegion_spec.mjs +++ b/spec/image/ImageRegion_spec.mjs @@ -1,7 +1,7 @@ /* eslint-disable max-statements */ import ImageRegion from './ImageRegion.mjs'; -import {nodejs} from '../core/browser.mjs'; +import {nodejs} from '../../scripts/core/browser.mjs'; describe('ImageRegion', () => { function makeCanvas(w, h) { diff --git a/scripts/image/ImageSimilarity.mjs b/spec/image/ImageSimilarity.mjs similarity index 98% rename from scripts/image/ImageSimilarity.mjs rename to spec/image/ImageSimilarity.mjs index 40ff3f0..c5c09b5 100644 --- a/scripts/image/ImageSimilarity.mjs +++ b/spec/image/ImageSimilarity.mjs @@ -1,7 +1,7 @@ import './Blur.mjs'; import './Composition.mjs'; import ImageRegion from './ImageRegion.mjs'; -import {headless} from '../core/browser.mjs'; +import {headless} from '../../scripts/core/browser.mjs'; function getThresholds({ pixelThresh = 2, diff --git a/scripts/image/ImageSimilarity_spec.mjs b/spec/image/ImageSimilarity_spec.mjs similarity index 100% rename from scripts/image/ImageSimilarity_spec.mjs rename to spec/image/ImageSimilarity_spec.mjs diff --git a/scripts/sequence/SequenceDiagram_visual_webspec.mjs b/spec/images_webspec.mjs similarity index 85% rename from scripts/sequence/SequenceDiagram_visual_webspec.mjs rename to spec/images_webspec.mjs index 2ee2b37..0e5c089 100644 --- a/scripts/sequence/SequenceDiagram_visual_webspec.mjs +++ b/spec/images_webspec.mjs @@ -1,7 +1,6 @@ -import ImageRegion from '../image/ImageRegion.mjs'; -import SequenceDiagram from './SequenceDiagram.mjs'; -import TESTS from '../../spec/images/list.mjs'; -import {matchers} from '../image/ImageSimilarity.mjs'; +import ImageRegion from './image/ImageRegion.mjs'; +import SequenceDiagram from '../scripts/sequence/SequenceDiagram.mjs'; +import TESTS from './images/list.mjs'; describe('SequenceDiagram Visuals', () => { const RESOLUTION = 4; @@ -48,8 +47,6 @@ describe('SequenceDiagram Visuals', () => { TESTS.forEach((image) => { it('renders ' + image + ' as expected', (done) => { - jasmine.addMatchers(matchers); - loadAndRenderURL(IMAGE_BASE_PATH + image) .then(({actual, expected, code}) => { const widthSm = Math.min(Math.round(actual.width / 4), 150); diff --git a/scripts/sequence/Readme_webspec.mjs b/spec/readme_webspec.mjs similarity index 87% rename from scripts/sequence/Readme_webspec.mjs rename to spec/readme_webspec.mjs index c7009f9..bcd5bd9 100644 --- a/scripts/sequence/Readme_webspec.mjs +++ b/spec/readme_webspec.mjs @@ -1,6 +1,5 @@ -import ImageRegion from '../image/ImageRegion.mjs'; -import SequenceDiagram from './SequenceDiagram.mjs'; -import {matchers} from '../image/ImageSimilarity.mjs'; +import ImageRegion from './image/ImageRegion.mjs'; +import SequenceDiagram from '../scripts/sequence/SequenceDiagram.mjs'; const RESOLUTION = 4; @@ -33,7 +32,6 @@ function makeSampleTests({file, code}, index) { describe('example #' + (index + 1), () => { if(file && !SCREENSHOT_BLACKLIST.includes(file)) { it('looks like ' + file + ' when rendered', (done) => { - jasmine.addMatchers(matchers); let actual = null; new SequenceDiagram(code) .getCanvas({resolution: RESOLUTION})