Merge pull request #836 from httprunner/leo_dev

2.5.3

**Fixed**

- fix json schema: variables maybe in string type, e.g. '${prepare_variables()}'
- fix json schema: post json maybe in string type, e.g. '${prepare_post_data()}', '$post_data'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,6 +17,16 @@ Please complete the following information:
  - OS: [e.g. macos, Linux, Windows]
  - Python [e.g. 3.6]
  - HttpRunner [e.g. 2.1.2]
+- **Device ID**: [e.g. 190070690681122]
+
+How to get device ID?
+
+In Python interactive shell, execute the following command:
+
+```bash
+>>> import uuid; print(uuid.getnode())
+190070690681122
+```
 
 ## Traceback
 

.github/ISSUE_TEMPLATE/bug_report_zh.md

@@ -17,6 +17,16 @@ assignees: debugtalk
  - 操作系统类型: [e.g. macos, Linux, Windows]
  - Python 版本 [e.g. 3.6]
  - HttpRunner 版本 [e.g. 2.1.2]
+ - **设备 ID**: [e.g. 190070690681122]
+
+获取方式：
+
+在 Python 交互式 shell 中输入如下命令进行获取：
+
+```bash
+>>> import uuid; print(uuid.getnode())
+190070690681122
+```
 
 ## 项目文件内容（非必须）
 

docs/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History
 
+## 2.5.3 (2020-01-03)
+
+**Fixed**
+
+- fix json schema: variables maybe in string type, e.g. '${prepare_variables()}'
+- fix json schema: post json maybe in string type, e.g. '${prepare_post_data()}', '$post_data'
+
 ## 2.5.2 (2020-01-02)
 
 **Fixed**

httprunner/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.5.2"
+__version__ = "2.5.3"
 __description__ = "One-stop solution for HTTP(S) testing."
 
 __all__ = ["__version__", "__description__"]

httprunner/loader/schemas/common.schema.json

@@ -23,6 +23,14 @@
                         "maxProperties": 1,
                         "minProperties": 1
                     }
+                },
+                {
+                    "type": "string",
+                    "pattern": "^\\$.*",
+                    "examples": [
+                        "${prepare_variables()}",
+                        "${prepare_variables($a, $b)}"
+                    ]
                 }
             ]
         },
@@ -110,9 +118,22 @@
                     ]
                 },
                 "json": {
+                    "oneOf": [
+                        {
                             "description": "request body in json format",
                             "type": "object"
                         },
+                        {
+                            "description": "request body in string format, e.g. '${prepare_json($a, $b)}'",
+                            "type": "string",
+                            "pattern": "^\\$.*",
+                            "examples": [
+                                "$post_data",
+                                "${prepare_post_data($a, $b)}"
+                            ]
+                        }
+                    ]
+                },
                 "headers": {
                     "description": "request headers",
                     "type": "object"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "httprunner"
-version = "2.5.2"
+version = "2.5.3"
 description = "One-stop solution for HTTP(S) testing."
 license = "Apache-2.0"
 readme = "README.md"