Skip to content
This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #139 from AirGrid/release/v0.0.0-dev.33
Browse files Browse the repository at this point in the history
release: v0.0.0-dev.33 to MASTER
  • Loading branch information
ydennisy authored Mar 3, 2021
2 parents 233539c + 2a76ba3 commit dd9208e
Show file tree
Hide file tree
Showing 46 changed files with 19,318 additions and 3,654 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ module.exports = {
'plugin:@typescript-eslint/recommended',
'prettier/@typescript-eslint',
'plugin:prettier/recommended',
'plugin:jest-playwright/recommended',
],
};
2 changes: 2 additions & 0 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- uses: microsoft/playwright-github-action@v1

- name: Use Node v12
uses: actions/setup-node@v1
with:
Expand Down
15 changes: 15 additions & 0 deletions jest-playwright.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
browsers: ['chromium', 'firefox', 'webkit'],
serverOptions: [
{
command: 'npx serve -C -l 8000 dist/sdk',
port: 8000,
launchTimeout: 15000,
},
{
command: 'npx serve -l 9000 test/fixtures',
port: 9000,
launchTimeout: 25000,
},
],
};
8 changes: 8 additions & 0 deletions jest.e2e.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
verbose: true,
preset: 'jest-playwright-preset',
testMatch: ['**/test/e2e/**/?(*.)+(test).+(ts|js)'],
transform: {
'^.+\\.ts$': 'ts-jest',
},
};
4 changes: 4 additions & 0 deletions jest.config.js → jest.unit.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
module.exports = {
verbose: true,
preset: 'ts-jest',
testEnvironment: 'jsdom',
testMatch: [
'**/test/unit/**/?(*.)+(test).+(ts|js)',
],
automock: false,
setupFiles: ['./test/setupJest.ts'],
modulePaths: ['<rootDir>'],
Expand Down
Loading

0 comments on commit dd9208e

Please sign in to comment.