From c229a0116ead0c0aa1bb9b13ee18e2bf2e67ceaa Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 10 Nov 2016 10:21:09 +0100
Subject: [PATCH] Rewrite
 test_when_cookie_received_marked_secure_is_ignored_for_http.

---
 tests/unit/net/http_loader.rs | 44 +++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs
index 154a19ca780..4381b3168de 100644
--- a/tests/unit/net/http_loader.rs
+++ b/tests/unit/net/http_loader.rs
@@ -972,31 +972,35 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
 
 #[test]
 fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
-    struct Factory;
+    let handler = move |_: HyperRequest, mut response: HyperResponse| {
+        let mut pair = CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned());
+        pair.secure = true;
+        response.headers_mut().set(SetCookie(vec![pair]));
+        response.send(b"Yay!").unwrap();
+    };
+    let (mut server, url) = make_server(handler);
 
-    impl HttpRequestFactory for Factory {
-        type R = MockRequest;
+    let context = new_fetch_context(None);
 
-        fn create(&self, _: Url, _: Method, _: Headers) -> Result<MockRequest, LoadError> {
-            let content = <[_]>::to_vec("Yay!".as_bytes());
-            let mut headers = Headers::new();
-            headers.set_raw("set-cookie", vec![b"mozillaIs=theBest; Secure;".to_vec()]);
-            Ok(MockRequest::new(ResponseType::WithHeaders(content, headers)))
-        }
-    }
+    assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None);
 
-    let http_state = HttpState::new();
-    let ui_provider = TestProvider::new();
+    let request = Request::from_init(RequestInit {
+        url: url.clone(),
+        method: Method::Get,
+        body: None,
+        destination: Destination::Document,
+        origin: url.clone(),
+        pipeline_id: Some(TEST_PIPELINE_ID),
+        credentials_mode: CredentialsMode::Include,
+        .. RequestInit::default()
+    });
+    let response = fetch(Rc::new(request), &mut None, &context);
 
-    let load_data = LoadData::new(LoadContext::Browsing, Url::parse("http://mozilla.com").unwrap(), &HttpTest);
-    let _ = load(&load_data,
-                 &ui_provider, &http_state,
-                 None,
-                 &Factory,
-                 DEFAULT_USER_AGENT.into(),
-                 &CancellationListener::new(None), None);
+    let _ = server.close();
 
-    assert_cookie_for_domain(http_state.cookie_jar.clone(), "http://mozilla.com", None);
+    assert!(response.status.unwrap().is_success());
+
+    assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None);
 }
 
 #[test]