Skip to content

Commit

Permalink
fix(dependencies): update dev config
Browse files Browse the repository at this point in the history
  • Loading branch information
100stacks committed Apr 30, 2020
1 parent 47a6793 commit 26e23e6
Show file tree
Hide file tree
Showing 7 changed files with 373 additions and 216 deletions.
23 changes: 17 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
<!-- JIRA story identifier (e.g., SURF-1234) -->
JIRA:
## Description

### LGTM's
* [ ] Dev LGTM
* [ ] Dev LGTM
<!--* [ ] Design LGTM --><!-- uncomment if PR has any noticeable visual changes -->
**[Remove this line]** _Provide a short description._

### What are the relevant story cards/tickets? Any additional PRs or other references?

Jira:

## Before you request a review for this PR:

- [ ] Did you manually test in recent versions of modern browsers (Chrome, Firefox, Safari, and Chromium-based Edge)?
- [ ] Did you manually test in IE and legacy Edge?
- [ ] Did you add unit tests for any new code if needed?
- [ ] Did you run the unit tests via `yarn test` to ensure they all pass?
- [ ] Did you update the demo page and documentation if you changed/added functionality?
- [ ] If needed, did you add or modify the demo test page to test the changed/added functionality?
- [ ] Did you assign reviewers?
- [ ] Have you linked to this PR from the Jira ticket(s)?
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ before_script:
script:
- yarn lint
#- yarn test:coverage
# - yarn generate
# - yarn test
- yarn generate
- yarn test
7 changes: 5 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const merge = require('deepmerge');
module.exports = config => {
config.set(
merge(createDefaultConfig(config), {
// basePath: '',
files: [
// runs all files ending with .test in the test folder,
// can be overwritten by passing a --grep flag. examples:
Expand All @@ -14,7 +13,11 @@ module.exports = config => {
// npm run test -- --grep test/bar/*
//{ pattern: config.grep ? config.grep : 'test/**/*.test.js', type: 'module' },
{ pattern:
config.grep ? config.grep : 'public/dist/js/helix-ui.module.*.js',
config.grep ? config.grep : 'dist/js/helix-ui.js',
type: 'js'
},
{ pattern:
config.grep ? config.grep : 'dist/js/helix-ui.module.js',
type: 'module'
},
{ pattern:
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-node-resolve": "^7.1.1",
"@rollup/pluginutils": "^3.0.8",
"@open-wc/testing": "^2.5.10",
"@open-wc/testing-karma": "^3.3.11",
"@open-wc/testing": "2.5.13",
"@open-wc/testing-karma": "3.3.15",
"@webcomponents/webcomponentsjs": "^2.4.3",
"babel-loader": "^8.1.0",
"browser-sync": "^2.26.7",
Expand All @@ -44,9 +44,10 @@
"jsdoc": "^3.6.4",
"jsdom": "^12.2.0",
"json5": "^2.1.3",
"karma": "^5.0.1",
"karma": "5.0.2",
"less": "^3.11.1",
"less-loader": "^5.0.0",
"lit-element": "^2.3.1",
"lit-html": "^1.2.1",
"lodash": "^4.17.15",
"mocha": "^5.2.0",
Expand Down
3 changes: 1 addition & 2 deletions src/elements/hx-alert/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { fixture, expect } from '@open-wc/testing';

// FIXME: https://stackoverflow.com/questions/57318234/importing-node-core-modules-breaks-karma-tests-using-open-wc-testing-karma
import HelixUI from 'https://unpkg.com/helix-ui@0.20.0/dist/js/helix-ui.js';
import HelixUI from '../../../dist/js/helix-ui.module.js';

/**
* <hx-alert> component tests
Expand Down
1 change: 0 additions & 1 deletion src/elements/hx-busy/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { fixture, expect } from '@open-wc/testing';
* @type HXBusyElement
*
*/

describe('<hx-busy> tests', () => {
const template = '<hx-busy>';

Expand Down
Loading

0 comments on commit 26e23e6

Please sign in to comment.