Merge branch 'master' into graphql-ws

Author: LegNeato

juniper_actix/Cargo.toml

@@ -26,7 +26,6 @@ thiserror = "1.0"
 juniper = { version = "0.14.2", path = "../juniper", features = ["expose-test-schema", "serde_json"] }
 env_logger = "0.7.1"
 log = "0.4.3"
-percent-encoding = "1.0"
 tokio = { version = "0.2", features = ["rt-core", "macros", "blocking"] }
 actix-cors = "0.2.0"
 actix-identity = "0.2.0"

juniper_rocket_async/src/lib.rs

@@ -44,11 +44,10 @@ use std::io::Cursor;
 use rocket::{
     data::{self, FromData},
     http::{ContentType, RawStr, Status},
+    outcome::Outcome::{Failure, Forward, Success},
     request::{FormItems, FromForm, FromFormValue},
     response::{self, content, Responder, Response},
-    Data,
-    Outcome::{Failure, Forward, Success},
-    Request,
+    Data, Request,
 };
 
 use juniper::{

juniper_warp/Cargo.toml

@@ -27,5 +27,6 @@ warp = "0.2"
 env_logger = "0.7.1"
 juniper = { version = "0.14.2", path = "../juniper", features = ["expose-test-schema", "serde_json"] }
 log = "0.4.3"
-percent-encoding = "1.0"
+percent-encoding = "2"
 tokio = { version = "0.2", features = ["blocking", "macros", "rt-core"] }
+url = "2"

juniper_warp/src/lib.rs

@@ -767,9 +767,16 @@ mod tests_http_harness {
 
     impl HttpIntegration for TestWarpIntegration {
         fn get(&self, url: &str) -> TestResponse {
-            use percent_encoding::{utf8_percent_encode, QUERY_ENCODE_SET};
+            use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
+            use url::Url;
 
-            let url: String = utf8_percent_encode(&url.replace("/?", ""), QUERY_ENCODE_SET)
+            /// https://url.spec.whatwg.org/#query-state
+            const QUERY_ENCODE_SET: &AsciiSet =
+                &CONTROLS.add(b' ').add(b'"').add(b'#').add(b'<').add(b'>');
+
+            let url = Url::parse(&format!("http://localhost:3000{}", url)).expect("url to parse");
+
+            let url: String = utf8_percent_encode(url.query().unwrap_or(""), QUERY_ENCODE_SET)
                 .into_iter()
                 .collect::<Vec<_>>()
                 .join("");