[test] check screen has changed after review

Author: spalmer25

tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00004.png

@@ -62,8 +62,15 @@ def _sign_decodable_too_long(tezos_navigator: TezosNavigator,
     """Sign a decodable too long message"""
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=path / "clear_n_too_long_warning")
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_ACCEPT, snap_path=path / "summary")
+        tezos_navigator.navigate_review(
+            text=ScreenText.ACCEPT_RISK,
+            screen_change_after_last_instruction=False,
+            snap_path=path / "clear_n_too_long_warning"
+        )
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_ACCEPT,
+            snap_path=path / "summary"
+        )
 
     _sign_too_long(tezos_navigator, message, navigate)
 
@@ -163,16 +170,26 @@ def test_reject_basic_too_long_operation_at_warning(tezos_navigator: TezosNaviga
     """Check reject too long operation at warning"""
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_REJECT, snap_path=snapshot_dir / "clear_n_too_long_warning")
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_REJECT,
+            snap_path=snapshot_dir / "clear_n_too_long_warning"
+        )
 
     _reject_too_long(tezos_navigator, BASIC_OPERATION, StatusCode.REJECT, navigate)
 
 def test_reject_basic_too_long_operation_at_summary(tezos_navigator: TezosNavigator, snapshot_dir: Path):
     """Check reject too long operation at summary"""
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=snapshot_dir / "clear_n_too_long_warning")
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_REJECT, snap_path=snapshot_dir / "summary")
+        tezos_navigator.navigate_review(
+            text=ScreenText.ACCEPT_RISK,
+            screen_change_after_last_instruction=False,
+            snap_path=snapshot_dir / "clear_n_too_long_warning"
+        )
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_REJECT,
+            snap_path=snapshot_dir / "summary"
+        )
 
     _reject_too_long(tezos_navigator, BASIC_OPERATION, StatusCode.REJECT, navigate)
 
@@ -326,25 +343,42 @@ def test_sign_too_long_operation_with_too_large(tezos_navigator: TezosNavigator,
     """Check sign too long operation that will also fail the parsing"""
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=snapshot_dir / "clear_n_too_large_warning")
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_ACCEPT, snap_path=snapshot_dir / "blindsigning")
+        tezos_navigator.navigate_review(
+            text=ScreenText.ACCEPT_RISK,
+            screen_change_after_last_instruction=False,
+            snap_path=snapshot_dir / "clear_n_too_large_warning"
+        )
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_ACCEPT,
+            snap_path=snapshot_dir / "blindsigning"
+        )
 
     _sign_too_long(tezos_navigator, OPERATION_WITH_TOO_LARGE, navigate)
 
 def test_reject_too_long_operation_with_too_large_at_too_large_warning(tezos_navigator: TezosNavigator, snapshot_dir: Path):
     """Check reject too long operation that will also fail the parsing at too large warning"""
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_REJECT, snap_path=snapshot_dir / "clear_n_too_large_warning")
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_REJECT,
+            snap_path=snapshot_dir / "clear_n_too_large_warning"
+        )
 
     _reject_too_long(tezos_navigator, OPERATION_WITH_TOO_LARGE, StatusCode.PARSE_ERROR, navigate)
 
 def test_reject_too_long_operation_with_too_large_at_blindsigning(tezos_navigator: TezosNavigator, snapshot_dir: Path):
     """Check reject too long operation that will also fail the parsing at blindsigning"""
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=snapshot_dir / "clear_n_too_large_warning")
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_REJECT, snap_path=snapshot_dir / "blindsigning")
+        tezos_navigator.navigate_review(
+            text=ScreenText.ACCEPT_RISK,
+            screen_change_after_last_instruction=False,
+            snap_path=snapshot_dir / "clear_n_too_large_warning"
+        )
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_REJECT,
+            snap_path=snapshot_dir / "blindsigning"
+        )
 
     _reject_too_long(tezos_navigator, OPERATION_WITH_TOO_LARGE, StatusCode.REJECT, navigate)
 
@@ -379,9 +413,16 @@ def navigate() -> None:
                 snap_path=snapshot_dir / "clear",
             )
         else:
-            tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=snapshot_dir / "clear")
+            tezos_navigator.navigate_review(
+                text=ScreenText.ACCEPT_RISK,
+                screen_change_after_last_instruction=False,
+                snap_path=snapshot_dir / "clear"
+            )
 
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_ACCEPT, snap_path=snapshot_dir / "blind")
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_ACCEPT,
+            snap_path=snapshot_dir / "blind"
+        )
 
     data = tezos_navigator.sign(
         DEFAULT_ACCOUNT,
@@ -401,8 +442,15 @@ def test_blindsign_too_large(tezos_navigator: TezosNavigator, snapshot_dir: Path
     message = MichelineExpr({'int':12345678901234567890123456789012345678901234567890123456789012345678901234567890})
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=snapshot_dir / "clear")
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_ACCEPT, snap_path=snapshot_dir / "blind")
+        tezos_navigator.navigate_review(
+            text=ScreenText.ACCEPT_RISK,
+            screen_change_after_last_instruction=False,
+            snap_path=snapshot_dir / "clear"
+        )
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_ACCEPT,
+            snap_path=snapshot_dir / "blind"
+        )
 
     data = tezos_navigator.sign(
         DEFAULT_ACCOUNT,
@@ -435,8 +483,15 @@ def test_blindsign_reject_from_blind(tezos_navigator: TezosNavigator, snapshot_d
     expression = MichelineExpr({'int':12345678901234567890123456789012345678901234567890123456789012345678901234567890})
 
     def navigate() -> None:
-        tezos_navigator.navigate_review(text=ScreenText.ACCEPT_RISK, snap_path=snapshot_dir / "clear")
-        tezos_navigator.navigate_review(text=ScreenText.SIGN_REJECT, snap_path=snapshot_dir / "blind")
+        tezos_navigator.navigate_review(
+            text=ScreenText.ACCEPT_RISK,
+            screen_change_after_last_instruction=False,
+            snap_path=snapshot_dir / "clear"
+        )
+        tezos_navigator.navigate_review(
+            text=ScreenText.SIGN_REJECT,
+            snap_path=snapshot_dir / "blind"
+        )
 
     with StatusCode.REJECT.expected():
         tezos_navigator.sign(

tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00004.png

@@ -87,6 +87,7 @@ def test_parsing_hard_fail(tezos_navigator: TezosNavigator, raw_msg: str, snapsh
             with_hash=True,
             navigate=lambda: tezos_navigator.navigate_review(
                 text=ScreenText.HOME,
+                screen_change_after_last_instruction=False,
                 snap_path=snapshot_dir
             )
         )

tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00004.png

@@ -38,8 +38,6 @@ def test_regression_continue_after_reject(
     with StatusCode.REJECT.expected():
         tezos_navigator.reject_public_key(DEFAULT_ACCOUNT, snap_path=snapshot_dir / "reject_public_key")
 
-    backend.wait_for_home_screen()
-
     message = Transaction(
         source = 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa',
         fee = 10000,

tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00004.png

@@ -224,12 +224,10 @@ def navigate_forward(self, **kwargs) -> None:
 
     def navigate_review(self,
                         screen_change_before_first_instruction=True,
-                        screen_change_after_last_instruction=False,
                         **kwargs) -> None:
         """Navigate forward until the text is found. Confirm at the end."""
         self.navigate_forward(
             screen_change_before_first_instruction=screen_change_before_first_instruction,
-            screen_change_after_last_instruction=screen_change_after_last_instruction,
             **kwargs
         )