Skip to content

Commit 0238aac

Browse files
authored
Merge pull request #887 from HelixDesignSystem/surf-2212-pipeline
chore(dependencies): update package.json
2 parents 06c6cd1 + c7f4151 commit 0238aac

File tree

7 files changed

+1735
-850
lines changed

7 files changed

+1735
-850
lines changed

.github/workflows/browser-tests.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ jobs:
2424
uses: actions/[email protected]
2525
with:
2626
node-version: 12.x
27-
- run: yarn install:clean
28-
- run: yarn compile --prod
27+
# running this test on TravisCI vs GH Actions
28+
# - run: yarn install:clean
29+
# - run: yarn compile --prod
2930

30-
- run: yarn test:sauce
31-
env:
32-
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
33-
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
34-
GA_RUN_ID: github-${{ github.WORKFLOW }}-${{ github.RUN_NUMBER }}-RUN-${{ github.RUN_ID }}
35-
if: ${{ env.SAUCE_USERNAME != null }}
31+
# - run: yarn test:sauce
32+
# env:
33+
# SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
34+
# SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
35+
# GA_RUN_ID: github-${{ github.WORKFLOW }}-${{ github.RUN_NUMBER }}-RUN-${{ github.RUN_ID }}
36+
# if: ${{ env.SAUCE_USERNAME != null }}

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ jobs:
2727
- run: yarn install:clean
2828
- run: yarn lint
2929
- run: yarn generate
30-
- run: yarn compile --prod
31-
- run: yarn test
30+
- run: yarn test:build

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo "Running extended test suite...";
2727
yarn test;
2828
echo "Running Sauce tests...";
29-
yarn test || travis_terminate 1;
29+
yarn test:sauce || travis_terminate 1;
3030
else
3131
echo "Running standard test suite...";
3232
yarn test || travis_terminate 1;

karma.sauce.config.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ const batches = {
1616
base: 'SauceLabs',
1717
browserName: 'safari',
1818
platform: 'OS X 10.13',
19-
version: 'latest-2'
19+
version: 'latest-1'
2020
},
2121
mac_chrome: {
2222
base: 'SauceLabs',
2323
browserName: 'chrome',
2424
platform: 'OS X 10.13',
25-
version: 'latest-1'
25+
version: '88.0'
2626
},
2727
// win_edge_legacy: {
2828
// base: 'SauceLabs',
@@ -36,12 +36,12 @@ const batches = {
3636
platform: 'Windows 10',
3737
version: '11.285',
3838
},
39-
win_edge_chromium: {
40-
base: 'SauceLabs',
41-
browserName: 'microsoftedge',
42-
platform: 'Windows 10',
43-
version: 'latest-1'
44-
},
39+
// win_edge_chromium: {
40+
// base: 'SauceLabs',
41+
// browserName: 'MicrosoftEdge',
42+
// platform: 'Windows 10',
43+
// version: 'latest-1'
44+
// },
4545
};
4646

4747
module.exports = config => {

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"@rollup/plugin-json": "^4.0.0",
2222
"@rollup/plugin-node-resolve": "^7.1.1",
2323
"@rollup/pluginutils": "^3.0.8",
24-
"@open-wc/testing": "2.5.13",
25-
"@open-wc/testing-karma": "3.3.15",
24+
"@open-wc/testing": "2.5.33",
25+
"@open-wc/testing-karma": "3.4.8",
2626
"@webcomponents/webcomponentsjs": "^2.4.3",
2727
"babel-loader": "^8.1.0",
28-
"browser-sync": "^2.26.7",
28+
"browser-sync": "^2.27.4",
2929
"chai": "^4.2.0",
3030
"cheerio": "^1.0.0-rc.2",
3131
"clean-css": "^4.1.9",
@@ -41,10 +41,10 @@
4141
"gulp": "^4.0.2",
4242
"gulp-tar": "^3.1.0",
4343
"highlight.js": "^9.12.0",
44-
"jsdoc": "^3.6.4",
44+
"jsdoc": "^3.6.7",
4545
"jsdom": "^12.2.0",
4646
"json5": "^2.1.3",
47-
"karma": "5.0.2",
47+
"karma": "^5.2.3",
4848
"karma-sauce-launcher": "~4.1.4",
4949
"less": "^3.11.1",
5050
"less-loader": "^5.0.0",
@@ -55,7 +55,7 @@
5555
"moment": "^2.18.1",
5656
"node-sass": "^4.12.0",
5757
"nunjucks": "^3.0.1",
58-
"nyc": "^13.0.1",
58+
"nyc": "^14.1.1",
5959
"raw-loader": "^4.0.0",
6060
"rollup": "^1.32.1",
6161
"rollup-plugin-babel": "^4.4.0",
@@ -64,12 +64,12 @@
6464
"rollup-plugin-terser": "^5.1.2",
6565
"sinon": "^6.3.5",
6666
"sinon-chai": "^3.2.0",
67-
"stylelint": "^13.3.0",
67+
"stylelint": "^13.13.1",
6868
"svg-inline-loader": "^0.8.2",
6969
"tar": "^6.0.0",
7070
"webpack": "^4.42.1",
7171
"whatwg-fetch": "^2.0.4",
72-
"yargs": "^14.2.0"
72+
"yargs": "^17.0.1"
7373
},
7474
"bundledDependencies": [
7575
"@webcomponents/webcomponentsjs"
@@ -95,6 +95,7 @@
9595
"test:unit:deprecated": "mocha test/run_unit.js",
9696
"test:deprecated": "cd test; yarn test",
9797
"test": "karma start",
98+
"test:build": "yarn compile --prod && yarn test",
9899
"test:sauce": "karma start karma.sauce.config.js",
99100
"test:update": "karma start --update-snapshots",
100101
"test:prune": "karma start --prune-snapshots",

src/elements/hx-tooltip/index.spec.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,6 @@ describe('<hx-tooltip> component tests', () => {
131131
});
132132
});
133133

134-
describe('test $onConnect method', () => {
135-
it('should have role attribute default to tooltip', async () => {
136-
const roleAttr = 'tooltip';
137-
const component = /** @type {HXTooltipElement} */ await fixture(template);
138-
const attr = component.hasAttribute('role');
139-
const role = component.getAttribute('role');
140-
141-
expect(attr).to.be.true;
142-
expect(role).to.equal(roleAttr);
143-
});
144-
});
145-
146134
describe('test <hx-tooltip> getters and setters', () => {
147135
it('should get *for* value', async () => {
148136
const forValue = 'icon1';

0 commit comments

Comments
 (0)