tweak test expect for new jsonschema lib

apache · Nov 27, 2020 · 0e00766 · 0e00766
1 parent 2308af8
commit 0e00766
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 17 deletions.
diff --git a/t/admin/health-check.t b/t/admin/health-check.t
@@ -288,7 +288,7 @@ GET /t
 GET /t
 --- error_code: 400
 --- response_body
-{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"active\" validation failed: property \"healthy\" validation failed: property \"http_statuses\" validation failed: expected unique items but items 2 and 1 are equal"}
+{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"active\" validation failed: property \"healthy\" validation failed: property \"http_statuses\" validation failed: expected unique items but items 1 and 2 are equal"}
 --- no_error_log
 [error]
 

diff --git a/t/plugin/api-breaker.t b/t/plugin/api-breaker.t
@@ -309,7 +309,7 @@ GET /t
 GET /t
 --- error_code: 400
 --- response_body
-{"error_msg":"failed to check the configuration of plugin api-breaker err: property \"healthy\" validation failed: property \"http_statuses\" validation failed: expected unique items but items 2 and 1 are equal"}
+{"error_msg":"failed to check the configuration of plugin api-breaker err: property \"healthy\" validation failed: property \"http_statuses\" validation failed: expected unique items but items 1 and 2 are equal"}
 --- no_error_log
 [error]
 

diff --git a/t/plugin/basic-auth.t b/t/plugin/basic-auth.t
@@ -291,29 +291,65 @@ GET /t
 
 
 === TEST 12: get the default schema
---- request
-GET /apisix/admin/schema/plugins/basic-auth
---- response_body
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/schema/plugins/basic-auth',
+                ngx.HTTP_GET,
+                nil,
+                [[
 {"properties":{"disable":{"type":"boolean"}},"title":"work with route or service object","additionalProperties":false,"type":"object"}
+                ]]
+                )
+            ngx.status = code
+        }
+    }
+--- request
+GET /t
 --- no_error_log
 [error]
 
 
 
 === TEST 13: get the schema by schema_type
---- request
-GET /apisix/admin/schema/plugins/basic-auth?schema_type=consumer
---- response_body
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/schema/plugins/basic-auth?schema_type=consumer',
+                ngx.HTTP_GET,
+                nil,
+                [[
 {"title":"work with consumer object","additionalProperties":false,"required":["username","password"],"properties":{"username":{"type":"string"},"password":{"type":"string"}},"type":"object"}
+                ]]
+                )
+            ngx.status = code
+        }
+    }
+--- request
+GET /t
 --- no_error_log
 [error]
 
 
 
 === TEST 14: get the schema by error schema_type
---- request
-GET /apisix/admin/schema/plugins/basic-auth?schema_type=consumer123123
---- response_body
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/schema/plugins/basic-auth?schema_type=consumer123123',
+                ngx.HTTP_GET,
+                nil,
+                [[
 {"properties":{"disable":{"type":"boolean"}},"title":"work with route or service object","additionalProperties":false,"type":"object"}
+                ]]
+                )
+            ngx.status = code
+        }
+    }
+--- request
+GET /t
 --- no_error_log
 [error]
diff --git a/t/plugin/hmac-auth.t b/t/plugin/hmac-auth.t
@@ -1259,10 +1259,22 @@ x-real-ip: 127.0.0.1
 
 
 === TEST 32: get the default schema
---- request
-GET /apisix/admin/schema/plugins/hmac-auth
---- response_body
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/schema/plugins/hmac-auth',
+                ngx.HTTP_GET,
+                nil,
+                [[
 {"properties":{"disable":{"type":"boolean"}},"title":"work with route or service object","additionalProperties":false,"type":"object"}
+                ]]
+                )
+            ngx.status = code
+        }
+    }
+--- request
+GET /t
 --- no_error_log
 [error]
 
@@ -1279,10 +1291,22 @@ GET /apisix/admin/schema/plugins/hmac-auth?schema_type=consumer
 
 
 === TEST 34: get the schema by error schema_type
---- request
-GET /apisix/admin/schema/plugins/hmac-auth?schema_type=consumer123123
---- response_body
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/schema/plugins/hmac-auth?schema_type=consumer123123',
+                ngx.HTTP_GET,
+                nil,
+                [[
 {"properties":{"disable":{"type":"boolean"}},"title":"work with route or service object","additionalProperties":false,"type":"object"}
+                ]]
+                )
+            ngx.status = code
+        }
+    }
+--- request
+GET /t
 --- no_error_log
 [error]