update templates/testcases

docs/cmd/hrp.md

@@ -37,4 +37,4 @@ Copyright 2017 debugtalk
 * [hrp startproject](hrp_startproject.md)	 - create a scaffold project
 * [hrp wiki](hrp_wiki.md)	 - visit https://httprunner.com
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_boom.md

@@ -42,4 +42,4 @@ hrp boom [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_convert.md

@@ -22,4 +22,4 @@ hrp convert $path... [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_har2case.md

@@ -24,4 +24,4 @@ hrp har2case $har_path... [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_pytest.md

@@ -16,4 +16,4 @@ hrp pytest $path ... [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_run.md

@@ -35,4 +35,4 @@ hrp run $path... [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_startproject.md

@@ -21,4 +21,4 @@ hrp startproject $project_name [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

docs/cmd/hrp_wiki.md

@@ -16,4 +16,4 @@ hrp wiki [flags]
 
 * [hrp](hrp.md)	 - Next-Generation API Testing Solution.
 
-###### Auto generated by spf13/cobra on 26-May-2022
+###### Auto generated by spf13/cobra on 27-May-2022

examples/demo-with-go-plugin/proj.json

@@ -1,6 +1,6 @@
 {
     "project_name": "demo-with-go-plugin",
     "project_path": "/Users/xxxxx/go/src/github.com/httprunner/httprunner/examples/demo-with-go-plugin",
-    "create_time": "2022-05-26T22:08:10.455301+08:00",
+    "create_time": "2022-05-27T11:34:23.903959+08:00",
     "hrp_version": "v4.1.0-beta"
 }

examples/demo-with-go-plugin/testcases/ref_testcase.yml

@@ -28,15 +28,6 @@ teststeps:
             Content-Type: "application/x-www-form-urlencoded"
         body: "foo1=$foo1&foo2=$foo3"
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.form.foo1", "bar1"]
-          expect: 200
+        - eq: ["body.form.foo2", "bar21"]
-          msg: check status_code
-        - check: body.form.foo1
-          assert: equal
-          expect: bar1
-          msg: check body.form.foo1
-        - check: body.form.foo2
-          assert: equal
-          expect: bar21
-          msg: check body.form.foo2

examples/demo-with-go-plugin/testcases/requests.yml

@@ -27,22 +27,10 @@ teststeps:
     extract:
         foo3: "body.args.foo2"
     validate:
-      - check: status_code
+        - eq: ["status_code", 200]
-        assert: equal
+        - eq: ["body.args.foo1", "debugtalk"]
-        expect: 200
+        - eq: ["body.args.sum_v", "3"]
-        msg: check status_code
+        - eq: ["body.args.foo2", "bar21"]
-      - check: body.args.foo1
-        assert: equal
-        expect: debugtalk
-        msg: check body.args.foo1
-      - check: body.args.sum_v
-        assert: equal
-        expect: "3"
-        msg: check body.args.sum_v
-      - check: body.args.foo2
-        assert: equal
-        expect: bar21
-        msg: check body.args.foo2
 -
     name: post raw text
     variables:
@@ -56,14 +44,8 @@ teststeps:
             Content-Type: "text/plain"
         body: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."]
-          expect: 200
-          msg: check status_code
-        - check: body.data
-          assert: equal
-          expect: "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."
-          msg: check body.data
 -
     name: post form data
     variables:
@@ -76,19 +58,7 @@ teststeps:
             Content-Type: "application/x-www-form-urlencoded"
         body: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.form.foo1", "$expect_foo1"]
-          expect: 200
+        - eq: ["body.form.foo2", "bar23"]
-          msg: check status_code
+        - eq: ["body.form.foo3", "bar21"]
-        - check: body.form.foo1
-          assert: equal
-          expect: $expect_foo1
-          msg: check body.form.foo1
-        - check: body.form.foo2
-          assert: equal
-          expect: bar23
-          msg: check body.form.foo2
-        - check: body.form.foo3
-          assert: equal
-          expect: bar21
-          msg: check body.form.foo3

examples/demo-with-py-plugin/proj.json

@@ -1,6 +1,6 @@
 {
     "project_name": "demo-with-py-plugin",
     "project_path": "/Users/xxxxx/go/src/github.com/httprunner/httprunner/examples/demo-with-py-plugin",
-    "create_time": "2022-05-26T22:08:18.580462+08:00",
+    "create_time": "2022-05-27T11:34:31.852589+08:00",
     "hrp_version": "v4.1.0-beta"
 }

examples/demo-with-py-plugin/testcases/ref_testcase.yml

@@ -28,15 +28,6 @@ teststeps:
             Content-Type: "application/x-www-form-urlencoded"
         body: "foo1=$foo1&foo2=$foo3"
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.form.foo1", "bar1"]
-          expect: 200
+        - eq: ["body.form.foo2", "bar21"]
-          msg: check status_code
-        - check: body.form.foo1
-          assert: equal
-          expect: bar1
-          msg: check body.form.foo1
-        - check: body.form.foo2
-          assert: equal
-          expect: bar21
-          msg: check body.form.foo2

examples/demo-with-py-plugin/testcases/requests.yml

@@ -27,22 +27,10 @@ teststeps:
     extract:
         foo3: "body.args.foo2"
     validate:
-      - check: status_code
+        - eq: ["status_code", 200]
-        assert: equal
+        - eq: ["body.args.foo1", "debugtalk"]
-        expect: 200
+        - eq: ["body.args.sum_v", "3"]
-        msg: check status_code
+        - eq: ["body.args.foo2", "bar21"]
-      - check: body.args.foo1
-        assert: equal
-        expect: debugtalk
-        msg: check body.args.foo1
-      - check: body.args.sum_v
-        assert: equal
-        expect: "3"
-        msg: check body.args.sum_v
-      - check: body.args.foo2
-        assert: equal
-        expect: bar21
-        msg: check body.args.foo2
 -
     name: post raw text
     variables:
@@ -56,14 +44,8 @@ teststeps:
             Content-Type: "text/plain"
         body: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."]
-          expect: 200
-          msg: check status_code
-        - check: body.data
-          assert: equal
-          expect: "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."
-          msg: check body.data
 -
     name: post form data
     variables:
@@ -76,19 +58,7 @@ teststeps:
             Content-Type: "application/x-www-form-urlencoded"
         body: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.form.foo1", "$expect_foo1"]
-          expect: 200
+        - eq: ["body.form.foo2", "bar23"]
-          msg: check status_code
+        - eq: ["body.form.foo3", "bar21"]
-        - check: body.form.foo1
-          assert: equal
-          expect: $expect_foo1
-          msg: check body.form.foo1
-        - check: body.form.foo2
-          assert: equal
-          expect: bar23
-          msg: check body.form.foo2
-        - check: body.form.foo3
-          assert: equal
-          expect: bar21
-          msg: check body.form.foo3

examples/demo-without-plugin/proj.json

@@ -1,6 +1,6 @@
 {
     "project_name": "demo-without-plugin",
     "project_path": "/Users/xxxxx/go/src/github.com/httprunner/httprunner/examples/demo-without-plugin",
-    "create_time": "2022-05-26T22:08:19.331271+08:00",
+    "create_time": "2022-05-27T11:34:32.548637+08:00",
     "hrp_version": "v4.1.0-beta"
 }

hrp/internal/scaffold/templates/testcases/demo_empty_request.yml

@@ -10,7 +10,4 @@ teststeps:
       method: GET
       url: "https://"
     validate:
-      - check: status_code
+      - eq: ["status_code", 200]
-        assert: equal
-        expect: 200
-        msg: check status_code

hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml

@@ -28,15 +28,6 @@ teststeps:
             Content-Type: "application/x-www-form-urlencoded"
         body: "foo1=$foo1&foo2=$foo3"
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.form.foo1", "bar1"]
-          expect: 200
+        - eq: ["body.form.foo2", "bar21"]
-          msg: check status_code
-        - check: body.form.foo1
-          assert: equal
-          expect: bar1
-          msg: check body.form.foo1
-        - check: body.form.foo2
-          assert: equal
-          expect: bar21
-          msg: check body.form.foo2

hrp/internal/scaffold/templates/testcases/demo_requests.yml

@@ -27,22 +27,10 @@ teststeps:
     extract:
         foo3: "body.args.foo2"
     validate:
-      - check: status_code
+        - eq: ["status_code", 200]
-        assert: equal
+        - eq: ["body.args.foo1", "debugtalk"]
-        expect: 200
+        - eq: ["body.args.sum_v", "3"]
-        msg: check status_code
+        - eq: ["body.args.foo2", "bar21"]
-      - check: body.args.foo1
-        assert: equal
-        expect: debugtalk
-        msg: check body.args.foo1
-      - check: body.args.sum_v
-        assert: equal
-        expect: "3"
-        msg: check body.args.sum_v
-      - check: body.args.foo2
-        assert: equal
-        expect: bar21
-        msg: check body.args.foo2
 -
     name: post raw text
     variables:
@@ -56,14 +44,8 @@ teststeps:
             Content-Type: "text/plain"
         body: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."]
-          expect: 200
-          msg: check status_code
-        - check: body.data
-          assert: equal
-          expect: "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar32."
-          msg: check body.data
 -
     name: post form data
     variables:
@@ -76,19 +58,7 @@ teststeps:
             Content-Type: "application/x-www-form-urlencoded"
         body: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
-        - check: status_code
+        - eq: ["status_code", 200]
-          assert: equal
+        - eq: ["body.form.foo1", "$expect_foo1"]
-          expect: 200
+        - eq: ["body.form.foo2", "bar23"]
-          msg: check status_code
+        - eq: ["body.form.foo3", "bar21"]
-        - check: body.form.foo1
-          assert: equal
-          expect: $expect_foo1
-          msg: check body.form.foo1
-        - check: body.form.foo2
-          assert: equal
-          expect: bar23
-          msg: check body.form.foo2
-        - check: body.form.foo3
-          assert: equal
-          expect: bar21
-          msg: check body.form.foo3