Fix tests for virtual component

yewstack · Jun 8, 2018 · 41a22eb · 41a22eb
1 parent edcc898
commit 41a22eb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/tests/vcomp_test.rs b/tests/vcomp_test.rs
@@ -1,11 +1,9 @@
 #[macro_use]
 extern crate yew;
 
-use yew::html::{Component, Env, Html, Renderable, ShouldRender};
+use yew::prelude::*;
 use yew::virtual_dom::VNode;
 
-type Ctx = ();
-
 struct Comp;
 
 #[derive(PartialEq, Clone)]
@@ -23,40 +21,40 @@ impl Default for Props {
     }
 }
 
-impl Component<Ctx> for Comp {
+impl Component for Comp {
     type Message = ();
     type Properties = Props;
 
-    fn create(_: Self::Properties, _: &mut Env<Ctx, Self>) -> Self {
+    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
         Comp
     }
 
-    fn update(&mut self, _: Self::Message, _: &mut Env<Ctx, Self>) -> ShouldRender {
+    fn update(&mut self, _: Self::Message) -> ShouldRender {
         unimplemented!();
     }
 }
 
-impl Renderable<Ctx, Comp> for Comp {
-    fn view(&self) -> Html<Ctx, Self> {
+impl Renderable<Comp> for Comp {
+    fn view(&self) -> Html<Self> {
         unimplemented!();
     }
 }
 
 #[test]
 fn set_properties_to_component() {
-    let _: VNode<Ctx, Comp> = html! {
+    let _: VNode<Comp> = html! {
         <Comp: />
     };
 
-    let _: VNode<Ctx, Comp> = html! {
+    let _: VNode<Comp> = html! {
         <Comp: field_1=1, />
     };
 
-    let _: VNode<Ctx, Comp> = html! {
+    let _: VNode<Comp> = html! {
         <Comp: field_2=2, />
     };
 
-    let _: VNode<Ctx, Comp> = html! {
+    let _: VNode<Comp> = html! {
         <Comp: field_1=1, field_2=2, />
     };
 
@@ -65,7 +63,7 @@ fn set_properties_to_component() {
         field_2: 1,
     };
 
-    let _: VNode<Ctx, Comp> = html! {
+    let _: VNode<Comp> = html! {
         <Comp: with props, field_2=2, />
     };
 }
diff --git a/tests/vlist_test.rs b/tests/vlist_test.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate yew;
 
-use yew::html::{Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::prelude::*;
 use yew::virtual_dom::VNode;
 
 struct Comp;

diff --git a/tests/vtag_test.rs b/tests/vtag_test.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate yew;
 
-use yew::html::{Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::prelude::*;
 use yew::virtual_dom::VNode;
 
 struct Comp;