diff --git a/.circleci/config.yml b/.circleci/config.yml index 0372834b02..33dfb660fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,13 +10,6 @@ references: attach_workspace: at: ~/ant-design - install_react: &install_react - run: REACT=15 ./scripts/install-react.sh - - react_15: &react_15 - environment: - REACT: 15 - react_16: &react_16 environment: REACT: 16 @@ -51,21 +44,6 @@ references: - test_node: requires: - setup - - test_dist_15: - requires: - - dist - - test_lib_15: - requires: - - compile - - test_es_15: - requires: - - compile - - test_dom_15: - requires: - - setup - - test_node_15: - requires: - - setup jobs: setup: @@ -169,60 +147,6 @@ jobs: - *attach_workspace - run: npm run test-node -- -w 1 - test_dist_15: - <<: *container_config - <<: *react_15 - steps: - - checkout - - *attach_workspace - - *install_react - - run: - command: npm test -- -w 1 -u - environment: - LIB_DIR: dist - - test_lib_15: - <<: *container_config - <<: *react_15 - steps: - - checkout - - *attach_workspace - - *install_react - - run: - command: npm test -- -w 1 -u - environment: - LIB_DIR: lib - - test_es_15: - <<: *container_config - <<: *react_15 - steps: - - checkout - - *attach_workspace - - *install_react - - run: - command: npm test -- -w 1 -u - environment: - LIB_DIR: es - - test_dom_15: - <<: *container_config - <<: *react_15 - steps: - - checkout - - *attach_workspace - - *install_react - - run: npm test -- -w 1 -u - - test_node_15: - <<: *container_config - <<: *react_15 - steps: - - checkout - - *attach_workspace - - *install_react - - run: npm run test-node -- -w 1 -u - workflows: version: 2 build_test: diff --git a/.travis.yml b/.travis.yml index 1254d66280..30d62bdbb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,19 +13,11 @@ matrix: fast_finish: true include: - env: TEST_TYPE=lint - - env: REACT=16 TEST_TYPE=test:dist - - env: REACT=16 TEST_TYPE=test:lib - - env: REACT=16 TEST_TYPE=test:es - - env: REACT=16 TEST_TYPE=test:dom - - env: REACT=16 TEST_TYPE=test:node - - env: REACT=15 TEST_TYPE=test:dist - - env: REACT=15 TEST_TYPE=test:lib - - env: REACT=15 TEST_TYPE=test:es - - env: REACT=15 TEST_TYPE=test:dom - - env: REACT=15 TEST_TYPE=test:node - -before_script: - - scripts/install-react.sh + - env: TEST_TYPE=test:dist + - env: TEST_TYPE=test:lib + - env: TEST_TYPE=test:es + - env: TEST_TYPE=test:dom + - env: TEST_TYPE=test:node script: - scripts/travis-script.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2d77d20ca5..260d7b3ca0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,21 +33,6 @@ jobs: node-react@16: REACT: 16 TEST_TYPE: test:node - dist-react@15: - REACT: 15 - TEST_TYPE: test:dist - lib-react@15: - REACT: 15 - TEST_TYPE: test:lib - es-react@15: - REACT: 15 - TEST_TYPE: test:es - dom-react@15: - REACT: 15 - TEST_TYPE: test:dom - node-react@15: - REACT: 15 - TEST_TYPE: test:node steps: - checkout: self fetchDepth: 1 @@ -57,8 +42,6 @@ jobs: versionSpec: '10.x' - script: npm install displayName: install - - script: scripts/install-react.sh - displayName: install-react - script: scripts/travis-script.sh displayName: test - task: PublishBuildArtifacts@1 diff --git a/components/_util/__tests__/util.test.js b/components/_util/__tests__/util.test.js index 2f581d8089..a7a263b3b2 100644 --- a/components/_util/__tests__/util.test.js +++ b/components/_util/__tests__/util.test.js @@ -179,9 +179,6 @@ describe('Test utils function', () => { }); it('should not throw when no children', () => { - if (process.env.REACT === '15') { - return; - } expect(() => mount()).not.toThrow(); }); }); diff --git a/components/button/__tests__/index.test.js b/components/button/__tests__/index.test.js index 4dea37683c..d9cd11a56b 100644 --- a/components/button/__tests__/index.test.js +++ b/components/button/__tests__/index.test.js @@ -11,9 +11,6 @@ describe('Button', () => { }); it('mount correctly', () => { - if (process.env.REACT === '15') { - return; - } expect(() => renderer.create()).not.toThrow(); }); diff --git a/components/comment/__tests__/__snapshots__/demo.test.js.snap b/components/comment/__tests__/__snapshots__/demo.test.js.snap index b006039407..e20b6d6e68 100644 --- a/components/comment/__tests__/__snapshots__/demo.test.js.snap +++ b/components/comment/__tests__/__snapshots__/demo.test.js.snap @@ -150,46 +150,38 @@ exports[`renders ./components/comment/demo/editor.md correctly 1`] = ` >
- -