renamed webdriver popup commands from next to visible

Author: corevo

packages/selenium-ide/src/content/prompt-injector.js

@@ -40,9 +40,9 @@ if (window === window.top) {
             }
             record("assertPrompt", [[event.data.recordedMessage]], "", false, event.data.frameLocation);
             if (event.data.recordedResult != null) {
-              record("webdriverAnswerOnNextPrompt", [[event.data.recordedResult]], "", false, event.data.frameLocation);
+              record("webdriverAnswerOnVisiblePrompt", [[event.data.recordedResult]], "", false, event.data.frameLocation);
             } else {
-              record("webdriverChooseCancelOnNextPrompt", [[""]], "", false, event.data.frameLocation);
+              record("webdriverChooseCancelOnVisiblePrompt", [[""]], "", false, event.data.frameLocation);
             }
             break;
           case "confirm":
@@ -53,9 +53,9 @@ if (window === window.top) {
             }
             record("assertConfirmation", [[event.data.recordedMessage]], "", false, event.data.frameLocation);
             if (event.data.recordedResult == true) {
-              record("webdriverChooseOkOnNextConfirmation", [[""]], "", false, event.data.frameLocation);
+              record("webdriverChooseOkOnVisibleConfirmation", [[""]], "", false, event.data.frameLocation);
             } else {
-              record("webdriverChooseCancelOnNextConfirmation", [[""]], "", false, event.data.frameLocation);
+              record("webdriverChooseCancelOnVisibleConfirmation", [[""]], "", false, event.data.frameLocation);
             }
             break;
           case "alert":

packages/selenium-ide/src/neo/models/Command.js

@@ -218,7 +218,7 @@ class CommandList {
       name: "answer on next prompt",
       description: "Affects the next alert prompt. This command will send \
                     the specified answer string to it. If the alert is already \
-                    present, then use \"webdriver answer on next prompt\" instead.",
+                    present, then use \"webdriver answer on visible prompt\" instead.",
       target: ArgTypes.answer
     }],
     [ "assertAlert", {
@@ -327,19 +327,19 @@ class CommandList {
       name: "choose cancel on next confirmation",
       description: "Affects the next confirmation alert. This command will \
                     cancel it. If the alert is already present, then use \
-                    \"webdriver choose cancel on next confirmation\" instead."
+                    \"webdriver choose cancel on visible confirmation\" instead."
     }],
     [ "chooseCancelOnNextPrompt", {
       name: "choose cancel on next prompt",
       description: "Affects the next alert prompt. This command will cancel \
                     it. If the alert is already present, then use \"webdriver \
-                    choose cancel on next prompt\" instead."
+                    choose cancel on visible prompt\" instead."
     }],
     [ "chooseOkOnNextConfirmation", {
       name: "choose ok on next confirmation",
       description: "Affects the next confirmation alert. This command will accept \
                     it. If the alert is already present, then use \"webdriver \
-                    choose ok on next confirmation\" instead."
+                    choose ok on visible confirmation\" instead."
     }],
     [ "click", {
       name: "click",
@@ -687,30 +687,30 @@ class CommandList {
       target: ArgTypes.selectLocator,
       value: ArgTypes.pattern
     }],
-    [ "webdriverAnswerOnNextPrompt", {
-      name: "webdriver answer on next prompt",
+    [ "webdriverAnswerOnVisiblePrompt", {
+      name: "webdriver answer on visible prompt",
       description: "Affects a currently showing alert prompt. This command \
                     instructs Selenium to provide the specified answer to it. \
                     If the alert has not appeared yet then use \"answer on next \
                     prompt\" instead.",
       target: ArgTypes.answer
     }],
-    [ "webdriverChooseCancelOnNextConfirmation", {
-      name: "webdriver choose cancel on next confirmation",
+    [ "webdriverChooseCancelOnVisibleConfirmation", {
+      name: "webdriver choose cancel on visible confirmation",
       description: "Affects a currently showing confirmation alert. This command \
                     instructs Selenium to cancel it. If the alert has not \
                     appeared yet then use \"choose cancel on next confirmation\" \
                     instead."
     }],
-    [ "webdriverChooseCancelOnNextPrompt", {
-      name: "webdriver choose cancel on next prompt",
+    [ "webdriverChooseCancelOnVisiblePrompt", {
+      name: "webdriver choose cancel on visible prompt",
       description: "Affects a currently showing alert prompt. This command \
                     instructs Selenium to cancel it. If the alert has not \
                     appeared yet then use \"choose cancel on next prompt\" \
                     instead."
     }],
-    [ "webdriverChooseOkOnNextConfirmation", {
-      name: "webdriver choose ok on next confirmation",
+    [ "webdriverChooseOkOnVisibleConfirmation", {
+      name: "webdriver choose ok on visible confirmation",
       description: "Affects a currently showing confirmation alert. This command \
                     instructs Selenium to accept it. If the alert has not \
                     appeared yet then use \"choose ok on next confirmation\" \

packages/selianize/__tests__/command.spec.js

@@ -571,33 +571,33 @@ describe("command code emitter", () => {
     };
     return expect(CommandEmitter.emit(command)).resolves.toBe(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(\`${command.target}\`);});});`);
   });
-  it("should emit `choose ok on next confirmation` command", () => {
+  it("should emit `choose ok on visible confirmation` command", () => {
     const command = {
-      command: "webdriverChooseOkOnNextConfirmation",
+      command: "webdriverChooseOkOnVisibleConfirmation",
       target: "",
       value: ""
     };
     return expect(CommandEmitter.emit(command)).resolves.toBe("await driver.switchTo().alert().then(alert => {alert.accept();});");
   });
-  it("should emit `choose cancel on next confirmation` command", () => {
+  it("should emit `choose cancel on visible confirmation` command", () => {
     const command = {
-      command: "webdriverChooseCancelOnNextConfirmation",
+      command: "webdriverChooseCancelOnVisibleConfirmation",
       target: "",
       value: ""
     };
     return expect(CommandEmitter.emit(command)).resolves.toBe("await driver.switchTo().alert().then(alert => {alert.dismiss();});");
   });
-  it("should emit `answer on next prompt` command", () => {
+  it("should emit `answer on visible prompt` command", () => {
     const command = {
-      command: "webdriverAnswerOnNextPrompt",
+      command: "webdriverAnswerOnVisiblePrompt",
       target: "an answer",
       value: ""
     };
     return expect(CommandEmitter.emit(command)).resolves.toBe(`await driver.switchTo().alert().then(alert => {alert.sendKeys(\`${command.target}\`).then(() => {alert.accept();});});`);
   });
-  it("should emit `choose cancel on next prompt` command", () => {
+  it("should emit `choose cancel on visible prompt` command", () => {
     const command = {
-      command: "webdriverChooseCancelOnNextPrompt",
+      command: "webdriverChooseCancelOnVisiblePrompt",
       target: "",
       value: ""
     };

packages/selianize/src/command.js

@@ -83,10 +83,10 @@ const emitters = {
   assertNotText: emitVerifyNotText,
   assertPrompt: emitAssertAlert,
   assertConfirmation: emitAssertAlert,
-  webdriverAnswerOnNextPrompt: emitAnswerOnNextPrompt,
-  webdriverChooseOkOnNextConfirmation: emitChooseOkOnNextConfirmation,
-  webdriverChooseCancelOnNextConfirmation: emitChooseCancelOnNextConfirmation,
-  webdriverChooseCancelOnNextPrompt: emitChooseCancelOnNextConfirmation,
+  webdriverAnswerOnVisiblePrompt: emitAnswerOnNextPrompt,
+  webdriverChooseOkOnVisibleConfirmation: emitChooseOkOnNextConfirmation,
+  webdriverChooseCancelOnVisibleConfirmation: emitChooseCancelOnNextConfirmation,
+  webdriverChooseCancelOnVisiblePrompt: emitChooseCancelOnNextConfirmation,
   editContent: emitEditContent,
   submit: emitSubmit,
   answerOnNextPrompt: skip,