Skip to content

Commit

Permalink
chore: use web-test-runner and move karma packages
Browse files Browse the repository at this point in the history
Co-authored-by: Thomas Allmer <d4kmor@gmail.com>
  • Loading branch information
manolakis and daKmoR committed Oct 24, 2020
1 parent f64c85b commit 6343304
Show file tree
Hide file tree
Showing 74 changed files with 1,592 additions and 8,059 deletions.
30 changes: 15 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: 2.1
defaults: &defaults
working_directory: ~/repo
docker:
- image: circleci/node:10.16.0-browsers
- image: circleci/node:14-browsers

jobs:
build:
Expand Down Expand Up @@ -44,16 +44,16 @@ jobs:
- run: npm run lint
- run: npm run test:node
- run: npm run test:browser
test-bs:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- v4-dependencies-{{ checksum "yarn.lock" }}
- attach_workspace:
at: ~/
- run: npm run test:bs
# test-bs:
# <<: *defaults
# steps:
# - checkout
# - restore_cache:
# keys:
# - v4-dependencies-{{ checksum "yarn.lock" }}
# - attach_workspace:
# at: ~/
# - run: npm run test:bs
# test-windows:
# executor: windows/default
# steps:
Expand Down Expand Up @@ -90,13 +90,13 @@ workflows:
- test-local:
requires:
- build
- test-bs:
requires:
- build
# - test-bs:
# requires:
# - build
- deploy:
requires:
- test-local
- test-bs
# - test-bs
filters:
branches:
only: master
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
56 changes: 0 additions & 56 deletions karma.bs.conf.js

This file was deleted.

34 changes: 0 additions & 34 deletions karma.conf.js

This file was deleted.

8 changes: 0 additions & 8 deletions karma.js

This file was deleted.

12 changes: 3 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,8 @@
"site:start": "npm run docs:start",
"start": "npm run docs:start",
"test": "yarn test:browser && yarn test:node",
"test:browser": "node ./karma.js start --coverage",
"test:browser:prune-snapshots": "node ./karma.js start --prune-snapshots",
"test:browser:update-snapshots": "node ./karma.js start --update-snapshots",
"test:browser:watch": "node ./karma.js start --auto-watch=true --single-run=false",
"test:bs": "node ./karma.js start karma.bs.conf.js --coverage",
"test:browser": "web-test-runner",
"test:node": "lerna run test:node --stream",
"test:node-windows": "lerna run --scope \"@open-wc/rollup-plugin-html\" --scope \"@open-wc/rollup-plugin-polyfills-loader\" --scope \"polyfills-loader\" test:node",
"test:update-snapshots": "lerna run test:update-snapshots",
"update-dependency": "node scripts/update-dependency.js"
},
"dependencies": {
Expand All @@ -43,14 +37,14 @@
"@commitlint/config-conventional": "7.1.2",
"@commitlint/config-lerna-scopes": "7.2.1",
"@github/clipboard-copy-element": "^1.1.1",
"@open-wc/testing-karma": "file:./packages/testing-karma",
"@open-wc/testing-karma-bs": "file:./packages/testing-karma-bs",
"@types/aria-query": "^4.2.0",
"@types/chai": "^4.2.11",
"@types/chai-fs": "^2.0.2",
"@types/eslint": "^7.2.4",
"@types/estree": "^0.0.45",
"@types/parse5-htmlparser2-tree-adapter": "^5.0.1",
"@web/test-runner": "^0.9.5",
"@web/test-runner-playwright": "^0.6.4",
"babel-eslint": "^10.0.3",
"chai": "^4.2.0",
"core-js": "2.6.10",
Expand Down

0 comments on commit 6343304

Please sign in to comment.