From 59dd35acff81695cb20e96c815d22f09117e2415 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 31 Dec 2019 10:49:18 +0800
Subject: [PATCH] change: update json schemas v2

---
 .../schemas/{v2 => common}/api.schema.json    |  8 +++----
 .../{v2 => }/common/config.schema.json        |  6 ++---
 .../{v2 => }/common/extract.schema.json       |  2 +-
 .../schemas/{v2 => }/common/hook.schema.json  |  2 +-
 .../{v2 => }/common/request.schema.json       |  2 +-
 .../{v2 => }/common/validate.schema.json      |  2 +-
 .../loader/schemas/v2/testcase.schema.json    | 22 +++++++++----------
 .../loader/schemas/v2/testsuite.schema.json   |  8 +++----
 8 files changed, 26 insertions(+), 26 deletions(-)
 rename httprunner/loader/schemas/{v2 => common}/api.schema.json (62%)
 rename httprunner/loader/schemas/{v2 => }/common/config.schema.json (57%)
 rename httprunner/loader/schemas/{v2 => }/common/extract.schema.json (72%)
 rename httprunner/loader/schemas/{v2 => }/common/hook.schema.json (67%)
 rename httprunner/loader/schemas/{v2 => }/common/request.schema.json (94%)
 rename httprunner/loader/schemas/{v2 => }/common/validate.schema.json (75%)

diff --git a/httprunner/loader/schemas/v2/api.schema.json b/httprunner/loader/schemas/common/api.schema.json
similarity index 62%
rename from httprunner/loader/schemas/v2/api.schema.json
rename to httprunner/loader/schemas/common/api.schema.json
index 431a61b8..e96096f3 100644
--- a/httprunner/loader/schemas/v2/api.schema.json
+++ b/httprunner/loader/schemas/common/api.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/api.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/api.schema.json",
     "title": "Api for httprunner",
     "description": "Api for httprunner",
     "type": "object",
@@ -14,7 +14,7 @@
             "description": "The base_url will be added before a relative URI"
         },
         "request": {
-            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/request.schema.json"
+            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/request.schema.json"
         },
         "variables": {
             "type": "object",
@@ -24,14 +24,14 @@
             "type": "array",
             "description": "Extract rules",
             "items": {
-                "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/extract.schema.json"
+                "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/extract.schema.json"
             }
         },
         "validate": {
             "type": "array",
             "description": "Validate rules",
             "items": {
-                "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/validate.schema.json"
+                "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/validate.schema.json"
             }
         }
     },
diff --git a/httprunner/loader/schemas/v2/common/config.schema.json b/httprunner/loader/schemas/common/config.schema.json
similarity index 57%
rename from httprunner/loader/schemas/v2/common/config.schema.json
rename to httprunner/loader/schemas/common/config.schema.json
index 67de36ac..85026cdd 100644
--- a/httprunner/loader/schemas/v2/common/config.schema.json
+++ b/httprunner/loader/schemas/common/config.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/config.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/config.schema.json",
     "title": "Config for httprunner",
     "description": "Used in teststep/testcase/testsuite",
     "type": "object",
@@ -16,10 +16,10 @@
             "type": "object"
         },
         "setup_hooks": {
-            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
         },
         "teardown_hooks": {
-            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
         }
     }
 }
\ No newline at end of file
diff --git a/httprunner/loader/schemas/v2/common/extract.schema.json b/httprunner/loader/schemas/common/extract.schema.json
similarity index 72%
rename from httprunner/loader/schemas/v2/common/extract.schema.json
rename to httprunner/loader/schemas/common/extract.schema.json
index cf24863d..74d7fb5d 100644
--- a/httprunner/loader/schemas/v2/common/extract.schema.json
+++ b/httprunner/loader/schemas/common/extract.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/extract.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/extract.schema.json",
     "title": "Extract rules for httprunner",
     "description": "Used to extract variables for later requests",
     "type": "object",
diff --git a/httprunner/loader/schemas/v2/common/hook.schema.json b/httprunner/loader/schemas/common/hook.schema.json
similarity index 67%
rename from httprunner/loader/schemas/v2/common/hook.schema.json
rename to httprunner/loader/schemas/common/hook.schema.json
index f80be216..919b44b7 100644
--- a/httprunner/loader/schemas/v2/common/hook.schema.json
+++ b/httprunner/loader/schemas/common/hook.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json",
     "title": "setup_hooks or teardown_hooks for httprunner",
     "description": "Define setup_hooks or teardown_hooks for httprunner",
     "type": "array",
diff --git a/httprunner/loader/schemas/v2/common/request.schema.json b/httprunner/loader/schemas/common/request.schema.json
similarity index 94%
rename from httprunner/loader/schemas/v2/common/request.schema.json
rename to httprunner/loader/schemas/common/request.schema.json
index c9385ea0..0cccb759 100644
--- a/httprunner/loader/schemas/v2/common/request.schema.json
+++ b/httprunner/loader/schemas/common/request.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/request.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/request.schema.json",
     "title": "request for httprunner",
     "description": "Used to define a api or used in a teststep. Same parameters as python's package 'requests'",
     "type": "object",
diff --git a/httprunner/loader/schemas/v2/common/validate.schema.json b/httprunner/loader/schemas/common/validate.schema.json
similarity index 75%
rename from httprunner/loader/schemas/v2/common/validate.schema.json
rename to httprunner/loader/schemas/common/validate.schema.json
index 14371992..718a8d89 100644
--- a/httprunner/loader/schemas/v2/common/validate.schema.json
+++ b/httprunner/loader/schemas/common/validate.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/validate.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/validate.schema.json",
     "title": "Validate rule of httprunner",
     "description": "Validate rule of httprunner",
     "type": "object",
diff --git a/httprunner/loader/schemas/v2/testcase.schema.json b/httprunner/loader/schemas/v2/testcase.schema.json
index b4c4198c..5490270e 100644
--- a/httprunner/loader/schemas/v2/testcase.schema.json
+++ b/httprunner/loader/schemas/v2/testcase.schema.json
@@ -1,12 +1,12 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/testcase.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/v2/testcase.schema.json",
     "title": "Testcase for httprunner",
     "description": "Testcase for httprunner",
     "type": "object",
     "properties": {
         "config": {
-            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/config.schema.json"
+            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/config.schema.json"
         },
         "teststeps": {
             "description": "Teststep of a testcase",
@@ -40,21 +40,21 @@
                             "description": "Extract rules",
                             "type": "array",
                             "items": {
-                                "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/extract.schema.json"
+                                "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/extract.schema.json"
                             }
                         },
                         "validate": {
                             "description": "Validate rules",
                             "type": "array",
                             "items": {
-                                "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/validate.schema.json"
+                                "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/validate.schema.json"
                             }
                         },
                         "setup_hooks": {
-                            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+                            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
                         },
                         "teardown_hooks": {
-                            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+                            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
                         }
                     },
                     "required": [
@@ -68,7 +68,7 @@
                             "type": "string"
                         },
                         "request": {
-                            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/request.schema.json"
+                            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/request.schema.json"
                         },
                         "variables": {
                             "type": "object"
@@ -77,21 +77,21 @@
                             "description": "Extract rules",
                             "type": "array",
                             "items": {
-                                "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/extract.schema.json"
+                                "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/extract.schema.json"
                             }
                         },
                         "validate": {
                             "description": "Validate rules",
                             "type": "array",
                             "items": {
-                                "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/validate.schema.json"
+                                "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/validate.schema.json"
                             }
                         },
                         "setup_hooks": {
-                            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+                            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
                         },
                         "teardown_hooks": {
-                            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+                            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
                         }
                     },
                     "required": [
diff --git a/httprunner/loader/schemas/v2/testsuite.schema.json b/httprunner/loader/schemas/v2/testsuite.schema.json
index 41e0de57..cfdfbb14 100644
--- a/httprunner/loader/schemas/v2/testsuite.schema.json
+++ b/httprunner/loader/schemas/v2/testsuite.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/testsuite.schema.json",
+    "$id": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/v2/testsuite.schema.json",
     "title": "Testsuite for httprunner",
     "description": "Testsuite for httprunner",
     "type": "object",
@@ -8,7 +8,7 @@
         "config": {
             "allOf": [
                 {
-                    "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/config.schema.json"
+                    "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/config.schema.json"
                 }
             ],
             "properties": {
@@ -24,10 +24,10 @@
             }
         },
         "setup_hooks": {
-            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
         },
         "teardown_hooks": {
-            "$ref": "https://raw.githubusercontent.com/readyou/httprunner/dev/httprunner/loader/schemas/v2/common/hook.schema.json"
+            "$ref": "https://raw.githubusercontent.com/httprunner/httprunner/master/httprunner/loader/schemas/common/hook.schema.json"
         }
     },
     "required": [