feat: assert module

2025-02-17 13:49:43 +08:00 · 2017-10-23 20:05:00 +08:00 · 2017-10-23 20:05:00 +08:00 · fe0f085da1
commit fe0f085da1
parent a3fdd10a66
5 changed files with 124 additions and 74 deletions
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceCaseContent.js
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceCaseContent.js
@ -76,8 +76,8 @@ export default class InterfaceCaseContent extends Component {
    let currColId = this.getColId(result.payload.data.data, currCaseId);
    this.props.history.push('/project/' + params.id + '/interface/case/' + currCaseId)
    await this.props.fetchCaseData(currCaseId)
-    this.props.setColData({currCaseId: +currCaseId, currColId, isShowCol: false})
-    this.setState({editCasename: this.props.currCase.casename})
+    this.props.setColData({ currCaseId: +currCaseId, currColId, isShowCol: false })
+    this.setState({ editCasename: this.props.currCase.casename })
  }

  async componentWillReceiveProps(nextProps) {
@ -87,8 +87,8 @@ export default class InterfaceCaseContent extends Component {
    let currColId = this.getColId(interfaceColList, newCaseId);
    if (oldCaseId !== newCaseId) {
      await this.props.fetchCaseData(newCaseId);
-      this.props.setColData({currCaseId: +newCaseId, currColId, isShowCol: false})
-      this.setState({editCasename: this.props.currCase.casename})
+      this.props.setColData({ currCaseId: +newCaseId, currColId, isShowCol: false })
+      this.setState({ editCasename: this.props.currCase.casename })
    }
  }

@ -97,7 +97,7 @@ export default class InterfaceCaseContent extends Component {
  }

  updateCase = async () => {
-    
+
    const {
      caseEnv: case_env,
      pathname: path,
@ -110,9 +110,9 @@ export default class InterfaceCaseContent extends Component {
      bodyOther: req_body_other,
      resMockTest: mock_verify
    } = this.postman.state;
-    
-    const {editCasename: casename} = this.state;
-    const {_id: id} = this.props.currCase;
+
+    const { editCasename: casename } = this.state;
+    const { _id: id } = this.props.currCase;
    let params = {
      id,
      casename,
@ -127,15 +127,15 @@ export default class InterfaceCaseContent extends Component {
      req_body_other,
      mock_verify
    };
-    if(this.postman.state.test_status !== 'error'){
+    if (this.postman.state.test_status !== 'error') {
      params.test_res_body = this.postman.state.res;
      params.test_report = this.postman.state.validRes;
      params.test_status = this.postman.state.test_status;
      params.test_res_header = this.postman.state.resHeader;
    }

- 
-    if(params.test_res_body && typeof params.test_res_body === 'object'){
+
+    if (params.test_res_body && typeof params.test_res_body === 'object') {
      params.test_res_body = JSON.stringify(params.test_res_body, null, '   ');
    }

@ -167,30 +167,18 @@ export default class InterfaceCaseContent extends Component {
  render() {
    const { currCase, currProject } = this.props;
    const { isEditingCasename, editCasename } = this.state;
-    const data = Object.assign({}, currCase, currProject, {_id: currCase._id});
+    const data = Object.assign({}, currCase, currProject, { _id: currCase._id });
    return (
-      <div style={{padding: '6px 0'}} className="case-content">
+      <div style={{ padding: '6px 0' }} className="case-content">
        <div className="case-title">
          {!isEditingCasename && <Tooltip title="点击编辑" placement="bottom"><div className="case-name" onClick={this.triggerEditCasename}>
            {currCase.casename}
          </div></Tooltip>}

          {isEditingCasename && <div className="edit-case-name">
-            <Input value={editCasename} onChange={e => this.setState({editCasename: e.target.value})} style={{fontSize: 18}} />
-            {/*<Button
-              title="Enter"
-              onClick={this.saveCasename}
-              type="primary"
-              style={{ marginLeft: 8 }}
-            >保存</Button>
-            <Button
-              title="Esc"
-              onClick={this.cancelEditCasename}
-              type="primary"
-              style={{ marginLeft: 8 }}
-            >取消</Button>*/}
+            <Input value={editCasename} onChange={e => this.setState({ editCasename: e.target.value })} style={{ fontSize: 18 }} />
          </div>}
-          <span className="inter-link" style={{margin: '0px 8px 0px 6px', fontSize: 12}}>
+          <span className="inter-link" style={{ margin: '0px 8px 0px 6px', fontSize: 12 }}>
            <Link className="text" to={`/project/${currProject._id}/interface/api/${currCase.interface_id}`}>对应接口</Link>
          </span>
        </div>
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
@ -4,11 +4,12 @@ import PropTypes from 'prop-types'
 import { withRouter } from 'react-router'
 import { Link } from 'react-router-dom'
 import constants from '../../../../constants/variable.js'
-import { Tooltip, Icon, Button, Spin, Modal, message ,Select} from 'antd'
+import { Tooltip, Icon, Button, Spin, Modal, message, Select, Switch } from 'antd'
 import { fetchInterfaceColList, fetchCaseList, setColData } from '../../../../reducer/modules/interfaceCol'
 import HTML5Backend from 'react-dnd-html5-backend';
 import { DragDropContext } from 'react-dnd';
 import { isJson, handleMockWord, simpleJsonPathParse } from '../../../../common.js'
+import mockEditor from '../InterfaceList/mockEditor';
 import * as Table from 'reactabular-table';
 import * as dnd from 'reactabular-dnd';
 import * as resolve from 'table-resolver';
@ -74,7 +75,9 @@ class InterfaceColContent extends Component {
      visible: false,
      curCaseid: null,
      hasPlugin: false,
-      currColEnv: ''
+      currColEnv: '',
+      scriptVisible: false,
+      curScript: ''
    };
    this.onRow = this.onRow.bind(this);
    this.onMoveRow = this.onMoveRow.bind(this);
@ -112,6 +115,7 @@ class InterfaceColContent extends Component {
        })
      }
    }, 500)
+
  }

  componentWillUnmount() {
@ -159,22 +163,22 @@ class InterfaceColContent extends Component {
      } catch (e) {
        console.error(e);
        status = 'error';
-        result = e;        
+        result = e;
      }
-      
+
      let query = this.arrToObj(curitem.req_query);
-      if(!query || typeof query !== 'object'){
+      if (!query || typeof query !== 'object') {
        query = {};
      }
      let body = {};
-      if(HTTP_METHOD[curitem.method].request_body){
-        if(curitem.req_body_type === 'form'){
+      if (HTTP_METHOD[curitem.method].request_body) {
+        if (curitem.req_body_type === 'form') {
          body = this.arrToObj(curitem.req_body_form);
-        }else {
+        } else {
          body = isJson(curitem.req_body_other);
        }
-        
-        if(!body || typeof body !== 'object'){
+
+        if (!body || typeof body !== 'object') {
          body = {};
        }
      }
@ -192,7 +196,7 @@ class InterfaceColContent extends Component {
      this.setState({
        rows: newRows
      })
-      if(status === 'error') break;
+      if (status === 'error') break;
    }
  }

@ -206,12 +210,12 @@ class InterfaceColContent extends Component {
    });
    const domains = currProject.env.concat();
    let currDomain = domains.find(item => item.name === case_env);
-    if(!currDomain){
+    if (!currDomain) {
      currDomain = domains[0];
    }
    const urlObj = URL.parse(currDomain.domain);
-    if(urlObj.pathname){
-      if(urlObj.pathname[urlObj.pathname.length - 1] !== '/'){
+    if (urlObj.pathname) {
+      if (urlObj.pathname[urlObj.pathname.length - 1] !== '/') {
        urlObj.pathname += '/'
      }
    }
@ -231,18 +235,18 @@ class InterfaceColContent extends Component {
      result.url = href;
      result.method = interfaceData.method;
      result.headers = that.getHeadersObj(interfaceData.req_headers);
-      if(interfaceData.req_body_type === 'form'){
+      if (interfaceData.req_body_type === 'form') {
        result.body = that.arrToObj(interfaceData.req_body_form)
-      }else{
+      } else {
        let reqBody = isJson(interfaceData.req_body_other);
-        if(reqBody === false){
+        if (reqBody === false) {
          result.body = this.handleValue(interfaceData.req_body_other)
-        }else{
+        } else {
          result.body = JSON.stringify(this.handleJson(reqBody))
        }
-        
+
      }
-     
+
      window.crossRequest({
        url: href,
        method: interfaceData.method,
@ -292,20 +296,20 @@ class InterfaceColContent extends Component {
    })
  }

-  handleJson = (data)=>{
-    if(!data){
+  handleJson = (data) => {
+    if (!data) {
      return data;
    }
-    if(typeof data === 'string'){
+    if (typeof data === 'string') {
      return this.handleValue(data);
-    }else if(typeof data === 'object'){
-      for(let i in data){
+    } else if (typeof data === 'object') {
+      for (let i in data) {
        data[i] = this.handleJson(data[i]);
      }
-    }else{
+    } else {
      return data;
    }
-    return data;    
+    return data;
  }

  handleValue = (val) => {
@ -330,7 +334,7 @@ class InterfaceColContent extends Component {
    return obj;
  }

-  
+

  getQueryObj = (query) => {
    query = query || [];
@ -382,7 +386,7 @@ class InterfaceColContent extends Component {
    const { interfaceColList } = nextProps;
    const { actionId: oldColId, id } = this.props.match.params
    let newColId = nextProps.match.params.actionId
-    if (!interfaceColList.find(item => +item._id === +newColId)&&interfaceColList[0]._id) {
+    if (!interfaceColList.find(item => +item._id === +newColId) && interfaceColList[0]._id) {
      this.props.history.push('/project/' + id + '/interface/col/' + interfaceColList[0]._id)
    } else if ((oldColId !== newColId) || interfaceColList !== this.props.interfaceColList) {
      if (newColId && newColId != 0) {
@ -401,7 +405,37 @@ class InterfaceColContent extends Component {
      visible: true,
      curCaseid: id
    })
+  }

+  openScript = (id) => {
+    this.setState({
+      scriptVisible: true,
+      curCaseid: id
+    }, () => {
+      let that = this;
+      if(that.Editor){
+        that.Editor.setValue(this.state.curScript);
+      }else{
+        that.Editor = mockEditor({
+          container: 'case-script',
+          data: this.state.curScript,
+          onChange: function (d) {
+            that.setState({
+              curScript: d.text
+            })
+          }
+        })
+      }      
+    })
+
+
+
+  }
+
+  handleScriptCancel = () => {
+    this.setState({
+      scriptVisible: false
+    });
  }

  handleCancel = () => {
@ -412,7 +446,7 @@ class InterfaceColContent extends Component {

  colEnvChange = (envName) => {
    let rows = [...this.state.rows];
-    for(var i in rows){
+    for (var i in rows) {
      rows[i].case_env = envName;
    }
    this.setState({
@ -502,22 +536,29 @@ class InterfaceColContent extends Component {
          }
        ]
      }
-    }, {
+    },
+    {
      header: {
-        label: '测试报告'
+        label: '操作'

      },
      props: {
        style: {
-          width: '100px'
+          width: '200px'
        }
      },
      cell: {
        formatters: [(text, { rowData }) => {
-          if (!this.reports[rowData.id]) {
-            return null;
+          let reportFun = () => {
+            if (!this.reports[rowData.id]) {
+              return null;
+            }
+            return <Button onClick={() => this.openReport(rowData.id)}>测试报告</Button>
          }
-          return <Button onClick={() => this.openReport(rowData.id)}>报告</Button>
+          return <div className="interface-col-table-action">
+            <Button onClick={() => this.openScript(rowData.id)} type="primary">自定义脚本</Button>
+            {reportFun()}
+          </div>
        }]
      }
    }
@ -545,14 +586,14 @@ class InterfaceColContent extends Component {
        <div style={{ display: 'inline-block', margin: 0, marginBottom: '16px' }}>
          <Select value={currColEnv} style={{ width: "320px" }} onChange={this.colEnvChange}>
            {
-              colEnv.map((item)=>{
-                return <Option key={item._id} value={item.name}>{item.name+": "+item.domain}</Option>;
+              colEnv.map((item) => {
+                return <Option key={item._id} value={item.name}>{item.name + ": " + item.domain}</Option>;
              })
            }
          </Select>
        </div>
-        {this.state.hasPlugin?
-          <Button type="primary" style={{ float: 'right' }} onClick={this.executeTests}>开始测试</Button>:
+        {this.state.hasPlugin ?
+          <Button type="primary" style={{ float: 'right' }} onClick={this.executeTests}>开始测试</Button> :
          <Tooltip title="请安装 cross-request Chrome 插件">
            <Button disabled type="primary" style={{ float: 'right' }} >开始测试</Button>
          </Tooltip>
@ -585,6 +626,20 @@ class InterfaceColContent extends Component {
        >
          <CaseReport {...this.reports[this.state.curCaseid]} />
        </Modal>
+
+        <Modal
+          title="自定义测试脚本"
+          width="660px"
+          style={{ minHeight: '500px' }}
+          visible={this.state.scriptVisible}
+          onCancel={this.handleScriptCancel}
+        >
+          <h3>
+            是否开启:&nbsp;
+            <Switch defaultChecked={false} />
+          </h3>
+          <div className="case-script" id="case-script" style={{ minHeight: 500 }}></div>
+        </Modal>
      </div>
    )
  }
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.scss
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceColMenu.scss
@ -115,4 +115,14 @@
  .interface-col-table-body td{
    padding-left:5px;
  }
+
+  .interface-col-table-action button{
+    margin-right: 5px;
+    padding: 5px 10px;
+    max-width: 90px;
+  }
 }
+
+.case-script{
+  margin: 10px
+}
--- a/server/controllers/interfaceCol.js
+++ b/server/controllers/interfaceCol.js
@ -334,10 +334,6 @@ class interfaceColController extends baseController{
                return ctx.body = yapi.commons.resReturn(null, 400, '用例id不能为空');
            }

-            // if(!params.casename){
-            //     return ctx.body = yapi.commons.resReturn(null, 400, '用例名称不能为空');
-            // }
-
            let caseData = await this.caseModel.get(params.id);
            let auth = await this.checkAuth(caseData.project_id, 'project', 'edit');
            if (!auth) {
@ -346,9 +342,9 @@ class interfaceColController extends baseController{

            params.uid = this.getUid();

+            //不允许修改接口id和项目id
            delete params.interface_id;
            delete params.project_id;
-            // delete params.col_id;

            let result = await this.caseModel.up(params.id, params);
            let username = this.getUsername();
--- a/server/models/interfaceCase.js
+++ b/server/models/interfaceCase.js
@ -34,8 +34,9 @@ class interfaceCase extends baseModel {
            test_status: {type: String, enum: ['ok', 'invalid', 'error', '']},
            test_report: [],
            test_res_header: Schema.Types.Mixed,
-            mock_verify: {type: Boolean, default: false}
-
+            mock_verify: {type: Boolean, default: false},
+            enable_script: {type: Boolean, default: false},
+            test_script: String
        };
    }