Browse Source

fix ssr tests

Evan Almloff 1 year ago
parent
commit
16d5d00bdf

+ 1 - 1
packages/core/src/runtime.rs

@@ -130,7 +130,7 @@ impl Runtime {
 /// }
 ///
 /// // In a dynamic library
-/// #[derive(Props)]
+/// #[derive(Props, Clone)]
 /// struct ComponentProps {
 ///    runtime: std::rc::Rc<Runtime>,
 /// }

+ 0 - 2
packages/core/src/scope_context.rs

@@ -251,8 +251,6 @@ impl ScopeContext {
     /// # Example
     ///
     /// ```
-    /// use dioxus_core::ScopeState;
-    ///
     /// // prints a greeting on the initial render
     /// pub fn use_hello_world() {
     ///     cx.use_hook(|| println!("Hello, world!"));

+ 3 - 3
packages/ssr/src/renderer.rs

@@ -228,7 +228,7 @@ impl Renderer {
 fn to_string_works() {
     use dioxus::prelude::*;
 
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         let dynamic = 123;
         let dyn2 = "</diiiiiiiiv>"; // this should be escaped
 
@@ -288,7 +288,7 @@ fn to_string_works() {
 fn empty_for_loop_works() {
     use dioxus::prelude::*;
 
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! {
             div { class: "asdasdasd",
                 for _ in (0..5) {
@@ -331,7 +331,7 @@ fn empty_for_loop_works() {
 fn empty_render_works() {
     use dioxus::prelude::*;
 
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! {}
     }
 

+ 2 - 2
packages/ssr/tests/bool_attr.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 #[test]
 fn static_boolean_attributs() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! {
             div { hidden: "false" }
             div { hidden: "true" }
@@ -20,7 +20,7 @@ fn static_boolean_attributs() {
 
 #[test]
 fn dynamic_boolean_attributs() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! {
             div { hidden: false }
             div { hidden: true }

+ 15 - 15
packages/ssr/tests/hydration.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 #[test]
 fn root_ids() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! { div { width: "100px" } }
     }
 
@@ -17,7 +17,7 @@ fn root_ids() {
 
 #[test]
 fn dynamic_attributes() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         let dynamic = 123;
         render! {
             div { width: "100px", div { width: "{dynamic}px" } }
@@ -35,7 +35,7 @@ fn dynamic_attributes() {
 
 #[test]
 fn listeners() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! {
             div { width: "100px", div { onclick: |_| {} } }
         }
@@ -49,7 +49,7 @@ fn listeners() {
         r#"<div style="width:100px;" data-node-hydration="0"><div data-node-hydration="1,click:1"></div></div>"#
     );
 
-    fn app2(_: ()) -> Element {
+    fn app2() -> Element {
         let dynamic = 123;
         render! {
             div { width: "100px", div { width: "{dynamic}px", onclick: |_| {} } }
@@ -67,7 +67,7 @@ fn listeners() {
 
 #[test]
 fn text_nodes() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         let dynamic_text = "hello";
         render! {
             div { {dynamic_text} }
@@ -82,7 +82,7 @@ fn text_nodes() {
         r#"<div data-node-hydration="0"><!--node-id1-->hello<!--#--></div>"#
     );
 
-    fn app2(_: ()) -> Element {
+    fn app2() -> Element {
         let dynamic = 123;
         render! {
             div { "{dynamic}", "{1234}" }
@@ -101,11 +101,11 @@ fn text_nodes() {
 #[allow(non_snake_case)]
 #[test]
 fn components_hydrate() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! { Child {} }
     }
 
-    fn Child(_: ()) -> Element {
+    fn Child() -> Element {
         render! { div { "hello" } }
     }
 
@@ -117,11 +117,11 @@ fn components_hydrate() {
         r#"<div data-node-hydration="0">hello</div>"#
     );
 
-    fn app2(_: ()) -> Element {
+    fn app2() -> Element {
         render! { Child2 {} }
     }
 
-    fn Child2(_: ()) -> Element {
+    fn Child2() -> Element {
         let dyn_text = "hello";
         render! {
             div { {dyn_text} }
@@ -136,11 +136,11 @@ fn components_hydrate() {
         r#"<div data-node-hydration="0"><!--node-id1-->hello<!--#--></div>"#
     );
 
-    fn app3(_: ()) -> Element {
+    fn app3() -> Element {
         render! { Child3 {} }
     }
 
-    fn Child3(_: ()) -> Element {
+    fn Child3() -> Element {
         render! { div { width: "{1}" } }
     }
 
@@ -152,11 +152,11 @@ fn components_hydrate() {
         r#"<div style="width:1;" data-node-hydration="0"></div>"#
     );
 
-    fn app4(_: ()) -> Element {
+    fn app4() -> Element {
         render! { Child4 {} }
     }
 
-    fn Child4(_: ()) -> Element {
+    fn Child4() -> Element {
         render! {
             for _ in 0..2 {
                 {render! { "{1}" }}
@@ -177,7 +177,7 @@ fn components_hydrate() {
 fn hello_world_hydrates() {
     use dioxus_signals::use_signal;
 
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         let mut count = use_signal(|| 0);
 
         render! {

+ 2 - 2
packages/ssr/tests/inner_html.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 #[test]
 fn static_inner_html() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! { div { dangerous_inner_html: "<div>1234</div>" } }
     }
 
@@ -14,7 +14,7 @@ fn static_inner_html() {
 
 #[test]
 fn dynamic_inner_html() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         let inner_html = "<div>1234</div>";
         render! { div { dangerous_inner_html: "{inner_html}" } }
     }

+ 12 - 6
packages/ssr/tests/simple.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 #[test]
 fn simple() {
-    fn App(_: ()) -> Element {
+    fn App() -> Element {
         render! { div { "hello!" } }
     }
 
@@ -22,8 +22,10 @@ fn lists() {
     assert_eq!(
         dioxus_ssr::render_element(render! {
             ul {
-                (0..5).map(|i| render! {
-                    li { "item {i}" }
+                {
+                    (0..5).map(|i| render! {
+                        li { "item {i}" }
+                    })
                 }
             }
         }),
@@ -56,8 +58,10 @@ fn components() {
     assert_eq!(
         dioxus_ssr::render_element(render! {
             div {
-                (0..5).map(|name| render! {
-                    MyComponent { name: name }
+                {
+                    (0..5).map(|name| render! {
+                        MyComponent { name: name }
+                    })
                 }
             }
         }),
@@ -70,7 +74,9 @@ fn fragments() {
     assert_eq!(
         dioxus_ssr::render_element(render! {
             div {
-                (0..5).map(|_| render! (()))
+                {
+                    (0..5).map(|_| render! ({}))
+                }
             }
         }),
         "<div></div>"

+ 1 - 1
packages/ssr/tests/styles.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 #[test]
 fn static_styles() {
-    fn app(_: ()) -> Element {
+    fn app() -> Element {
         render! { div { width: "100px" } }
     }