author Henrik Skupin <mail@hskupin.info>

Thu, 29 Jun 2017 15:46:45 -0700

changeset 602349 0e1ee64152fb957ae9732b5b2a186289adad0a6f

parent 601255 cc903e3f61894e60c3b0efaf05e9a446d1d85888

child 602350 18509848b93ff38e17db82f24f6295493b0c95be

push id 66394

push user bmo:hskupin@gmail.com

push date Thu, 29 Jun 2017 22:49:16 +0000

bugs 1360687

milestone 56.0a1

testing/firefox-ui/resources/addons/extensions/restartless_addon_signed.xpi file | annotate | diff | comparison | revisions

testing/firefox-ui/resources/addons/extensions/restartless_addon_unsigned.xpi file | annotate | diff | comparison | revisions

testing/firefox-ui/resources/addons/extensions/webextension-signed.xpi file | annotate | diff | comparison | revisions

testing/firefox-ui/resources/addons/extensions/webextension-unsigned.xpi file | annotate | diff | comparison | revisions

testing/firefox-ui/tests/puppeteer/test_notifications.py file | annotate | diff | comparison | revisions

testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py file | annotate | diff | comparison | revisions

testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py file | annotate | diff | comparison | revisions
--- a/testing/firefox-ui/tests/puppeteer/test_notifications.py
+++ b/testing/firefox-ui/tests/puppeteer/test_notifications.py
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.ui.browser.notifications import (
+    AddOnInstallConfirmationNotification,
     AddOnInstallFailedNotification,
-    AddOnInstallConfirmationNotification,
 )
 from marionette_driver import By
 from marionette_driver.errors import TimeoutException
 from marionette_harness import MarionetteTestCase
 
 
 class TestNotifications(PuppeteerMixin, MarionetteTestCase):
 
@@ -34,17 +34,17 @@ class TestNotifications(PuppeteerMixin, 
             if self.browser.notification:
                 self.browser.notification.close(force=True)
         finally:
             super(TestNotifications, self).tearDown()
 
     def test_open_close_notification(self):
         """Trigger and dismiss a notification"""
         self.assertIsNone(self.browser.notification)
-        self.trigger_addon_notification('restartless_addon_signed.xpi')
+        self.trigger_addon_notification('webextension-signed.xpi')
         self.browser.notification.close()
         self.assertIsNone(self.browser.notification)
 
     def test_wait_for_notification_timeout(self):
         """Wait for a notification when one is not shown"""
         message = 'No notification was shown'
         with self.assertRaisesRegexp(TimeoutException, message):
             self.browser.wait_for_notification()
@@ -53,32 +53,32 @@ class TestNotifications(PuppeteerMixin, 
         """Wait for a notification when one is not shown"""
         message = 'AddOnInstallFailedNotification was not shown'
         with self.assertRaisesRegexp(TimeoutException, message):
             self.browser.wait_for_notification(AddOnInstallFailedNotification)
 
     def test_wait_for_no_notification_timeout(self):
         """Wait for no notification when one is shown"""
         message = 'Unexpected notification shown'
-        self.trigger_addon_notification('restartless_addon_signed.xpi')
+        self.trigger_addon_notification('webextension-signed.xpi')
         with self.assertRaisesRegexp(TimeoutException, message):
             self.browser.wait_for_notification(None)
 
     def test_notification_with_origin(self):
         """Trigger a notification with an origin"""
-        self.trigger_addon_notification('restartless_addon_signed.xpi')
+        self.trigger_addon_notification('webextension-signed.xpi')
         self.assertIn(self.browser.notification.origin, self.marionette.baseurl)
         self.assertIsNotNone(self.browser.notification.label)
 
     def test_addon_install_failed_notification(self):
         """Trigger add-on blocked notification using an unsigned add-on"""
         # Ensure that installing unsigned extensions will fail
         self.marionette.set_pref('xpinstall.signatures.required', True)
 
         self.trigger_addon_notification(
-            'restartless_addon_unsigned.xpi',
+            'webextension-unsigned.xpi',
             notification=AddOnInstallFailedNotification)
 
     def trigger_addon_notification(self, addon, notification=AddOnInstallConfirmationNotification):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.addons_url)
             self.marionette.find_element(By.LINK_TEXT, addon).click()
         self.browser.wait_for_notification(notification)
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py
@@ -66,41 +66,17 @@ class AddOnInstallBlockedNotification(Ba
         return self.element.find_element(
             By.ANON_ATTRIBUTE, {'anonid': 'button'}).find_element(
             By.ANON_ATTRIBUTE, {'anonid': 'button'})
 
 
 class AddOnInstallConfirmationNotification(BaseNotification):
     """Add-on install confirmation notification."""
 
-    @property
-    def addon_name(self):
-        """Provide access to the add-on name.
-
-        :returns: The add-on name.
-        """
-        label = self.element.find_element(
-            By.CSS_SELECTOR, '#addon-install-confirmation-content label')
-        return label.get_attribute('value')
-
-    def cancel_button(self):
-        """Provide access to the cancel button.
-
-        :returns: The cancel button.
-        """
-        return self.element.find_element(
-            By.ID, 'addon-install-confirmation-cancel')
-
-    def install_button(self):
-        """Provide access to the install button.
-
-        :returns: The install button.
-        """
-        return self.element.find_element(
-            By.ID, 'addon-install-confirmation-accept')
+    pass
 
 
 class AddOnInstallCompleteNotification(BaseNotification):
     """Add-on install complete notification."""
 
     pass
 
 
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
@@ -83,17 +83,17 @@ class BrowserWindow(BaseWindow):
         return self._navbar
 
     @property
     def notification(self):
         """Provides access to the currently displayed notification."""
 
         notifications_map = {
             'addon-install-blocked-notification': AddOnInstallBlockedNotification,
-            'addon-install-confirmation-notification': AddOnInstallConfirmationNotification,
+            'addon-webext-permissions-notification': AddOnInstallConfirmationNotification,
             'addon-install-complete-notification': AddOnInstallCompleteNotification,
             'addon-install-failed-notification': AddOnInstallFailedNotification,
             'addon-progress-notification': AddOnProgressNotification,
         }
 
         try:
             notification = self.window_element.find_element(
                 By.CSS_SELECTOR, '#notification-popup popupnotification')
author	Henrik Skupin <mail@hskupin.info>
	Thu, 29 Jun 2017 15:46:45 -0700
changeset 602349	0e1ee64152fb957ae9732b5b2a186289adad0a6f
parent 601255	cc903e3f61894e60c3b0efaf05e9a446d1d85888
child 602350	18509848b93ff38e17db82f24f6295493b0c95be
push id	66394
push user	bmo:hskupin@gmail.com
push date	Thu, 29 Jun 2017 22:49:16 +0000
bugs	1360687
milestone	56.0a1
testing/firefox-ui/resources/addons/extensions/restartless_addon_signed.xpi		file \| annotate \| diff \| comparison \| revisions
testing/firefox-ui/resources/addons/extensions/restartless_addon_unsigned.xpi		file \| annotate \| diff \| comparison \| revisions
testing/firefox-ui/resources/addons/extensions/webextension-signed.xpi		file \| annotate \| diff \| comparison \| revisions
testing/firefox-ui/resources/addons/extensions/webextension-unsigned.xpi		file \| annotate \| diff \| comparison \| revisions
testing/firefox-ui/tests/puppeteer/test_notifications.py		file \| annotate \| diff \| comparison \| revisions
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/notifications.py		file \| annotate \| diff \| comparison \| revisions
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py		file \| annotate \| diff \| comparison \| revisions