From c066c77a6a4218c9a5ee6a42d61a1120e3dcc074 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@red-bean.com>
Date: Tue, 17 Sep 2019 11:12:41 -0700
Subject: [PATCH] Split Scope::register_data tests out from Scope::data tests.

---
 src/scope.rs | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/scope.rs b/src/scope.rs
index e86c155d3..06ebbd940 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -1075,14 +1075,30 @@ mod tests {
 
     #[test]
     fn test_override_data() {
-        let mut srv = init_service(App::new().data(1usize).register_data(web::Data::new('-')).service(
-            web::scope("app").data(10usize).register_data(web::Data::new('*')).route(
+        let mut srv = init_service(App::new().data(1usize).service(
+            web::scope("app").data(10usize).route(
                 "/t",
-                web::get().to(|data1: web::Data<usize>, data2: web::Data<char>| {
-                    assert_eq!(*data1, 10);
-                    assert_eq!(*data2, '*');
-                    let _ = data1.clone();
-                    let _ = data2.clone();
+                web::get().to(|data: web::Data<usize>| {
+                    assert_eq!(*data, 10);
+                    let _ = data.clone();
+                    HttpResponse::Ok()
+                }),
+            ),
+        ));
+
+        let req = TestRequest::with_uri("/app/t").to_request();
+        let resp = call_service(&mut srv, req);
+        assert_eq!(resp.status(), StatusCode::OK);
+    }
+
+    #[test]
+    fn test_override_register_data() {
+        let mut srv = init_service(App::new().register_data(web::Data::new(1usize)).service(
+            web::scope("app").register_data(web::Data::new(10usize)).route(
+                "/t",
+                web::get().to(|data: web::Data<usize>| {
+                    assert_eq!(*data, 10);
+                    let _ = data.clone();
                     HttpResponse::Ok()
                 }),
             ),