@@ -923,7 +923,7 @@ final class BrowserPaneNavigationKeybindUITests: XCTestCase {
923923 timeout: 5.0 ,
924924 predicate: { data in
925925 data [ " browserArrowActiveElementId " ] == textareaId &&
926- data [ " browserArrowDownCount " ] == " \( postCmdLDownCount) " &&
926+ data [ " browserArrowDownCount " ] == " \( postCmdLDownCount + 1 ) " &&
927927 data [ " browserArrowUpCount " ] == " \( postCmdLUpCount) " &&
928928 data [ " browserArrowCommandShiftDownCount " ] == " \( baselineCommandShiftDownCount + 1 ) " &&
929929 data [ " browserArrowCommandShiftUpCount " ] == " \( baselineCommandShiftUpCount) "
@@ -932,15 +932,16 @@ final class BrowserPaneNavigationKeybindUITests: XCTestCase {
932932 XCTFail ( " Expected Cmd+Shift+Down after Cmd+L to reach the textarea. data= \( String ( describing: loadData ( ) ) ) " )
933933 return
934934 }
935+ let postCmdLDownCountAfterCommandShiftDown = Int ( postCmdLCommandShiftDownSnapshot [ " browserArrowDownCount " ] ?? " " ) ?? - 1
935936 let postCmdLCommandShiftDownCount = Int ( postCmdLCommandShiftDownSnapshot [ " browserArrowCommandShiftDownCount " ] ?? " " ) ?? - 1
936937
937938 simulateShortcut ( " cmdShiftUp " , app: app)
938939 guard let postCmdLCommandShiftUpSnapshot = waitForDataSnapshot (
939940 timeout: 5.0 ,
940941 predicate: { data in
941942 data [ " browserArrowActiveElementId " ] == textareaId &&
942- data [ " browserArrowDownCount " ] == " \( postCmdLDownCount ) " &&
943- data [ " browserArrowUpCount " ] == " \( postCmdLUpCount) " &&
943+ data [ " browserArrowDownCount " ] == " \( postCmdLDownCountAfterCommandShiftDown ) " &&
944+ data [ " browserArrowUpCount " ] == " \( postCmdLUpCount + 1 ) " &&
944945 data [ " browserArrowCommandShiftDownCount " ] == " \( postCmdLCommandShiftDownCount) " &&
945946 data [ " browserArrowCommandShiftUpCount " ] == " \( baselineCommandShiftUpCount + 1 ) "
946947 }
@@ -1152,7 +1153,7 @@ final class BrowserPaneNavigationKeybindUITests: XCTestCase {
11521153 timeout: 5.0 ,
11531154 predicate: { data in
11541155 data [ " browserContentEditableActiveElementId " ] == editorId &&
1155- data [ " browserContentEditableDownCount " ] == " \( postCmdLDownCount) " &&
1156+ data [ " browserContentEditableDownCount " ] == " \( postCmdLDownCount + 1 ) " &&
11561157 data [ " browserContentEditableUpCount " ] == " \( postCmdLUpCount) " &&
11571158 data [ " browserContentEditableCommandShiftDownCount " ] == " \( baselineCommandShiftDownCount + 1 ) " &&
11581159 data [ " browserContentEditableCommandShiftUpCount " ] == " \( baselineCommandShiftUpCount) "
@@ -1161,15 +1162,16 @@ final class BrowserPaneNavigationKeybindUITests: XCTestCase {
11611162 XCTFail ( " Expected Cmd+Shift+Down after Cmd+L to reach the contenteditable fixture. data= \( String ( describing: loadData ( ) ) ) " )
11621163 return
11631164 }
1165+ let postCmdLDownCountAfterCommandShiftDown = Int ( postCmdLCommandShiftDownSnapshot [ " browserContentEditableDownCount " ] ?? " " ) ?? - 1
11641166 let postCmdLCommandShiftDownCount = Int ( postCmdLCommandShiftDownSnapshot [ " browserContentEditableCommandShiftDownCount " ] ?? " " ) ?? - 1
11651167
11661168 simulateShortcut ( " cmdShiftUp " , app: app)
11671169 guard let postCmdLCommandShiftUpSnapshot = waitForDataSnapshot (
11681170 timeout: 5.0 ,
11691171 predicate: { data in
11701172 data [ " browserContentEditableActiveElementId " ] == editorId &&
1171- data [ " browserContentEditableDownCount " ] == " \( postCmdLDownCount ) " &&
1172- data [ " browserContentEditableUpCount " ] == " \( postCmdLUpCount) " &&
1173+ data [ " browserContentEditableDownCount " ] == " \( postCmdLDownCountAfterCommandShiftDown ) " &&
1174+ data [ " browserContentEditableUpCount " ] == " \( postCmdLUpCount + 1 ) " &&
11731175 data [ " browserContentEditableCommandShiftDownCount " ] == " \( postCmdLCommandShiftDownCount) " &&
11741176 data [ " browserContentEditableCommandShiftUpCount " ] == " \( baselineCommandShiftUpCount + 1 ) "
11751177 }
0 commit comments