(kb) update tests after keyboard region switching work

- two interactions now need the user to first press esc to get out of
current focus before continuing (I'd say an acceptable change?)
- sometimes when we want to return on the "app focus", it won't mean the
clipboard element anymore

Author: manuhabitela

test/nbrowser/AccessRules1.ts

@@ -451,7 +451,7 @@ describe('AccessRules1', function() {
       "Add Widget to Page",
     ]);
     await driver.sendKeys(Key.ESCAPE);
-    await gu.waitAppFocus();
+    await gu.waitForFocus('body');
   });
 
   it('should support dollar syntax in the editor', async function() {

test/nbrowser/RefTransforms.ts

@@ -91,6 +91,7 @@ describe('RefTransforms', function() {
     await gu.waitForServer();
 
     // Add some references to values in the same table.
+    await gu.sendKeys(Key.ESCAPE); // First ESCAPE to get out of select focus.
     await gu.sendKeys(Key.ENTER, 'foo', Key.ENTER, 'bar', Key.ENTER, Key.ENTER);
     await gu.waitForServer();
 

test/nbrowser/TokenField.ts

@@ -91,6 +91,7 @@ describe('TokenField', function() {
     await gu.waitForServer();
 
     // Add two films.
+    await gu.sendKeys(Key.ESCAPE); // First ESCAPE to get out of select/panel focus.
     await gu.sendKeys(Key.ENTER);
     await gu.sendKeys('Toy', Key.ENTER);
     await gu.sendKeys('Alien', Key.ENTER);

test/nbrowser/gristUtils.ts

@@ -795,7 +795,6 @@ export async function enterCell(...keys: string[]) {
   }
   await driver.sendKeys(...keys);
   await waitForServer();    // Wait for the value to be saved
-  await waitAppFocus();     // Wait for the cell editor to be closed (maybe unnecessary)
 }
 
 /**
@@ -1163,7 +1162,6 @@ export async function docMenuImport(filePath: string) {
   });
 }
 
-
 /**
  * Wait for the focus to return to the main application, i.e. the special .copypaste element that
  * normally has it (as opposed to an open cell editor, or a focus in some input or menu). Specify
@@ -1173,6 +1171,13 @@ export async function waitAppFocus(yesNo: boolean = true): Promise<void> {
   await driver.wait(async () => (await driver.find('.copypaste').hasFocus()) === yesNo, 5000);
 }
 
+/**
+ * Wait for the focus to be on the first element matching given selector.
+ */
+export async function waitForFocus(selector: string): Promise<void> {
+  await driver.wait(async () => (await driver.find(selector).hasFocus()), 1000);
+}
+
 export async function waitForLabelInput(): Promise<void> {
   await driver.wait(async () => (await driver.findWait('.test-column-title-label', 100).hasFocus()), 300);
 }