Merge pull request #28448 from RudyLu/keyboard/Bug928822-dismiss_keyb…

…oard

Bug 928822 - Add integration tests for keyboard dismiss.
r=timdream.

apps/keyboard/test/marionette/dismiss_test.js

@@ -9,6 +9,7 @@ marionette('Dimiss the keyboard', function() {
   var keyboardTestApp = null;
   var keyboard = null;
   var systemInputMgmt = null;
+  var system = null;
   var actions;
 
   apps[KeyboardTestApp.ORIGIN] = __dirname + '/keyboardtestapp';
@@ -35,6 +36,7 @@ marionette('Dimiss the keyboard', function() {
   setup(function() {
     actions = client.loader.getActions();
     systemInputMgmt = client.loader.getAppClass('system', 'input_management');
+    system = client.loader.getAppClass('system');
     keyboard = new Keyboard(client);
 
     // create a keyboard test app
@@ -66,4 +68,28 @@ marionette('Dimiss the keyboard', function() {
 
     assert.ok(keyboardContainer.displayed());
   });
+
+  test('Click on a non-input field, should dimiss keyboard', function() {
+    // Switch to test app frame.
+    client.switchToFrame();
+    client.apps.switchToApp(KeyboardTestApp.ORIGIN);
+
+    keyboardTestApp.nonInputArea.click();
+
+    client.waitFor(function() {
+      return !systemInputMgmt.keyboardFrameDisplayed();
+    });
+
+    assert.ok(true);
+  });
+
+  test('Pressing [Home] button should dimiss keyboard', function() {
+    system.tapHome();
+
+    client.waitFor(function() {
+      return !systemInputMgmt.keyboardFrameDisplayed();
+    });
+
+    assert.ok(true);
+  });
 });