Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

split web-console e2e-tests from unit tests (#10173) 

* split web-console e2e-test from unit test

* fix stuff

* smaller change

* oops
This commit is contained in:
Clint Wylie 2020-07-12 18:51:08 -07:00 committed by GitHub
parent ebea73d081
commit 0a8fd62f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-console/jest.common.config.js
View File

@ -19,7 +19,4 @@
module.exports = { module.exports = {
"preset": "ts-jest", "preset": "ts-jest",
"testEnvironment": "jsdom", "testEnvironment": "jsdom",
"testMatch": [
"**/?(*.)+(spec).ts?(x)"
],
}; };

5
web-console/jest.e2e.config.js
View File

@ -19,7 +19,10 @@
const common = require('./jest.common.config'); const common = require('./jest.common.config');
module.exports = Object.assign(common, { module.exports = Object.assign(common, {
"testMatch": [
"**/?(*.)+(spec).ts?(x)"
],
"setupFilesAfterEnv": [ "setupFilesAfterEnv": [
"<rootDir>e2e-tests/util/setup.ts" "<rootDir>e2e-tests/util/setup.ts"
] ],
}); });

3
web-console/jest.unit.config.js
View File

@ -28,4 +28,7 @@ module.exports = Object.assign(common, {
"setupFilesAfterEnv": [ "setupFilesAfterEnv": [
"<rootDir>src/setup-tests.ts" "<rootDir>src/setup-tests.ts"
], ],
"testMatch": [
"**/src/**/?(*.)+(spec).(ts|tsx)"
],
}); });

2
web-console/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "web-console", "name": "web-console",
"version": "0.17.0", "version": "0.20.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

4
web-console/package.json
View File

@ -1,8 +1,8 @@
{ {
"name": "web-console", "name": "web-console",
"version": "0.17.0", "version": "0.20.0",
"description": "A web console for Apache Druid", "description": "A web console for Apache Druid",
"author": "Imply Data Inc.", "author": "Apache Druid Developers <dev@druid.apache.org>",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

1
web-console/pom.xml
View File

@ -125,6 +125,7 @@
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<environmentVariables><PATH>${project.build.directory}/node:${env.PATH}</PATH></environmentVariables>
<executable>script/build</executable> <executable>script/build</executable>
</configuration> </configuration>
</execution> </execution>

6
web-console/script/build
View File

@ -19,13 +19,13 @@
set -e set -e
echo "Adding SQL docs..." echo "Adding SQL docs..."
PATH="./target/node:$PATH" ./script/create-sql-docs.js ./script/create-sql-docs.js
echo "Transpiling ReactTable CSS..." echo "Transpiling ReactTable CSS..."
PATH="./target/node:$PATH" ./node_modules/.bin/stylus lib/react-table.styl -o lib/react-table.css ./node_modules/.bin/stylus lib/react-table.styl -o lib/react-table.css
# add BUNDLE_ANALYZER_PLUGIN='TRUE' here to enable webpack-bundle-analyzer as a plugin # add BUNDLE_ANALYZER_PLUGIN='TRUE' here to enable webpack-bundle-analyzer as a plugin
echo "Webpacking everything..." echo "Webpacking everything..."
PATH="./target/node:$PATH" NODE_ENV=production ./node_modules/.bin/webpack -c webpack.config.js NODE_ENV=production ./node_modules/.bin/webpack -c webpack.config.js
echo "Done! Have a good day." echo "Done! Have a good day."

2
web-console/unified-console.html
View File

@ -28,6 +28,6 @@
<body class="bp3-dark mouse-mode"> <body class="bp3-dark mouse-mode">
<div class="app-container"></div> <div class="app-container"></div>
<script src="console-config.js"></script> <script src="console-config.js"></script>
<script src="public/web-console-0.17.0.js"></script> <script src="public/web-console-0.20.0.js"></script>
</body> </body>
</html> </html>