Merge lp:~dobey/pay-ui/js-dialogs into lp:pay-ui

[dobey]

Add support for JS dialogs in the web view.

Please do not top approve, as landing clicks in the store requires a bit of manual work still.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/136/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-14.09-touch/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/33
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/21
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18921

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/136/rebuild

review: Approve (continuous-integration)

[lp:~dobey/pay-ui/js-dialogs]

118. By dobey on 2015-03-18

Add the ModalDialog from webbrowser-app as well, needed by JS dialogs.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/22
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/34/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/137/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-14.09-touch/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/24
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18950

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/138/rebuild

review: Approve (continuous-integration)

[lp:~dobey/pay-ui/js-dialogs]

119. By dobey on 2015-03-25

Update tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-14.09-touch/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/26
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19173

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/139/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Branch looks good.

review: Approve

=== added file 'app/components/AlertDialog.qml'
--- app/components/AlertDialog.qml	1970-01-01 00:00:00 +0000
+++ app/components/AlertDialog.qml	2015-03-25 20:08:56 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    objectName: "alertDialog"
+    title: i18n.dtr("webbrowser-app", "JavaScript Alert")
+
+    Button {
+        objectName: "dialogOkButton"
+        text: i18n.dtr("webbrowser-app", "OK")
+        onClicked: model.accept()
+    }
+}

=== added file 'app/components/BeforeUnloadDialog.qml'
--- app/components/BeforeUnloadDialog.qml	1970-01-01 00:00:00 +0000
+++ app/components/BeforeUnloadDialog.qml	2015-03-25 20:08:56 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    title: i18n.dtr("webbrowser-app", "Confirm Navigation")
+    objectName: "beforeUnloadDialog"
+
+    Button {
+        objectName: "leaveButton"
+        text: i18n.dtr("webbrowser-app", "Leave")
+        onClicked: model.accept()
+    }
+
+    Button {
+        objectName: "stayButton"
+        text: i18n.dtr("webbrowser-app", "Stay")
+        onClicked: model.reject()
+    }
+}

=== added file 'app/components/ConfirmDialog.qml'
--- app/components/ConfirmDialog.qml	1970-01-01 00:00:00 +0000
+++ app/components/ConfirmDialog.qml	2015-03-25 20:08:56 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    objectName: "confirmDialog"
+    title: i18n.dtr("webbrowser-app", "JavaScript Confirmation")
+
+    Button {
+        objectName: "dialogOkButton"
+        text: i18n.dtr("webbrowser-app", "OK")
+        onClicked: model.accept()
+    }
+
+    Button {
+        objectName: "dialogCancelButton"
+        text: i18n.dtr("webbrowser-app", "Cancel")
+        onClicked: model.reject()
+    }
+}

=== added file 'app/components/ModalDialog.qml'
--- app/components/ModalDialog.qml	1970-01-01 00:00:00 +0000
+++ app/components/ModalDialog.qml	2015-03-25 20:08:56 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0 as Popups
+
+Popups.Dialog {
+    text: model.message
+
+    // Set the parent at construction time, instead of letting show()
+    // set it later on, which for some reason results in the size of
+    // the dialog not being updated.
+    parent: QuickUtils.rootItem(this)
+
+    Component.onCompleted: show()
+}

=== added file 'app/components/PromptDialog.qml'
--- app/components/PromptDialog.qml	1970-01-01 00:00:00 +0000
+++ app/components/PromptDialog.qml	2015-03-25 20:08:56 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    title: i18n.dtr("webbrowser-app", "JavaScript Prompt")
+
+    TextField {
+        objectName: "dialogInput"
+        id: input
+        text: model.defaultValue
+        onAccepted: model.accept(input.text)
+    }
+
+    Button {
+        objectName: "dialogOkButton"
+        text: i18n.dtr("webbrowser-app", "OK")
+        color: "green"
+        onClicked: model.accept(input.text)
+    }
+
+    Button {
+        objectName: "dialogCancelButton"
+        text: i18n.dtr("webbrowser-app", "Cancel")
+        color: UbuntuColors.coolGrey
+        onClicked: model.reject()
+    }
+
+    Binding {
+        target: model
+        property: "currentValue"
+        value: input.text
+    }
+}

=== modified file 'app/ui/UbuntuPurchaseWebkit.qml'
--- app/ui/UbuntuPurchaseWebkit.qml	2015-01-07 03:46:02 +0000
+++ app/ui/UbuntuPurchaseWebkit.qml	2015-03-25 20:08:56 +0000
@@ -80,6 +80,12 @@
         anchors.fill: parent
         anchors.bottomMargin: pageWebkit.keyboardSize
 
+        // We need to specify the dialogs to use for JS dialogs here.
+        alertDialog: AlertDialog {}
+        confirmDialog: ConfirmDialog {}
+        promptDialog: PromptDialog {}
+        beforeUnloadDialog: BeforeUnloadDialog {}
+
         onLoadingChanged: {
             pageWebkit.loading(webView.loading);
         }

=== modified file 'tests/autopilot/pay_ui/tests/mock_server.py'
--- tests/autopilot/pay_ui/tests/mock_server.py	2015-02-12 18:15:25 +0000
+++ tests/autopilot/pay_ui/tests/mock_server.py	2015-03-25 20:08:56 +0000
@@ -22,7 +22,7 @@
 
 html_success = """
 <html>
-    <body bgcolor="green" onClick="window.location.assign('/click/succeeded')">
+    <body bgcolor="green" onClick="window.location.assign('/paymentmethods/completeadd')">
         <h1>Placeholder for web interaction</h1>
         <p>Click anywhere to proceed</p>
     </body>
@@ -38,6 +38,80 @@
 </html>"
 """
 
+html_completed = """
+<html>
+    <body onLoad="window.location.assign('/click/succeeded')">
+    </body>
+</html>
+"""
+
+html_beforeunload = """
+<html>
+    <script language="javascript">
+        window.onbeforeunload = function() {
+            return 'Really want to add your card?'
+        }
+        window.onload = function() {
+            window.location.assign('/click/cancelled')
+        }
+        window.onclick = function() {
+            window.onbeforeunload = null;
+            window.location.assign('/paymentmethods/completeadd')
+        }
+    </script>
+    <body bgcolor="yellow">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click 'Stay' and then anywhere to proceed.</p>
+    </body>
+</html>
+"""
+
+html_alert = """
+<html>
+    <body onClick="window.location.assign('/paymentmethods/completeadd')"
+          onLoad="alert('Click OK to add your card.')">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click anywhere to proceed</p>
+     </body>
+</html>
+"""
+
+html_confirm = """
+<html>
+    <script language="javascript">
+        window.onload = function() {
+            if (window.confirm('Do you want to add your card?')) {
+                window.location.assign('/paymentmethods/completeadd')
+            } else {
+                window.location.assign('/click/cancelled')
+            }
+        }
+    </script>
+    <body bgcolor="pink">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click ok to add card, or cancel to not.</p>
+    </body>
+</html>
+"""
+
+html_prompt = """
+<html>
+    <script language="javascript">
+        window.onload = function() {
+            if (window.prompt('Speak friend and enter') == 'friend') {
+                window.location.assign('/paymentmethods/completeadd')
+            } else {
+                window.location.assign('/click/cancelled')
+            }
+        }
+    </script>
+    <body bgcolor="pink">
+        <h1>Placeholder for web interaction</h1>
+        <p>Type friend and ok to add card.</p>
+    </body>
+</html>
+"""
+
 
 class MyHandler(BaseHTTPRequestHandler):
 
@@ -72,17 +146,33 @@
             self.send_response(404)
         else:
             self.send_response(200)
-            if not self.server.interaction_cancel:
-                self.server.payment_types[1]["choices"].append({
-                    "currencies": ["USD"],
-                    "id": 1999,
-                    "requires_interaction": False,
-                    "preferred": False,
-                    "description": "Yet another payment method"
-                })
-        self.send_header("Content-type", "text/html")
-        self.end_headers()
-        self.wfile.write(bytes(self.interaction_html(), 'UTF-8'))
+        self.send_header("Content-type", "text/html")
+        self.end_headers()
+        test = self.path.split('/')[1]
+        if test.find('js_alert') != -1:
+            self.wrile.write(bytes(html_alert, 'UTF-8'))
+        elif test.find('js_beforeunload') != -1:
+            self.wfile.write(bytes(html_beforeunload, 'UTF-8'))
+        elif test.find('js_confirm') != -1:
+            self.wfile.write(bytes(html_confirm, 'UTF-8'))
+        elif test.find('js_prompt') != -1:
+            self.wfile.write(bytes(html_prompt, 'UTF-8'))
+        else:
+            self.wfile.write(bytes(self.interaction_html(), 'UTF-8'))
+
+    def response_payment_add_complete(self):
+        """Add the new payment info to the list."""
+        self.server.payment_types[1]["choices"].append({
+            "currencies": ["USD"],
+            "id": 1999,
+            "requires_interaction": False,
+            "preferred": False,
+            "description": "Yet another payment method"
+        })
+        self.send_response(200)
+        self.send_header("Content-type", "text/html")
+        self.end_headers()
+        self.wfile.write(bytes(html_completed, 'UTF-8'))
 
     def response_buy_item(self):
         response = {
@@ -153,6 +243,8 @@
         fail = self.path.find("/fail/") != -1
         if self.path.find("paymentmethods/add/") != -1:
             self.response_payment_add()
+        elif self.path.find("paymentmethods/completeadd") != -1:
+            self.response_payment_add_complete()
         elif self.path.find("paymentmethods/") != -1:
             self.response_payment_types(fail)
         elif self.path.find("creditcard_interaction/") != -1:

=== modified file 'tests/autopilot/pay_ui/tests/test_pay_ui.py'
--- tests/autopilot/pay_ui/tests/test_pay_ui.py	2015-02-12 18:15:25 +0000
+++ tests/autopilot/pay_ui/tests/test_pay_ui.py	2015-03-25 20:08:56 +0000
@@ -15,7 +15,9 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import fixtures
+import testtools
 import ubuntuuitoolkit
+
 from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
 
@@ -30,7 +32,8 @@
         self.mock_server = mock_server.MockServer()
         self.addCleanup(self.mock_server.shutdown)
         self.useFixture(fixtures.EnvironmentVariable(
-            'PAY_BASE_URL', self.mock_server.url()))
+            'PAY_BASE_URL',
+            self.mock_server.url() + '/' + self.id().split('.')[-1]))
         self.useFixture(fixtures.EnvironmentVariable(
             'U1_SEARCH_BASE_URL', self.mock_server.url('iteminfo/')))
         self.useFixture(fixtures.EnvironmentVariable('GET_CREDENTIALS', '0'))
@@ -41,12 +44,12 @@
         return self.app.process.wait(timeout=30)
 
     def tap(self, objectName):
-        item = self.main_view.select_single(objectName=objectName)
+        item = self.main_view.wait_select_single(objectName=objectName)
         self.assertThat(item.enabled, Equals(True))
         self.main_view.pointing_device.click_object(item)
 
     def type_text(self, objectName, text):
-        item = self.main_view.select_single(
+        item = self.main_view.wait_select_single(
             ubuntuuitoolkit.TextField, objectName=objectName)
         item.write(text)
 
@@ -68,6 +71,7 @@
         payment_types = self.main_view.select_single(objectName="paymentTypes")
         self.assertThat(payment_types.get_option_count(), Equals(3))
         self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
         self.tap('webView')
         self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
 
@@ -76,7 +80,97 @@
         payment_types = self.main_view.select_single(objectName="paymentTypes")
         self.assertThat(payment_types.get_option_count(), Equals(3))
         self.tap('addCreditCardLabel')
-        self.tap('webView')
+        self.take_screenshot('add_card_page')
+        self.tap('webView')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    @testtools.skip('JS Alert dialog seems to not work.')
+    def test_add_credit_card_js_alert(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.tap('dialogOkbutton')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_beforeunload(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.tap('stayButton')
+        self.tap('webView')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    @testtools.skip('Clicking add card link second seems to not work.')
+    def test_add_credit_card_js_beforeunload_twice(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        dialog = self.main_view.wait_select_single(
+            objectName="beforeUnloadDialog")
+        self.tap('leaveButton')
+        dialog.wait_until_destroyed()
+        self.take_screenshot('beforeunload_left')
+        self.tap('addCreditCardLabel')
+        dialog = self.main_view.wait_select_single(
+            objectName="beforeUnloadDialog")
+        self.take_screenshot('beforeunload_back')
+        self.tap('stayButton')
+        dialog.wait_until_destroyed()
+        self.tap('webView')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_beforeunload_cancelled(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.tap('leaveButton')
+        self.take_screenshot('beforeunload_cancelled')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_add_credit_card_js_confirm_ok(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.tap('dialogOkButton')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_confirm_cancel(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.tap('dialogCancelButton')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_add_credit_card_js_prompt_ok(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.type_text('dialogInput', 'friend')
+        self.tap('dialogOkButton')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_prompt_ok_wrong_text(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.type_text('dialogInput', 'amigo')
+        self.tap('dialogOkButton')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_add_credit_card_js_prompt_cancel(self):
+        payment_types = self.main_view.select_single(objectName="paymentTypes")
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.tap('addCreditCardLabel')
+        self.take_screenshot('add_card_page')
+        self.tap('dialogCancelButton')
         self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
 
     def test_purchase_with_web_interaction_completed(self):