From 21bd9444f41948d9d787bf4f2c6f0cc6793558c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=97=E4=BD=A0=E6=98=AF=E5=B0=8F=E7=8C=AB=E5=92=AA?= Date: Mon, 25 May 2020 17:40:57 +0800 Subject: [PATCH] test: use azure deploy ui test report site (#24327) * test: use azure deploy ui test report site * parallel stage * continueOnError * fix continueOnError position * use github comment * failed * fix artifact name * add download path * ls files * fix path download * Install modules * update snapshot image * test: docker compose run test image * use docker * use docker update snapshots * remove unused dep * improve github comment and add doc * fix azure script * test faild condition * improve pass comment --- .dockerignore | 1 + .github/workflows/ui-ci.yml | 31 ---- Dockerfile.ui-test | 7 + azure-pipelines.yml | 150 ++++++++++++------ ...image-screenshot-should-correct-1-snap.png | Bin 0 -> 6904 bytes components/button/__tests__/image.test.js | 14 ++ ...image-screenshot-should-correct-1-snap.png | Bin 10490 -> 6872 bytes docker-compose.yml | 12 ++ docs/react/contributing.en-US.md | 1 + docs/react/contributing.zh-CN.md | 3 +- package.json | 5 +- scripts/azure-github-comment.js | 6 +- tests/shared/imageTest.ts | 11 +- 13 files changed, 158 insertions(+), 83 deletions(-) create mode 100644 .dockerignore delete mode 100644 .github/workflows/ui-ci.yml create mode 100644 Dockerfile.ui-test create mode 100644 components/button/__tests__/__image_snapshots__/image-test-js-button-image-image-test-component-image-screenshot-should-correct-1-snap.png create mode 100644 components/button/__tests__/image.test.js create mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..c2658d7d1b --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules/ diff --git a/.github/workflows/ui-ci.yml b/.github/workflows/ui-ci.yml deleted file mode 100644 index 6128c2bcc6..0000000000 --- a/.github/workflows/ui-ci.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: UI-TEST - -on: - issue_comment: - types: [created] - -jobs: - ui: - runs-on: ubuntu-latest - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/ui') - steps: - - name: checkout - uses: actions/checkout@master - - - name: install - run: npm install - - - name: dist - run: npm run dist - - - name: test - run: npm run test:image - - - name: VERCEL Now Deployment - uses: amondnet/now-deployment@v2.0.3 - with: - zeit-token: ${{ secrets.VERCEL_TOKEN }} - now-project-id: ${{ secrets.VERCEL_PROJECT_ID}} - now-org-id: ${{ secrets.VERCEL_ORG_ID}} - working-directory: ./jest-stare - if: failure() diff --git a/Dockerfile.ui-test b/Dockerfile.ui-test new file mode 100644 index 0000000000..3d74e67eee --- /dev/null +++ b/Dockerfile.ui-test @@ -0,0 +1,7 @@ +FROM buildkite/puppeteer:latest +RUN mkdir /app +WORKDIR /app +COPY package.json ./ +RUN npm install +ENV PATH="${PATH}:/app/node_modules/.bin" +COPY . . diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c14de49ddb..ea14f65edd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,50 +12,106 @@ pool: vmImage: 'ubuntu-latest' stages: -- stage: site - jobs: - - job: Build_Site - steps: - - checkout: self - displayName: 'Checkout' - clean: true - fetchDepth: 1 - - task: NodeTool@0 - displayName: 'Install Node.js' - inputs: - versionSpec: '12.13.1' - - script: npm install - displayName: 'Install modules' - - script: | - node ./scripts/azure-github-comment.js "[![Prepare preview](https://user-images.githubusercontent.com/5378891/72351368-2c979e00-371b-11ea-9652-eb4e825d745e.gif)](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))" - displayName: 'Comment on github' - - script: npm run site - displayName: 'Build sites' - - script: ls -al _site/ - displayName: 'List build' - - script: | - export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh - echo "Deploy to $DEPLOY_DOMAIN" - npx surge --project ./_site --domain $DEPLOY_DOMAIN - displayName: 'Deploy Site' - - script: | - export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh - node ./scripts/azure-github-comment.js "[]($DEPLOY_DOMAIN)" - displayName: 'Update comment on github' - - job: Build_Site_Failed - dependsOn: Build_Site - condition: failed() - steps: - - checkout: self - displayName: 'Checkout' - clean: true - fetchDepth: 1 - - task: NodeTool@0 - displayName: 'Install Node.js' - inputs: - versionSpec: '12.13.1' - - script: npm install - displayName: 'Install modules' - - script: | - node ./scripts/azure-github-comment.js "[](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))" - displayName: 'Comment on github' \ No newline at end of file + - stage: site + jobs: + - job: Build_Site + steps: + - checkout: self + displayName: 'Checkout' + clean: true + fetchDepth: 1 + - task: NodeTool@0 + displayName: 'Install Node.js' + inputs: + versionSpec: '12.13.1' + - script: npm install + displayName: 'Install modules' + - script: | + node ./scripts/azure-github-comment.js "[![Prepare preview](https://user-images.githubusercontent.com/5378891/72351368-2c979e00-371b-11ea-9652-eb4e825d745e.gif)](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))" + displayName: 'Comment on github' + - script: npm run site + displayName: 'Build sites' + - script: ls -al _site/ + displayName: 'List build' + - script: | + export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh + echo "Deploy to $DEPLOY_DOMAIN" + npx surge --project ./_site --domain $DEPLOY_DOMAIN + displayName: 'Deploy Site' + - script: | + export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh + node ./scripts/azure-github-comment.js "[]($DEPLOY_DOMAIN)" + displayName: 'Update comment on github' + - job: Build_Site_Failed + dependsOn: Build_Site + condition: failed() + steps: + - checkout: self + displayName: 'Checkout' + clean: true + fetchDepth: 1 + - task: NodeTool@0 + displayName: 'Install Node.js' + inputs: + versionSpec: '12.13.1' + - script: npm install + displayName: 'Install modules' + - script: | + node ./scripts/azure-github-comment.js "[](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))" + displayName: 'Comment on github' + - stage: ui + dependsOn: [] + jobs: + - job: UI_Test + steps: + - checkout: self + displayName: 'Checkout' + clean: true + fetchDepth: 1 + - task: NodeTool@0 + displayName: 'Install Node.js' + inputs: + versionSpec: '12.16.3' + - script: npm install + displayName: 'Install modules' + - script: | + node ./scripts/azure-github-comment.js -ui "[![UI Testing](https://user-images.githubusercontent.com/14831261/82744255-6bfc8800-9da8-11ea-9017-857933e8433b.gif)](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))" + displayName: 'Comment on github' + - script: npm run test-image + displayName: 'UI Test' + - task: PublishPipelineArtifact@1 + inputs: + targetPath: $(System.DefaultWorkingDirectory)/jest-stare + artifactName: jestStare + condition: failed() + - script: | + node ./scripts/azure-github-comment.js -ui "[](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))" + displayName: 'Update comment on github' + - job: UI_Test_Failed + dependsOn: UI_Test + condition: failed() + steps: + - checkout: self + displayName: 'Checkout' + clean: true + fetchDepth: 1 + - task: NodeTool@0 + displayName: 'Install Node.js' + inputs: + versionSpec: '12.13.1' + - script: npm install + displayName: 'Install modules' + - task: DownloadPipelineArtifact@2 + inputs: + artifact: jestStare + path: './jest-stare' + - script: ls -al ./jest-stare + displayName: 'List report' + - script: | + export DEPLOY_DOMAIN=https://ui-test-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh + echo "Deploy to $DEPLOY_DOMAIN" + npx surge --project ./jest-stare --domain $DEPLOY_DOMAIN + displayName: 'Deploy Report Site' + - script: | + node ./scripts/azure-github-comment.js -ui "[](https://ui-test-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh)" + displayName: 'Update comment on github' diff --git a/components/button/__tests__/__image_snapshots__/image-test-js-button-image-image-test-component-image-screenshot-should-correct-1-snap.png b/components/button/__tests__/__image_snapshots__/image-test-js-button-image-image-test-component-image-screenshot-should-correct-1-snap.png new file mode 100644 index 0000000000000000000000000000000000000000..74dc898ee47b02d7f8f3f995c66cb21e692011b4 GIT binary patch literal 6904 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 LAFuc&^w$3ZRF-Rq literal 0 HcmV?d00001 diff --git a/components/button/__tests__/image.test.js b/components/button/__tests__/image.test.js new file mode 100644 index 0000000000..a5a3285962 --- /dev/null +++ b/components/button/__tests__/image.test.js @@ -0,0 +1,14 @@ +import React from 'react'; +import Button from '..'; +import imageTest from '../../../tests/shared/imageTest'; + +describe('Button image', () => { + imageTest( + <> + + + + + , + ); +}); diff --git a/components/grid/__tests__/__image_snapshots__/image-test-js-grid-image-image-test-component-image-screenshot-should-correct-1-snap.png b/components/grid/__tests__/__image_snapshots__/image-test-js-grid-image-image-test-component-image-screenshot-should-correct-1-snap.png index 65341e5d009aff62d90a06f3fa534f88d2db9751..db6056e214e9fa4d07e8c6ad0f139e50c400505b 100644 GIT binary patch literal 6872 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 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..978e24c3a1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' +services: + tests: + build: + context: . + dockerfile: Dockerfile.ui-test + volumes: + - './components:/app/components' + - './tests:/app/tests' + - './jest-stare:/app/jest-stare' + - './dist:/app/dist' + entrypoint: "jest --config .jest.image.js --no-cache" diff --git a/docs/react/contributing.en-US.md b/docs/react/contributing.en-US.md index 11ea638390..0c4050cbc2 100644 --- a/docs/react/contributing.en-US.md +++ b/docs/react/contributing.en-US.md @@ -53,6 +53,7 @@ The core team is monitoring for pull requests. We will review your pull request 1. If you've fixed a bug or added code that should be tested, add tests! 1. Ensure the test suite passes (npm run test). Tip: `npm test -- --watch TestName` is helpful in development. 1. Run `npm test -- -u` to update the [jest snapshots](http://facebook.github.io/jest/docs/en/snapshot-testing.html#snapshot-testing-with-jest) and commit these changes as well (if there are any updates). +1. Ensure the UI change passes `npm run test-image`，Run `npm run test-image -- -u` to update UI snapshots and commit these changes as well (if there are any updates), **UI test base on [Docker](https://docs.docker.com/get-docker/), need download the corresponding installation according to the platform** 1. Make sure your code lints (npm run lint). Tip: Lint runs automatically when you `git commit` (Use [Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)). Sending a Pull Request to [react-component](https://github.com/react-component/): diff --git a/docs/react/contributing.zh-CN.md b/docs/react/contributing.zh-CN.md index 8c99122c0a..aed240d96d 100644 --- a/docs/react/contributing.zh-CN.md +++ b/docs/react/contributing.zh-CN.md @@ -53,7 +53,8 @@ Ant Design 团队会关注所有的 pull request，我们会 review 以及合并 3. 如果你修复了一个 bug 或者新增了一个功能，请确保写了相应的测试，这很重要。 4. 确认所有的测试都是通过的 `npm run test`。 小贴士：开发过程中可以用 `npm test -- --watch TestName` 来运行指定的测试。 5. 运行 `npm test -- -u` 来更新 [jest snapshot](http://facebook.github.io/jest/docs/en/snapshot-testing.html#snapshot-testing-with-jest) 并且把这些更新也提交上来（如果有的话）。 -6. 确保你的代码通过了 lint 检查 `npm run lint`. 小贴士: Lint 会在你 `git commit` 的时候自动运行（通过[Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)）。 +6. 确认所有的 UI 改动通过 `npm run test-image`，可以运行 `npm run test-image -- -u` 更新 UI 快照并且把这些更新也提交上来（如果有的话），**UI 测试基于 [Docker](https://docs.docker.com/get-docker/)，根据平台下载对应的安装程序。** +7. 确保你的代码通过了 lint 检查 `npm run lint`. 小贴士: Lint 会在你 `git commit` 的时候自动运行（通过[Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)）。 给 [react-component](https://github.com/react-component/) 发送 pull request： diff --git a/package.json b/package.json index 5fb5f32a09..427190ab53 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "presite": "npm run version", "color-less": "node ./scripts/generate-color-less", "compile": "antd-tools run compile", + "compile:less": "antd-tools run compile:less", "changelog": "node ./scripts/print-changelog", "predeploy": "antd-tools run clean && npm run site && cp CNAME _site && cp -r .circleci/ .github/ _site && npm run site:test", "deploy": "bisheng gh-pages --push-only --dotfiles", @@ -88,7 +89,7 @@ "test-node": "jest --config .jest.node.js --no-cache", "tsc": "tsc --noEmit", "site:test": "jest --config .jest.site.js --cache=false", - "test:image": "npm install puppeteer@2.1.1 --no-save && jest --config .jest.image.js --no-cache", + "test-image": "npm run compile:less && docker-compose run tests", "version": "node ./scripts/generate-version" }, "husky": { @@ -152,7 +153,7 @@ "@ant-design/bisheng-plugin": "^2.3.0", "@ant-design/colors": "^4.0.0", "@ant-design/hitu": "^0.0.0-alpha.13", - "@ant-design/tools": "^8.2.0", + "@ant-design/tools": "^9.0.0", "@bundle-analyzer/webpack-plugin": "^0.5.1", "@qixian.cs/github-contributors-list": "^1.0.3", "@stackblitz/sdk": "^1.3.0", diff --git a/scripts/azure-github-comment.js b/scripts/azure-github-comment.js index 7f42387529..c76e121b06 100644 --- a/scripts/azure-github-comment.js +++ b/scripts/azure-github-comment.js @@ -3,11 +3,15 @@ const fetch = require('node-fetch'); const REPO = process.env.ACCESS_REPO; const TOKEN = process.env.ACCESS_TOKEN; const PR = process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER; -const REPLACE_MARK = ''; const argv = process.argv; const comment = argv[argv.length - 1]; +const isUiTest = argv.includes('-ui'); + +const REPLACE_MARK = isUiTest + ? '' + : ''; const wrappedComment = ` ${REPLACE_MARK} diff --git a/tests/shared/imageTest.ts b/tests/shared/imageTest.ts index b9b3df77c0..60bcb7ffc8 100644 --- a/tests/shared/imageTest.ts +++ b/tests/shared/imageTest.ts @@ -14,7 +14,16 @@ export default function imageTest(component: React.ReactElement) { let page: Page; beforeAll(async () => { - browser = await puppeteer.launch(); + browser = await puppeteer.launch({ + args: [ + // Required for Docker version of Puppeteer + '--no-sandbox', + '--disable-setuid-sandbox', + // This will write shared memory files into /tmp instead of /dev/shm, + // because Docker’s default for /dev/shm is 64MB + '--disable-dev-shm-usage', + ], + }); page = await browser.newPage(); await page.goto(`file://${process.cwd()}/tests/index.html`); await page.addStyleTag({ path: `${process.cwd()}/dist/antd.css` });