Bug 1163953 - merge pull request #30021 from albertopq:1163953-action…

…-menu-multiple to mozilla-b2g:master
mozilla-b2g · May 26, 2015 · 0359bf8 · 0359bf8
2 parents 48dad15 + cc2c066
commit 0359bf8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/apps/system/js/action_menu.js b/apps/system/js/action_menu.js
@@ -35,7 +35,7 @@
   ActionMenu.prototype.EVENT_PREFIX = 'actionmenu';
 
   ActionMenu.prototype.view = function spd_view() {
-    return `<div id="action-menu" hidden>
+    return `<div id="action-menu" class="action-menu" hidden>
               <form id="action-menu-form" data-z-index-level="action-menu"
                 role="dialog" data-type="action">
                 <header id="action-menu-header" data-l10n-id=""></header>

diff --git a/apps/system/js/activities.js b/apps/system/js/activities.js
@@ -55,7 +55,6 @@
         case 'appopened':
           if (this.actionMenu) {
             this.actionMenu.hide();
-            this.actionMenu = null;
           }
           break;
         case 'applicationinstall':
@@ -197,7 +196,7 @@
           var askForDefault = config !== undefined;
           var items = this._listItems(choices);
 
-          if (!this.actionMenu || !this.actionMenu.active) {
+          if (!this.actionMenu) {
             var controller = {
               successCb: this.choose.bind(this),
               cancelCb: this.cancel.bind(this)
@@ -207,6 +206,8 @@
               this.actionMenu = new ActionMenu(controller);
               this.actionMenu.show(items, titleId, askForDefault);
             }.bind(this));
+          } else if (!this.actionMenu.active) {
+            this.actionMenu.show(items, titleId, askForDefault);
           }
         }).bind(this));
       }
@@ -219,8 +220,9 @@
     * @param {Boolean} setAsDefault Should this be set as the default activity.
     */
     choose: function(choice, setAsDefault) {
-      this.actionMenu = null;
-
+      if (this.actionMenu) {
+        this.actionMenu.hide();
+      }
       var returnedChoice = {
         id: this._detail.id,
         type: 'activity-choice',
@@ -244,7 +246,9 @@
     * @memberof Activities.prototype
     */
     cancel: function() {
-      this.actionMenu = null;
+      if (this.actionMenu) {
+        this.actionMenu.hide();
+      }
 
       var returnedChoice = {
         id: this._detail.id,

diff --git a/apps/system/test/marionette/activity_action_menu_test.js b/apps/system/test/marionette/activity_action_menu_test.js
@@ -3,6 +3,7 @@
 (function() {
   var Messages = require('../../../sms/test/marionette/lib/messages');
   var UtilityTray = require('./lib/utility_tray');
+  var assert = require('assert');
 
   marionette('activity action menu test', function() {
     var messagesApp, system, utilityTray;
@@ -60,5 +61,25 @@
         done();
       }, 1000);
     });
+
+    test('it only creates 1 action menu div', function() {
+      messagesApp.launch();
+      messagesApp.Inbox.navigateToComposer();
+      var composer = messagesApp.Composer;
+
+      client.waitFor(function() {
+        return composer.attachButton.enabled();
+      });
+      composer.attachButton.tap();
+      client.switchToFrame();
+      system.waitForActivityMenu();
+      system.cancelActivity.tap();
+      messagesApp.switchTo();
+      composer.attachButton.tap();
+      client.switchToFrame();
+      system.waitForActivityMenu();
+      var actionMenus = client.findElements('.action-menu');
+      assert.ok(actionMenus.length === 1);
+    });
   });
 }());
diff --git a/apps/system/test/unit/activities_test.js b/apps/system/test/unit/activities_test.js
@@ -367,6 +367,15 @@ suite('system/Activities', function() {
         subject.cancel();
         assert.ok(stub.calledWith(formatted));
       });
+
+      test('does not destroy the action menu', function() {
+        subject._detail = {
+          id: 'foo'
+        };
+        var stub = this.sinon.stub(subject.actionMenu, 'hide');
+        subject.cancel();
+        assert.ok(stub.called);
+      });
     });
   });
 

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/marketplace/test_marketplace_launch.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/marketplace/test_marketplace_launch.py
@@ -4,13 +4,12 @@
 
 from gaiatest import GaiaTestCase
 from gaiatest.apps.homescreen.app import Homescreen
-from marionette_driver import By
+from marionette_driver import expected, By, Wait
 
 
 class TestMarketplaceLaunch(GaiaTestCase):
 
     _marketplace_iframe_locator = (By.CSS_SELECTOR, 'iframe[src*="marketplace"]')
-    _loading_fragment_locator = (By.ID, 'splash-overlay')
     _site_header_locator = (By.ID, 'site-header')
 
     def setUp(self):
@@ -28,7 +27,7 @@ def test_marketplace_launch(self):
         marketplace = homescreen.installed_app(app_name)
         marketplace.tap_icon()
 
-        self.wait_for_element_not_displayed(*self._loading_fragment_locator)
+        Wait(self.marionette, timeout=60).until(expected.element_present(*self._marketplace_iframe_locator))
 
         iframe = self.marionette.find_element(*self._marketplace_iframe_locator)
         self.marionette.switch_to_frame(iframe)