Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Signe code to do the PR #2563

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
unit-test-web:
working_directory: ~/marquez/web
docker:
- image: circleci/node:12.22.7
- image: cimg/node:18.16.0
environment:
TZ: 'America/New_York'
steps:
Expand Down
2 changes: 1 addition & 1 deletion web/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {
'eslint:recommended',
'plugin:react/recommended',
'plugin:@typescript-eslint/recommended',
"prettier/@typescript-eslint",
"prettier",
"plugin:prettier/recommended"
],
settings: {
Expand Down
2 changes: 1 addition & 1 deletion web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:18-alpine
WORKDIR /usr/src/app
RUN apk update && apk add --virtual bash coreutils
RUN apk add --no-cache git
Expand Down
7 changes: 3 additions & 4 deletions web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Requirements

To develop on this project, you need to have Node version 12.22.7 installed. In order to easily switch between node versions, we recommend using node version manager like [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md)
To develop on this project, you need to have Node version 18 installed. In order to easily switch between node versions, we recommend using node version manager like [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md)

### Development

Expand Down Expand Up @@ -37,11 +37,10 @@ To develop on this project, you need to have Node version 12.22.7 installed. In
### Testing Setup

- [Jest](https://jestjs.io/en/) is our testing framework. It is the test runner; it provides testing language (describe, it, beforeEach), mocking, snapshot, code coverage.
- [Enzyme](https://github.com/airbnb/enzyme) - testing utility for testing React components. Provides methods for (mock) rendering components & DOM traversal.
- run tests by doing `yarn run test`
- [test-labrary](https://testing-library.com/)
- run tests by doing `npm run test`
- config files:
- jest.config.js
- setupEnzyme.ts
- For testing Redux Sagas, we are using `Redux Saga Test Plan`. This library gives us both unit testing and integration test functionality. Check out the [docs](http://redux-saga-test-plan.jeremyfairbank.com/).

### Typescript
Expand Down
1 change: 1 addition & 0 deletions web/db.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
16 changes: 9 additions & 7 deletions web/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
module.exports = {
roots: ['<rootDir>/src'],
transform: {
'^.+\\.tsx?$': 'ts-jest'
'^.+\\.tsx?$': [
'ts-jest',
{
isolatedModules: 'true'
}
]
},
testRegex: '__tests__/(.+).(test|spec).tsx?',
testPathIgnorePatterns: ['<rootDir>/src/__tests__(.+)__snapshots__'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
snapshotSerializers: ['enzyme-to-json/serializer'],
setupTestFrameworkScriptFile: '<rootDir>/setupEnzyme.ts',
globalSetup: '<rootDir>globalSetup.ts',
setupFiles: ['<rootDir>setupJest.ts'],
testEnvironment: 'jsdom',
globals: {
'ts-jest': {
isolatedModules: 'true'
},
__API_URL__: '/api/v1',
__FEEDBACK_FORM_URL__: 'https://forms.gle/f3tTSrZ8wPj3sHTA7',
__API_DOCS_URL__: 'https://marquezproject.github.io/marquez/openapi.html',
Expand All @@ -23,6 +23,8 @@ module.exports = {
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
'<rootDir>/__tests__/__mocks__/fileMock.js',
'\\.(css|less)$': 'identity-obj-proxy'
'\\.(css|less)$': 'identity-obj-proxy',
"d3": "<rootDir>/node_modules/d3/dist/d3.min.js",
"^d3-(.*)$": "<rootDir>/node_modules/d3-$1/dist/d3-$1.min.js"
}
}
Loading