Merge pull request #16974 from KevinGrandon/bug_946852_search_mode

Bug 946852 - [Email] Search Mail field appears twice

apps/email/style/message_cards.css

@@ -34,6 +34,10 @@
   border-bottom: 0.1rem solid #bdbdbd;
 }
 
+[data-mode="search"] .msg-search-tease-bar {
+  display: none;
+}
+
 /* When card is slightly shown when folder card is center,
    be sure any inputs do not accept clicks/taps that would
    mess up the transition back to the message list. Also

apps/email/test/marionette/lib/email.js

@@ -48,11 +48,14 @@ var Selector = {
   refreshButton: '.card.center .msg-refresh-btn',
   messageHeaderItem: '.msg-messages-container .msg-header-item',
   cardMessageReader: '.card-message-reader',
+  currentCardInputs: '.card.center input[type="text"]',
   replyMenuButton: '.msg-reply-btn',
   replyMenu: '.msg-reply-menu',
   replyMenuReply: '.msg-reply-menu-reply',
   replyMenuForward: '.msg-reply-menu-forward',
   replyMenuAll: '.msg-reply-menu-reply-all',
+  searchButton: '.msg-search-btn',
+  searchCard: '.card[data-mode="search"]',
   folderListButton: '.msg-list-header .msg-folder-list-btn',
   settingsButton: '.fld-nav-toolbar .fld-nav-settings-btn',
   settingsDoneButton: '.card-settings-main [data-l10n-id="settings-done"]',
@@ -338,6 +341,17 @@ Email.prototype = {
     this._waitForTransitionEnd(cardId);
   },
 
+  /**
+   * Returns the visible input elements for the current card.
+   */
+  getVisibleCardInputs: function() {
+    var elements = this.client.findElements(Selector.currentCardInputs)
+      .filter(function(element) {
+        return element.displayed();
+      });
+    return elements;
+  },
+
   saveLocalDrafts: function() {
     this._waitForElementNoTransition(Selector.composeBackButton).tap();
     this._waitForElementNoTransition(Selector.composeDraftSave).tap();
@@ -370,6 +384,16 @@ Email.prototype = {
       .tap();
   },
 
+  tapSearchButton: function() {
+    this.client.helper
+      .waitForElement(Selector.searchButton)
+      .tap();
+
+    this.client.helper
+      .waitForElement(Selector.searchCard);
+    this._waitForTransitionEnd('message_list');
+  },
+
   waitForMessageList: function() {
     this._waitForTransitionEnd('message_list');
   },

apps/email/test/marionette/search_test.js

@@ -0,0 +1,32 @@
+'use strict';
+
+var Email = require('./lib/email');
+var assert = require('assert');
+var serverHelper = require('./lib/server_helper');
+
+marionette('email message list edit mode', function() {
+  var app;
+
+  var client = marionette.client({
+    settings: {
+      // disable keyboard ftu because it blocks our display
+      'keyboard.ftu.enabled': false
+    }
+  });
+
+  var server = serverHelper.use(null, this);
+
+  setup(function() {
+    app = new Email(client);
+    app.launch();
+    app.manualSetupImapEmail(server);
+  });
+
+  test('only one input should appear', function() {
+    app.tapSearchButton();
+
+    var inputs = app.getVisibleCardInputs();
+    assert.equal(inputs.length, 1);
+  });
+
+});