Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testing environment #59

Merged
merged 6 commits into from
Feb 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions frontend/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# browserslist defaults and explicitly set IE 11 (should be included in > 0.5%)
> 0.5%
last 2 versions
Firefox ESR
not dead
IE 11
20 changes: 10 additions & 10 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"flow": "flow; test $? -eq 0 -o $? -eq 2",
"test": "rimraf coverage && NODE_ENV=test nyc _mocha test",
"test-watch": "NODE_ENV=test mocha test --watch",
"debug-test": "NODE_ENV=test node-debug --debug-brk --hidden node_modules _mocha test",
"debug-test": "NODE_ENV=test node-debug --debug-brk _mocha test",
"prepush": "npm run lint"
},
"files": [
Expand Down Expand Up @@ -59,7 +59,7 @@
"redux-thunk": "^2.1.0"
},
"devDependencies": {
"autoprefixer": "^7.2.5",
"autoprefixer": "^8.0.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^7.2.3",
Expand All @@ -70,9 +70,9 @@
"babel-preset-stage-1": "^6.24.1",
"babel-register": "^6.26.0",
"body-parser": "^1.18.2",
"chai": "^3.5.0",
"chai": "^4.1.2",
"css-loader": "^0.28.9",
"dirty-chai": "^1.2.2",
"dirty-chai": "^2.0.1",
"eslint": "^3.18.0",
"eslint-config-standard": "^7.1.0",
"eslint-config-standard-react": "^4.3.0",
Expand All @@ -83,7 +83,7 @@
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^6.5.0",
"eslint-plugin-standard": "^2.0.1",
"expect": "^1.20.2",
"expect": "^22.3.0",
"express": "^4.16.2",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.6",
Expand All @@ -95,13 +95,13 @@
"gulp-babel": "^7.0.1",
"html-webpack-plugin": "^2.30.1",
"husky": "^0.14.3",
"jsdom": "^11.3.0",
"jsdom": "^11.6.2",
"jsdom-global": "^3.0.2",
"mocha": "^3.1.2",
"mocha": "^5.0.1",
"mock-local-storage": "^1.0.5",
"nock": "^8.0.0",
"nock": "^9.1.6",
"node-sass": "^4.7.2",
"nyc": "^9.0.1",
"nyc": "^11.4.1",
"postcss-loader": "^2.1.0",
"progress-bar-webpack-plugin": "^1.10.0",
"raw-loader": "^0.5.1",
Expand All @@ -116,7 +116,7 @@
"url-loader": "^0.6.2",
"webpack": "^3.11.0",
"webpack-bundle-analyzer": "^2.10.0",
"webpack-dev-middleware": "^2.0.4",
"webpack-dev-middleware": "^2.0.5",
"webpack-hot-middleware": "^2.21.0",
"yaml-loader": "^0.5.0"
},
Expand Down
13 changes: 12 additions & 1 deletion frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>com.bakdata.conquery</groupId>
<artifactId>frontend</artifactId>
Expand Down Expand Up @@ -59,6 +59,17 @@
<arguments>build</arguments>
</configuration>
</execution>
<execution>
<id>yarn test</id>
<goals>
<goal>yarn</goal>
</goals>
<phase>test</phase>

<configuration>
<arguments>test</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion frontend/test/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--require babel-core/register
--require test/.setup
--require jsdom-global/register
--require mock-local-storage
--compilers js:babel-register
--reporter spec
--recursive
--ui bdd