Merge pull request #29986 from albertopq/1157128-uplift-v2.2

Bug 1157128 - Fix display of auth inputs. r=kgrandon
mozilla-b2g · May 11, 2015 · cc0014b · cc0014b
2 parents 528ef60 + 4bb3878
commit cc0014b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/apps/system/js/app_authentication_dialog.js b/apps/system/js/app_authentication_dialog.js
@@ -96,12 +96,14 @@
       </gaia-header>
       <span class="authentication-dialog-http-authentication-message">
       </span>
-      <label data-l10n-id="username">
+      <label>
+        <span data-l10n-id="username"></span>
         <input type="text" class="authentication-dialog-http-username-input" />
       </label>
-      <label data-l10n-id="password">
+      <label>
+        <span data-l10n-id="password"></span>
         <input type="password"
-        class="authentication-dialog-http-password-input" />
+               class="authentication-dialog-http-password-input" />
       </label>
     </section>`;
   };

diff --git a/apps/system/test/marionette/app_authentication_dialog_test.js b/apps/system/test/marionette/app_authentication_dialog_test.js
@@ -80,4 +80,28 @@ marionette('App Authentication Dialog',
       return !authDialog.displayed();
     });
   });
+
+  test('user can login', function() {
+    var url = server.url('sample.html');
+    server.protect(url);
+
+    // Open the first URL in a sheet.
+    rocketbar.homescreenFocus();
+    rocketbar.enterText(url + '\uE006');
+
+    var authDialog;
+    client.waitFor(function() {
+      authDialog = system.appAuthDialog;
+      return authDialog.displayed();
+    });
+
+    system.appAuthDialogUsername.sendKeys('username');
+    system.appAuthDialogPassword.sendKeys('password');
+
+    system.appAuthDialogLogin.tap();
+    client.waitFor(function() {
+      return !authDialog.displayed();
+    });
+  });
+
 });
diff --git a/apps/system/test/marionette/lib/system.js b/apps/system/test/marionette/lib/system.js
@@ -21,6 +21,10 @@ System.Selector = Object.freeze({
     'gaia-header',
   appAuthDialogLogin: '.appWindow.active .authentication-dialog.visible ' +
     'button.authentication-dialog-http-authentication-ok',
+  appAuthDialogUsername: '.appWindow.active .authentication-dialog.visible ' +
+    '.authentication-dialog-http-username-input',
+  appAuthDialogPassword: '.appWindow.active .authentication-dialog.visible ' +
+    '.authentication-dialog-http-password-input',
   appContextMenuSaveLink:
     '.appWindow.active .contextmenu [data-id="save-link"]',
   appWindow: '.appWindow',
@@ -107,6 +111,16 @@ System.prototype = {
       System.Selector.appAuthDialogLogin);
   },
 
+  get appAuthDialogUsername() {
+    return this.client.helper.waitForElement(
+      System.Selector.appAuthDialogUsername);
+  },
+
+  get appAuthDialogPassword() {
+    return this.client.helper.waitForElement(
+      System.Selector.appAuthDialogPassword);
+  },
+
   get appContextMenuSaveLink() {
     return this.client.helper.waitForElement(
       System.Selector.appContextMenuSaveLink);

diff --git a/shared/test/integration/server_child.js b/shared/test/integration/server_child.js
@@ -53,7 +53,9 @@ Server.prototype = {
         }
 
         // Handle protected URLs.
-        if (server.authUrls[fullUrl]) {
+        // Users can login with 'username' and 'password'
+        if (server.authUrls[fullUrl] &&
+            req.headers.authorization !== 'Basic dXNlcm5hbWU6cGFzc3dvcmQ=') {
           res.writeHead(401, {
             'WWW-Authenticate': 'Basic realm="login required"'
           });