Просмотр исходного кода

Merge pull request #377 from smiclea/fix-jest

Fix Jest's dependency vulnerability
Dorin Paslaru 6 лет назад
Родитель
Сommit
b2bdec7492
3 измененных файлов с 468 добавлено и 75 удалено
  1. 3 2
      package.json
  2. 1 1
      src/components/molecules/MainDetailsTable/test.jsx
  3. 464 72
      yarn.lock

+ 3 - 2
package.json

@@ -31,7 +31,8 @@
     "setupFiles": [
     "setupFiles": [
       "<rootDir>/private/jest/shim.js",
       "<rootDir>/private/jest/shim.js",
       "<rootDir>/private/jest/setupTests.js"
       "<rootDir>/private/jest/setupTests.js"
-    ]
+    ],
+    "testURL": "http://localhost/"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@storybook/react": "^3.2.15",
     "@storybook/react": "^3.2.15",
@@ -49,7 +50,7 @@
     "eslint-plugin-react": "7.10.0",
     "eslint-plugin-react": "7.10.0",
     "flow-bin": "0.78.0",
     "flow-bin": "0.78.0",
     "flow-typed": "2.5.1",
     "flow-typed": "2.5.1",
-    "jest": "^21.2.1",
+    "jest": "22",
     "react-test-renderer": "^16.0.0",
     "react-test-renderer": "^16.0.0",
     "sinon": "^4.1.2",
     "sinon": "^4.1.2",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-dev-middleware": "^1.12.0",

+ 1 - 1
src/components/molecules/MainDetailsTable/test.jsx

@@ -99,7 +99,7 @@ describe('MainDetailsTable Component', () => {
     expect(wrapper.findText('source-instance')).toBe('instance1')
     expect(wrapper.findText('source-instance')).toBe('instance1')
     expect(wrapper.findText('destination-instance')).toBe('instance1')
     expect(wrapper.findText('destination-instance')).toBe('instance1')
 
 
-    expect(wrapper.findText('source-network')).toBe('network1')
+    expect(wrapper.findText('source-network')).toBe('instance1macaddress')
     expect(wrapper.findText('destination-network')).toBe('network2')
     expect(wrapper.findText('destination-network')).toBe('network2')
 
 
     expect(wrapper.findText('source-storage')).toBe('instance1disk1')
     expect(wrapper.findText('source-storage')).toBe('instance1disk1')

Разница между файлами не показана из-за своего большого размера
+ 464 - 72
yarn.lock


Некоторые файлы не были показаны из-за большого количества измененных файлов