Merge branch 'master' into extension-integration-2

This commit is contained in:
Nathan Bierema 2021-06-19 22:00:32 -04:00
commit d1243ee020
3 changed files with 10 additions and 1 deletions

5
.gitattributes vendored
View File

@ -6,3 +6,8 @@
*.css text eol=lf
*.html text eol=lf
*.md text eol=lf
*.yml text eol=lf
*.graphql text eol=lf
.eslintrc text eol=lf
.prettierrc text eol=lf
.babelrc text eol=lf

View File

@ -15,3 +15,7 @@ jobs:
- run: yarn install --immutable
- run: yarn build:all
- run: yarn test:all
- working-directory: ./extension
run: yarn install --immutable
- working-directory: ./extension
run: yarn test

View File

@ -5,4 +5,4 @@ import Adapter from 'enzyme-adapter-react-16';
Enzyme.configure({ adapter: new Adapter() });
jest.setTimeout(10000);
jest.setTimeout(50000);