committee 5.6.1 → 5.6.3

data/test/schema_validator/hyper_schema/request_validator_test.rb

@@ -11,11 +11,7 @@ describe Committee::SchemaValidator::HyperSchema::RequestValidator do
       @schema.expand_references!
       # POST /apps/:id
       @link = @schema.properties["app"].links[0]
-      @request = Rack::Request.new({
-                                     "CONTENT_TYPE"   => "application/json",
-                                     "rack.input"     => StringIO.new("{}"),
-                                     "REQUEST_METHOD" => "POST"
-                                   })
+      @request = Rack::Request.new({ "CONTENT_TYPE" => "application/json", "rack.input" => StringIO.new("{}"), "REQUEST_METHOD" => "POST" })
     end
 
     it "passes through a valid request with Content-Type options" do
@@ -29,22 +25,14 @@ describe Committee::SchemaValidator::HyperSchema::RequestValidator do
     end
 
     it "passes through a valid request with Content-Type options" do
-      @request =
-        Rack::Request.new({
-                            "CONTENT_TYPE" => "application/json; charset=utf-8",
-                            "rack.input"   => StringIO.new("{}"),
-                          })
+      @request = Rack::Request.new({ "CONTENT_TYPE" => "application/json; charset=utf-8", "rack.input" => StringIO.new("{}"), })
       data = { "name" => "heroku-api", }
       call(data)
     end
 
     it "detects an invalid request Content-Type" do
       e = assert_raises(Committee::InvalidRequest) {
-        @request =
-          Rack::Request.new({
-                              "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-                              "rack.input"   => StringIO.new("{}"),
-                            })
+        @request = Rack::Request.new({ "CONTENT_TYPE" => "application/x-www-form-urlencoded", "rack.input" => StringIO.new("{}"), })
         call({})
       }
       message = %{"Content-Type" request header must be set to "application/json".}
@@ -52,11 +40,7 @@ describe Committee::SchemaValidator::HyperSchema::RequestValidator do
     end
 
     it "allows skipping content_type check" do
-      @request =
-        Rack::Request.new({
-                            "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-                            "rack.input"   => StringIO.new("{}"),
-                          })
+      @request = Rack::Request.new({ "CONTENT_TYPE" => "application/x-www-form-urlencoded", "rack.input" => StringIO.new("{}"), })
       call({}, {}, check_content_type: false)
     end
 
@@ -73,11 +57,7 @@ describe Committee::SchemaValidator::HyperSchema::RequestValidator do
     end
 
     it "allows an invalid Content-Type with an empty body" do
-      @request =
-        Rack::Request.new({
-                            "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-                            "rack.input"   => StringIO.new(""),
-                          })
+      @request = Rack::Request.new({ "CONTENT_TYPE" => "application/x-www-form-urlencoded", "rack.input" => StringIO.new(""), })
       call({})
     end
 
@@ -103,11 +83,7 @@ describe Committee::SchemaValidator::HyperSchema::RequestValidator do
     before do
       @schema = open_api_2_schema
       @link = @schema.routes['GET'][0][1]
-      @request = Rack::Request.new({
-                                     "CONTENT_TYPE"   => "application/json",
-                                     "rack.input"     => StringIO.new("{}"),
-                                     "REQUEST_METHOD" => "POST"
-                                   })
+      @request = Rack::Request.new({ "CONTENT_TYPE" => "application/json", "rack.input" => StringIO.new("{}"), "REQUEST_METHOD" => "POST" })
     end
 
     it "passes through a valid request" do

data/test/schema_validator/hyper_schema/router_test.rb

@@ -43,6 +43,11 @@ describe Committee::SchemaValidator::HyperSchema::Router do
     refute_nil link
   end
 
+  it "does not include a similar prefix path segment" do
+    link, _ = hyper_schema_router(prefix: "/kpi").includes?("/kpi2/apps")
+    assert_nil link
+  end
+
   it "provides named parameters" do
     link, param_matches = open_api_2_router.find_link("GET", "/api/pets/fido")
     refute_nil link

data/test/schema_validator/hyper_schema/string_params_coercer_test.rb

@@ -53,43 +53,7 @@ describe Committee::SchemaValidator::HyperSchema::StringParamsCoercer do
   end
 
   it "pass array property" do
-    params = {
-        "array_property" => [
-            {
-                "update_time" => "2016-04-01T16:00:00.000+09:00",
-                "per_page" => "1",
-                "nested_coercer_object" => {
-                    "update_time" => "2016-04-01T16:00:00.000+09:00",
-                    "threshold" => "1.5"
-                },
-                "nested_no_coercer_object" => {
-                    "per_page" => "1",
-                    "threshold" => "1.5"
-                },
-                "nested_coercer_array" => [
-                    {
-                        "update_time" => "2016-04-01T16:00:00.000+09:00",
-                        "threshold" => "1.5"
-                    }
-                ],
-                "nested_no_coercer_array" => [
-                    {
-                        "per_page" => "1",
-                        "threshold" => "1.5"
-                    }
-                ]
-            },
-            {
-                "update_time" => "2016-04-01T16:00:00.000+09:00",
-                "per_page" => "1",
-                "threshold" => "1.5"
-            },
-            {
-                "threshold" => "1.5",
-                "per_page" => "1"
-            }
-        ],
-    }
+    params = { "array_property" => [{ "update_time" => "2016-04-01T16:00:00.000+09:00", "per_page" => "1", "nested_coercer_object" => { "update_time" => "2016-04-01T16:00:00.000+09:00", "threshold" => "1.5" }, "nested_no_coercer_object" => { "per_page" => "1", "threshold" => "1.5" }, "nested_coercer_array" => [{ "update_time" => "2016-04-01T16:00:00.000+09:00", "threshold" => "1.5" }], "nested_no_coercer_array" => [{ "per_page" => "1", "threshold" => "1.5" }] }, { "update_time" => "2016-04-01T16:00:00.000+09:00", "per_page" => "1", "threshold" => "1.5" }, { "threshold" => "1.5", "per_page" => "1" }], }
     call(params, coerce_recursive: true)
 
     first_data = params["array_property"][0]

data/test/schema_validator/open_api_3/operation_wrapper_test.rb

@@ -18,13 +18,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
     HEADER = { 'Content-Type' => 'application/json' }
 
-    SCHEMA_PROPERTIES_PAIR = [
-        ['string', 'str'],
-        ['integer', 1],
-        ['boolean', true],
-        ['boolean', false],
-        ['number', 0.1],
-    ]
+    SCHEMA_PROPERTIES_PAIR = [['string', 'str'], ['integer', 1], ['boolean', true], ['boolean', false], ['number', 0.1],]
 
     it 'correct data' do
       operation_object.validate_request_params({}, {}, SCHEMA_PROPERTIES_PAIR.to_h, HEADER, @validator_option)
@@ -32,20 +26,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
     end
 
     it 'correct object data' do
-      operation_object.validate_request_params(
-                                  {},
-                                  {},
-                                  {
-                                     "object_1" =>
-                                         {
-                                             "string_1" => nil,
-                                             "integer_1" => nil,
-                                             "boolean_1" => nil,
-                                             "number_1" => nil
-                                         }
-                                 },
-                                               HEADER,
-                                               @validator_option)
+      operation_object.validate_request_params({}, {}, { "object_1" => { "string_1" => nil, "integer_1" => nil, "boolean_1" => nil, "number_1" => nil } }, HEADER, @validator_option)
 
       assert true
     end
@@ -93,21 +74,9 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
       end
 
       it 'correct' do
-        operation_object.validate_request_params(
-            {},
-            { "query_string" => "query", "query_integer_list" => [1, 2] },
-            {},
-            HEADER,
-            @validator_option
-        )
-
-        operation_object.validate_request_params(
-            {},
-            { "query_string" => "query", "query_integer_list" => [1, 2], "optional_integer" => 1 },
-            {},
-            HEADER,
-            @validator_option
-        )
+        operation_object.validate_request_params({}, { "query_string" => "query", "query_integer_list" => [1, 2] }, {}, HEADER, @validator_option)
+
+        operation_object.validate_request_params({}, { "query_string" => "query", "query_integer_list" => [1, 2], "optional_integer" => 1 }, {}, HEADER, @validator_option)
 
         assert true
       end
@@ -123,13 +92,7 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
 
       it 'invalid type' do
         e = assert_raises(Committee::InvalidRequest) {
-          operation_object.validate_request_params(
-              {},
-              { "query_string" => 1, "query_integer_list" => [1, 2], "optional_integer" => 1 },
-              {},
-              HEADER,
-              @validator_option
-          )
+          operation_object.validate_request_params({}, { "query_string" => 1, "query_integer_list" => [1, 2], "optional_integer" => 1 }, {}, HEADER, @validator_option)
         }
 
         assert_match(/expected string, but received Integer: 1/i, e.message)
@@ -208,5 +171,57 @@ describe Committee::SchemaValidator::OpenAPI3::OperationWrapper do
         assert_equal [], operation_object.request_content_types
       end
     end
+
+    describe 'coercion option wiring' do
+      before do
+        @path = '/coerce_path_params/1'
+        @method = 'get'
+      end
+
+      it 'uses coerce_path_params for explicit path coercion' do
+        disabled = Committee::SchemaValidator::Option.new({ coerce_path_params: false, coerce_query_params: true }, open_api_3_schema, :open_api_3)
+        enabled = Committee::SchemaValidator::Option.new({ coerce_path_params: true, coerce_query_params: false }, open_api_3_schema, :open_api_3)
+
+        error = assert_raises(Committee::InvalidRequest) do
+          operation_object.coerce_path_parameter(disabled)
+        end
+        assert_match(/expected integer, but received String: "1"/i, error.message)
+
+        coerced = operation_object.coerce_path_parameter(enabled)
+        assert_kind_of(Integer, coerced['integer'])
+      end
+
+      it 'uses coerce_query_params for request parameter validation' do
+        query_coercion_disabled = Committee::SchemaValidator::Option.new({ coerce_query_params: false }, open_api_3_schema, :open_api_3)
+        query_coercion_enabled = Committee::SchemaValidator::Option.new({ coerce_query_params: true }, open_api_3_schema, :open_api_3)
+
+        error = assert_raises(Committee::InvalidRequest) do
+          @path = '/characters'
+          operation_object.validate_request_params({}, { "limit" => "1" }, {}, HEADER, query_coercion_disabled)
+        end
+        assert_match(/expected integer, but received String: "1"/i, error.message)
+
+        @path = '/characters'
+        operation_object.validate_request_params({}, { "limit" => "1" }, {}, HEADER, query_coercion_enabled)
+      end
+
+      it 'uses coerce_form_params for JSON request bodies too' do
+        @path = '/validate'
+        @method = 'post'
+
+        body_coercion_disabled = Committee::SchemaValidator::Option.new({ coerce_form_params: false }, open_api_3_schema, :open_api_3)
+        body_coercion_enabled = Committee::SchemaValidator::Option.new({ coerce_form_params: true }, open_api_3_schema, :open_api_3)
+
+        error = assert_raises(Committee::InvalidRequest) do
+          operation_object.validate_request_params({}, {}, { "integer" => "1" }, HEADER, body_coercion_disabled)
+        end
+        assert_match(/expected integer, but received String: "1"/i, error.message)
+
+        body_params = { "integer" => "1" }
+        operation_object.validate_request_params({}, {}, body_params, HEADER, body_coercion_enabled)
+
+        assert_kind_of(Integer, body_params["integer"])
+      end
+    end
   end
 end