Browse Source

fix ci

pull/1528/head
jim 9 years ago
committed by 陈帅
parent
commit
0af3300c7a
  1. 13
      .babelrc.js
  2. 6
      package.json
  3. 2
      src/e2e/home.e2e.js
  4. 2
      src/e2e/login.e2e.js
  5. 2
      src/routes/Result/Success.js

13
.babelrc.js

@ -1,12 +1,21 @@
const path = require('path');
module.exports = { module.exports = {
plugins: [ plugins: [
[ [
'babel-plugin-module-resolver', 'babel-plugin-module-resolver',
{ {
alias: { alias: {
components: './src/components', components: path.join(__dirname, './src/components'),
}, },
}, },
], ],
[
'import',
{
libraryName: 'antd',
style: true, // or 'css'
},
],
], ],
}; };

6
package.json

@ -23,8 +23,6 @@
"dependencies": { "dependencies": {
"@antv/data-set": "^0.8.0", "@antv/data-set": "^0.8.0",
"@babel/polyfill": "^7.0.0-beta.36", "@babel/polyfill": "^7.0.0-beta.36",
"@types/react": "^16.3.8",
"@types/react-dom": "^16.0.5",
"antd": "^3.4.3", "antd": "^3.4.3",
"antd-theme-webpack-plugin": "^1.0.8", "antd-theme-webpack-plugin": "^1.0.8",
"babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-decorators-legacy": "^1.3.4",
@ -53,6 +51,8 @@
"url-polyfill": "^1.0.10" "url-polyfill": "^1.0.10"
}, },
"devDependencies": { "devDependencies": {
"@types/react": "^16.3.8",
"@types/react-dom": "^16.0.5",
"babel-eslint": "^8.1.2", "babel-eslint": "^8.1.2",
"babel-plugin-dva-hmr": "^0.4.1", "babel-plugin-dva-hmr": "^0.4.1",
"babel-plugin-import": "^1.6.7", "babel-plugin-import": "^1.6.7",
@ -84,7 +84,7 @@
"stylelint-config-standard": "^18.0.0" "stylelint-config-standard": "^18.0.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"puppeteer": "^1.1.1" "puppeteer": "^1.3.0"
}, },
"lint-staged": { "lint-staged": {
"**/*.{js,jsx,less}": [ "**/*.{js,jsx,less}": [

2
src/e2e/home.e2e.js

@ -4,7 +4,7 @@ describe('Homepage', () => {
it('it should have logo text', async () => { it('it should have logo text', async () => {
const browser = await puppeteer.launch(); const browser = await puppeteer.launch();
const page = await browser.newPage(); const page = await browser.newPage();
await page.goto('http://localhost:8000'); await page.goto('http://localhost:8000', { waitUntil: 'networkidle2' });
await page.waitForSelector('h1'); await page.waitForSelector('h1');
const text = await page.evaluate(() => document.body.innerHTML); const text = await page.evaluate(() => document.body.innerHTML);
expect(text).toContain('<h1>Ant Design Pro</h1>'); expect(text).toContain('<h1>Ant Design Pro</h1>');

2
src/e2e/login.e2e.js

@ -10,7 +10,7 @@ describe('Login', () => {
beforeEach(async () => { beforeEach(async () => {
page = await browser.newPage(); page = await browser.newPage();
await page.goto('http://localhost:8000/#/user/login'); await page.goto('http://localhost:8000/#/user/login', { waitUntil: 'networkidle2' });
await page.evaluate(() => window.localStorage.setItem('antd-pro-authority', 'guest')); await page.evaluate(() => window.localStorage.setItem('antd-pro-authority', 'guest'));
}); });

2
src/routes/Result/Success.js

@ -1,6 +1,6 @@
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import { Button, Row, Col, Icon, Steps, Card } from 'antd'; import { Button, Row, Col, Icon, Steps, Card } from 'antd';
import Result from 'components/Result'; import Result from '../../components/Result';
import PageHeaderLayout from '../../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
const { Step } = Steps; const { Step } = Steps;

Loading…
Cancel
Save