From 6401dc6a7ff4614c5aa5f6a9c7e4769afcc10e70 Mon Sep 17 00:00:00 2001 From: benedikt-bartscher <31854409+benedikt-bartscher@users.noreply.github.com> Date: Tue, 23 Jan 2024 21:20:34 +0100 Subject: [PATCH] extend state inheritance tests with non-computed vars (#2425) --- integration/test_state_inheritance.py | 172 +++++++++++++++++++------- 1 file changed, 126 insertions(+), 46 deletions(-) diff --git a/integration/test_state_inheritance.py b/integration/test_state_inheritance.py index 143be2f4f..9ceafa228 100644 --- a/integration/test_state_inheritance.py +++ b/integration/test_state_inheritance.py @@ -13,29 +13,39 @@ def StateInheritance(): import reflex as rx class ChildMixin: + child_mixin: str = "child_mixin" + @rx.var - def child_mixin(self) -> str: - return "child_mixin" + def computed_child_mixin(self) -> str: + return "computed_child_mixin" class Mixin(ChildMixin): + mixin: str = "mixin" + @rx.var - def mixin(self) -> str: - return "mixin" + def computed_mixin(self) -> str: + return "computed_mixin" class OtherMixin(rx.Base): + other_mixin: str = "other_mixin" + @rx.var - def other_mixin(self) -> str: - return "other_mixin" + def computed_other_mixin(self) -> str: + return "computed_other_mixin" class Base1(rx.State, Mixin): + base1: str = "base1" + @rx.var - def basevar(self) -> str: - return "basevar1" + def computed_basevar(self) -> str: + return "computed_basevar1" class Base2(rx.State): + base2: str = "base2" + @rx.var - def basevar(self) -> str: - return "basevar2" + def computed_basevar(self) -> str: + return "computed_basevar2" class Child1(Base1, OtherMixin): pass @@ -44,32 +54,51 @@ def StateInheritance(): pass class Child3(Child2): + child3: str = "child3" + @rx.var - def childvar(self) -> str: - return "childvar" + def computed_childvar(self) -> str: + return "computed_childvar" def index() -> rx.Component: return rx.vstack( rx.input( id="token", value=Base1.router.session.client_token, is_read_only=True ), + rx.heading(Base1.computed_mixin, id="base1-computed_mixin"), + rx.heading(Base1.computed_basevar, id="base1-computed_basevar"), + rx.heading(Base1.computed_child_mixin, id="base1-child-mixin"), + rx.heading(Base1.base1, id="base1-base1"), rx.heading(Base1.mixin, id="base1-mixin"), - rx.heading(Base1.basevar, id="base1-basevar"), - rx.heading(Base1.child_mixin, id="base1-child-mixin"), - rx.heading(Base2.basevar, id="base2-basevar"), - rx.heading(Child1.basevar, id="child1-basevar"), + rx.heading(Base1.child_mixin, id="base1-child_mixin"), + rx.heading(Base2.computed_basevar, id="base2-computed_basevar"), + rx.heading(Base2.base2, id="base2-base2"), + rx.heading(Child1.computed_basevar, id="child1-computed_basevar"), + rx.heading(Child1.computed_mixin, id="child1-computed_mixin"), + rx.heading(Child1.computed_other_mixin, id="child1-other-mixin"), + rx.heading(Child1.computed_child_mixin, id="child1-child-mixin"), + rx.heading(Child1.base1, id="child1-base1"), rx.heading(Child1.mixin, id="child1-mixin"), - rx.heading(Child1.other_mixin, id="child1-other-mixin"), - rx.heading(Child1.child_mixin, id="child1-child-mixin"), - rx.heading(Child2.basevar, id="child2-basevar"), + rx.heading(Child1.other_mixin, id="child1-other_mixin"), + rx.heading(Child1.child_mixin, id="child1-child_mixin"), + rx.heading(Child2.computed_basevar, id="child2-computed_basevar"), + rx.heading(Child2.computed_mixin, id="child2-computed_mixin"), + rx.heading(Child2.computed_other_mixin, id="child2-other-mixin"), + rx.heading(Child2.computed_child_mixin, id="child2-child-mixin"), + rx.heading(Child2.base2, id="child2-base2"), rx.heading(Child2.mixin, id="child2-mixin"), - rx.heading(Child2.other_mixin, id="child2-other-mixin"), - rx.heading(Child2.child_mixin, id="child2-child-mixin"), - rx.heading(Child3.basevar, id="child3-basevar"), + rx.heading(Child2.other_mixin, id="child2-other_mixin"), + rx.heading(Child2.child_mixin, id="child2-child_mixin"), + rx.heading(Child3.computed_basevar, id="child3-computed_basevar"), + rx.heading(Child3.computed_mixin, id="child3-computed_mixin"), + rx.heading(Child3.computed_other_mixin, id="child3-other-mixin"), + rx.heading(Child3.computed_childvar, id="child3-computed_childvar"), + rx.heading(Child3.computed_child_mixin, id="child3-child-mixin"), + rx.heading(Child3.child3, id="child3-child3"), + rx.heading(Child3.base2, id="child3-base2"), rx.heading(Child3.mixin, id="child3-mixin"), - rx.heading(Child3.other_mixin, id="child3-other-mixin"), - rx.heading(Child3.childvar, id="child3-childvar"), - rx.heading(Child3.child_mixin, id="child3-child-mixin"), + rx.heading(Child3.other_mixin, id="child3-other_mixin"), + rx.heading(Child3.child_mixin, id="child3-child_mixin"), ) app = rx.App() @@ -149,53 +178,104 @@ def test_state_inheritance( """ assert state_inheritance.app_instance is not None + base1_mixin = driver.find_element(By.ID, "base1-computed_mixin") + assert base1_mixin.text == "computed_mixin" + + base1_computed_basevar = driver.find_element(By.ID, "base1-computed_basevar") + assert base1_computed_basevar.text == "computed_basevar1" + + base1_computed_child_mixin = driver.find_element(By.ID, "base1-child-mixin") + assert base1_computed_child_mixin.text == "computed_child_mixin" + + base1_base1 = driver.find_element(By.ID, "base1-base1") + assert base1_base1.text == "base1" + base1_mixin = driver.find_element(By.ID, "base1-mixin") assert base1_mixin.text == "mixin" - base1_basevar = driver.find_element(By.ID, "base1-basevar") - assert base1_basevar.text == "basevar1" - - base1_child_mixin = driver.find_element(By.ID, "base1-child-mixin") + base1_child_mixin = driver.find_element(By.ID, "base1-child_mixin") assert base1_child_mixin.text == "child_mixin" - base2_basevar = driver.find_element(By.ID, "base2-basevar") - assert base2_basevar.text == "basevar2" + base2_computed_basevar = driver.find_element(By.ID, "base2-computed_basevar") + assert base2_computed_basevar.text == "computed_basevar2" - child1_basevar = driver.find_element(By.ID, "child1-basevar") - assert child1_basevar.text == "basevar1" + base2_base2 = driver.find_element(By.ID, "base2-base2") + assert base2_base2.text == "base2" + + child1_computed_basevar = driver.find_element(By.ID, "child1-computed_basevar") + assert child1_computed_basevar.text == "computed_basevar1" + + child1_mixin = driver.find_element(By.ID, "child1-computed_mixin") + assert child1_mixin.text == "computed_mixin" + + child1_computed_other_mixin = driver.find_element(By.ID, "child1-other-mixin") + assert child1_computed_other_mixin.text == "computed_other_mixin" + + child1_computed_child_mixin = driver.find_element(By.ID, "child1-child-mixin") + assert child1_computed_child_mixin.text == "computed_child_mixin" + + child1_base1 = driver.find_element(By.ID, "child1-base1") + assert child1_base1.text == "base1" child1_mixin = driver.find_element(By.ID, "child1-mixin") assert child1_mixin.text == "mixin" - child1_other_mixin = driver.find_element(By.ID, "child1-other-mixin") + child1_other_mixin = driver.find_element(By.ID, "child1-other_mixin") assert child1_other_mixin.text == "other_mixin" - child1_child_mixin = driver.find_element(By.ID, "child1-child-mixin") + child1_child_mixin = driver.find_element(By.ID, "child1-child_mixin") assert child1_child_mixin.text == "child_mixin" - child2_basevar = driver.find_element(By.ID, "child2-basevar") - assert child2_basevar.text == "basevar2" + child2_computed_basevar = driver.find_element(By.ID, "child2-computed_basevar") + assert child2_computed_basevar.text == "computed_basevar2" + + child2_mixin = driver.find_element(By.ID, "child2-computed_mixin") + assert child2_mixin.text == "computed_mixin" + + child2_computed_other_mixin = driver.find_element(By.ID, "child2-other-mixin") + assert child2_computed_other_mixin.text == "computed_other_mixin" + + child2_computed_child_mixin = driver.find_element(By.ID, "child2-child-mixin") + assert child2_computed_child_mixin.text == "computed_child_mixin" + + child2_base2 = driver.find_element(By.ID, "child2-base2") + assert child2_base2.text == "base2" child2_mixin = driver.find_element(By.ID, "child2-mixin") assert child2_mixin.text == "mixin" - child2_other_mixin = driver.find_element(By.ID, "child2-other-mixin") + child2_other_mixin = driver.find_element(By.ID, "child2-other_mixin") assert child2_other_mixin.text == "other_mixin" - child2_child_mixin = driver.find_element(By.ID, "child2-child-mixin") + child2_child_mixin = driver.find_element(By.ID, "child2-child_mixin") assert child2_child_mixin.text == "child_mixin" - child3_basevar = driver.find_element(By.ID, "child3-basevar") - assert child3_basevar.text == "basevar2" + child3_computed_basevar = driver.find_element(By.ID, "child3-computed_basevar") + assert child3_computed_basevar.text == "computed_basevar2" + + child3_mixin = driver.find_element(By.ID, "child3-computed_mixin") + assert child3_mixin.text == "computed_mixin" + + child3_computed_other_mixin = driver.find_element(By.ID, "child3-other-mixin") + assert child3_computed_other_mixin.text == "computed_other_mixin" + + child3_computed_childvar = driver.find_element(By.ID, "child3-computed_childvar") + assert child3_computed_childvar.text == "computed_childvar" + + child3_computed_child_mixin = driver.find_element(By.ID, "child3-child-mixin") + assert child3_computed_child_mixin.text == "computed_child_mixin" + + child3_child3 = driver.find_element(By.ID, "child3-child3") + assert child3_child3.text == "child3" + + child3_base2 = driver.find_element(By.ID, "child3-base2") + assert child3_base2.text == "base2" child3_mixin = driver.find_element(By.ID, "child3-mixin") assert child3_mixin.text == "mixin" - child3_other_mixin = driver.find_element(By.ID, "child3-other-mixin") + child3_other_mixin = driver.find_element(By.ID, "child3-other_mixin") assert child3_other_mixin.text == "other_mixin" - child3_childvar = driver.find_element(By.ID, "child3-childvar") - assert child3_childvar.text == "childvar" - - child3_child_mixin = driver.find_element(By.ID, "child3-child-mixin") + child3_child_mixin = driver.find_element(By.ID, "child3-child_mixin") assert child3_child_mixin.text == "child_mixin"