Skip to content

Commit

Permalink
Merge pull request #15543 from qmonmert/react/jest
Browse files Browse the repository at this point in the history
[React] Improve migration to Jest 27
  • Loading branch information
mshima authored Jul 4, 2021
2 parents fd74153 + d797602 commit 0392098
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 26 deletions.
1 change: 1 addition & 0 deletions generators/client/templates/react/jest.conf.js.ejs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const tsconfig = require('./tsconfig.json');

module.exports = {
testEnvironment: 'jsdom',
transform: {
'^.+\\.tsx?$': 'ts-jest'
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>
/**
* @jest-environment jsdom
*/
import axios from 'axios';
import sinon from 'sinon';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>

/**
* @jest-environment jsdom
*/
import configureStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import axios from 'axios';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
import React from 'react';
import { Router } from 'react-router-dom';
import { createMemoryHistory } from 'history';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
import React from 'react';
import { Router } from 'react-router-dom';
import { createMemoryHistory } from 'history';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/**
* @jest-environment jsdom
*/
import React from 'react';
import { render } from '@testing-library/react';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>
/**
* @jest-environment jsdom
*/
import React from 'react';
import { render } from '@testing-library/react';
import { Provider } from 'react-redux';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>
/**
* @jest-environment jsdom
*/
import React from 'react';
import { render } from '@testing-library/react';
import { Router } from 'react-router-dom';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>

/**
* @jest-environment jsdom
*/
import thunk from 'redux-thunk';
import axios from 'axios';
import sinon from 'sinon';
Expand Down

0 comments on commit 0392098

Please sign in to comment.