Fix test run and update snapshots
@ -3,7 +3,7 @@ services:
|
|||||||
e2e:
|
e2e:
|
||||||
image: cypress/included:8.4.1
|
image: cypress/included:8.4.1
|
||||||
container_name: wisemapping-integration-tests
|
container_name: wisemapping-integration-tests
|
||||||
entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn test:integration"'
|
entrypoint: '/bin/sh -c "yarn bootstrap && yarn test:integration"'
|
||||||
working_dir: /e2e
|
working_dir: /e2e
|
||||||
environment:
|
environment:
|
||||||
- CYPRESS_imageSnaphots=true
|
- CYPRESS_imageSnaphots=true
|
||||||
|
@ -3,7 +3,7 @@ services:
|
|||||||
e2e:
|
e2e:
|
||||||
image: cypress/included:8.4.1
|
image: cypress/included:8.4.1
|
||||||
container_name: wisemapping-integration-tests
|
container_name: wisemapping-integration-tests
|
||||||
entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn test:integration"'
|
entrypoint: '/bin/sh -c "yarn bootstrap && yarn test:integration"'
|
||||||
working_dir: /e2e
|
working_dir: /e2e
|
||||||
environment:
|
environment:
|
||||||
- CYPRESS_imageSnaphots=true
|
- CYPRESS_imageSnaphots=true
|
||||||
|
Before Width: | Height: | Size: 202 KiB After Width: | Height: | Size: 206 KiB |
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 110 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 95 KiB |
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 185 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 65 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 103 KiB |
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 114 KiB |
@ -23,7 +23,7 @@
|
|||||||
"clean-webpack-plugin": "^4.0.0",
|
"clean-webpack-plugin": "^4.0.0",
|
||||||
"compression-webpack-plugin": "^9.2.0",
|
"compression-webpack-plugin": "^9.2.0",
|
||||||
"copy-webpack-plugin": "^10.2.1",
|
"copy-webpack-plugin": "^10.2.1",
|
||||||
"cypress": "^9.3.1",
|
"cypress": "^8.4.1",
|
||||||
"cypress-image-snapshot": "^4.0.1",
|
"cypress-image-snapshot": "^4.0.1",
|
||||||
"eslint": "^7.14.0",
|
"eslint": "^7.14.0",
|
||||||
"eslint-config-prettier": "^8.0.0",
|
"eslint-config-prettier": "^8.0.0",
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
const path = require('path');
|
const path = require('path');
|
||||||
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
|
||||||
const webpack = require('webpack');
|
const webpack = require('webpack');
|
||||||
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
|
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
output: {
|
output: {
|
||||||
filename: 'editor.bundle.js',
|
|
||||||
path: path.resolve(__dirname, 'dist'),
|
path: path.resolve(__dirname, 'dist'),
|
||||||
|
filename: '[name].js',
|
||||||
|
publicPath: '',
|
||||||
library: {
|
library: {
|
||||||
type: 'umd',
|
type: 'umd',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
entry: {
|
entry: {
|
||||||
editor: path.join(__dirname, 'src', 'index.tsx')
|
"editor.bundle": path.join(__dirname, 'src', 'index.tsx')
|
||||||
},
|
},
|
||||||
mode: 'development',
|
mode: 'development',
|
||||||
devtool: 'source-map',
|
devtool: 'source-map',
|
||||||
@ -38,17 +38,7 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
||||||
plugins: [
|
plugins: [
|
||||||
new CleanWebpackPlugin(),
|
new CleanWebpackPlugin(),
|
||||||
new webpack.DefinePlugin({
|
]
|
||||||
'process.env.NODE_ENV': JSON.stringify('development')
|
|
||||||
})
|
|
||||||
],
|
|
||||||
devServer: {
|
|
||||||
contentBase: path.join(__dirname, 'dist'),
|
|
||||||
compress: true,
|
|
||||||
port: 9000,
|
|
||||||
hot: true,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ const { merge } = require('webpack-merge');
|
|||||||
const playgroundConfig = {
|
const playgroundConfig = {
|
||||||
mode: 'development',
|
mode: 'development',
|
||||||
entry: {
|
entry: {
|
||||||
|
"editor.bundle": path.join(__dirname, 'src', 'index.tsx'),
|
||||||
viewmode: path.resolve(__dirname, './test/playground/map-render/js/viewmode'),
|
viewmode: path.resolve(__dirname, './test/playground/map-render/js/viewmode'),
|
||||||
embedded: path.resolve(__dirname, './test/playground/map-render/js/embedded'),
|
embedded: path.resolve(__dirname, './test/playground/map-render/js/embedded'),
|
||||||
editor: path.resolve(__dirname, './test/playground/map-render/js/editor'),
|
editor: path.resolve(__dirname, './test/playground/map-render/js/editor'),
|
||||||
@ -23,6 +24,7 @@ const playgroundConfig = {
|
|||||||
historyApiFallback: true,
|
historyApiFallback: true,
|
||||||
port: 8081,
|
port: 8081,
|
||||||
open: false,
|
open: false,
|
||||||
|
writeToDisk: true,
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
|
@ -8,19 +8,20 @@ const { merge } = require('webpack-merge');
|
|||||||
const playgroundConfig = {
|
const playgroundConfig = {
|
||||||
mode: 'development',
|
mode: 'development',
|
||||||
entry: {
|
entry: {
|
||||||
|
mindplot: path.resolve(__dirname, './src/index.js'),
|
||||||
layout: path.resolve(__dirname, './test/playground/layout/context-loader'),
|
layout: path.resolve(__dirname, './test/playground/layout/context-loader'),
|
||||||
},
|
},
|
||||||
devServer: {
|
devServer: {
|
||||||
historyApiFallback: true,
|
historyApiFallback: true,
|
||||||
port: 8083,
|
port: 8083,
|
||||||
open: false,
|
open: false,
|
||||||
|
writeToDisk: true,
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
test: /\.css$/i,
|
test: /\.css$/i,
|
||||||
use: [
|
use: [
|
||||||
// compiles Less to CSS
|
|
||||||
'style-loader',
|
'style-loader',
|
||||||
'css-loader?url=false',
|
'css-loader?url=false',
|
||||||
],
|
],
|
||||||
|
66
yarn.lock
@ -3549,11 +3549,6 @@
|
|||||||
"@types/mime" "^1"
|
"@types/mime" "^1"
|
||||||
"@types/node" "*"
|
"@types/node" "*"
|
||||||
|
|
||||||
"@types/sinonjs__fake-timers@8.1.1":
|
|
||||||
version "8.1.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
|
|
||||||
integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
|
|
||||||
|
|
||||||
"@types/sinonjs__fake-timers@^6.0.2":
|
"@types/sinonjs__fake-timers@^6.0.2":
|
||||||
version "6.0.4"
|
version "6.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
|
resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
|
||||||
@ -4931,7 +4926,7 @@ buffer-indexof@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
|
resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
|
||||||
integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
|
integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
|
||||||
|
|
||||||
buffer@^5.5.0, buffer@^5.6.0:
|
buffer@^5.5.0:
|
||||||
version "5.7.1"
|
version "5.7.1"
|
||||||
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
|
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
|
||||||
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
|
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
|
||||||
@ -5326,15 +5321,6 @@ cli-table3@~0.6.0:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
colors "^1.1.2"
|
colors "^1.1.2"
|
||||||
|
|
||||||
cli-table3@~0.6.1:
|
|
||||||
version "0.6.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
|
|
||||||
integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
|
|
||||||
dependencies:
|
|
||||||
string-width "^4.2.0"
|
|
||||||
optionalDependencies:
|
|
||||||
colors "1.4.0"
|
|
||||||
|
|
||||||
cli-truncate@^2.1.0:
|
cli-truncate@^2.1.0:
|
||||||
version "2.1.0"
|
version "2.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
|
resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
|
||||||
@ -5458,7 +5444,7 @@ colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16:
|
|||||||
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
|
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
|
||||||
integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
|
integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
|
||||||
|
|
||||||
colors@1.4.0, colors@^1.1.2:
|
colors@^1.1.2:
|
||||||
version "1.4.0"
|
version "1.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
|
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
|
||||||
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
|
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
|
||||||
@ -6101,54 +6087,6 @@ cypress@^8.4.1:
|
|||||||
url "^0.11.0"
|
url "^0.11.0"
|
||||||
yauzl "^2.10.0"
|
yauzl "^2.10.0"
|
||||||
|
|
||||||
cypress@^9.3.1:
|
|
||||||
version "9.3.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.3.1.tgz#8116f52d49d6daf90a91e88f3eafd940234d2958"
|
|
||||||
integrity sha512-BODdPesxX6bkVUnH8BVsV8I/jn57zQtO1FEOUTiuG2us3kslW7g0tcuwiny7CKCmJUZz8S/D587ppC+s58a+5Q==
|
|
||||||
dependencies:
|
|
||||||
"@cypress/request" "^2.88.10"
|
|
||||||
"@cypress/xvfb" "^1.2.4"
|
|
||||||
"@types/node" "^14.14.31"
|
|
||||||
"@types/sinonjs__fake-timers" "8.1.1"
|
|
||||||
"@types/sizzle" "^2.3.2"
|
|
||||||
arch "^2.2.0"
|
|
||||||
blob-util "^2.0.2"
|
|
||||||
bluebird "^3.7.2"
|
|
||||||
buffer "^5.6.0"
|
|
||||||
cachedir "^2.3.0"
|
|
||||||
chalk "^4.1.0"
|
|
||||||
check-more-types "^2.24.0"
|
|
||||||
cli-cursor "^3.1.0"
|
|
||||||
cli-table3 "~0.6.1"
|
|
||||||
commander "^5.1.0"
|
|
||||||
common-tags "^1.8.0"
|
|
||||||
dayjs "^1.10.4"
|
|
||||||
debug "^4.3.2"
|
|
||||||
enquirer "^2.3.6"
|
|
||||||
eventemitter2 "^6.4.3"
|
|
||||||
execa "4.1.0"
|
|
||||||
executable "^4.1.1"
|
|
||||||
extract-zip "2.0.1"
|
|
||||||
figures "^3.2.0"
|
|
||||||
fs-extra "^9.1.0"
|
|
||||||
getos "^3.2.1"
|
|
||||||
is-ci "^3.0.0"
|
|
||||||
is-installed-globally "~0.4.0"
|
|
||||||
lazy-ass "^1.6.0"
|
|
||||||
listr2 "^3.8.3"
|
|
||||||
lodash "^4.17.21"
|
|
||||||
log-symbols "^4.0.0"
|
|
||||||
minimist "^1.2.5"
|
|
||||||
ospath "^1.2.2"
|
|
||||||
pretty-bytes "^5.6.0"
|
|
||||||
proxy-from-env "1.0.0"
|
|
||||||
request-progress "^3.0.0"
|
|
||||||
supports-color "^8.1.1"
|
|
||||||
tmp "~0.2.1"
|
|
||||||
untildify "^4.0.0"
|
|
||||||
url "^0.11.0"
|
|
||||||
yauzl "^2.10.0"
|
|
||||||
|
|
||||||
dargs@^4.0.1:
|
dargs@^4.0.1:
|
||||||
version "4.1.0"
|
version "4.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
|
resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
|
||||||
|