fix(strings): fix reset password link error messages

The invalid and expired error messages were using verification link strings and markup when they should use reset password strings and markup.
mozilla · Jun 18, 2014 · cf525dc · cf525dc
1 parent a13a8eb
commit cf525dc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/app/scripts/templates/complete_reset_password.mustache b/app/scripts/templates/complete_reset_password.mustache
@@ -1,6 +1,6 @@
 {{#isLinkExpired}}
 <header>
-  <h1 id="fxa-verification-link-expired-header">{{#t}}Verification link expired{{/t}}</h1>
+  <h1 id="fxa-reset-link-expired-header">{{#t}}Reset password link expired{{/t}}</h1>
 </header>
 
 <section>
@@ -19,7 +19,7 @@
 
 {{#isLinkDamaged}}
 <header>
-  <h1 id="fxa-verification-link-damaged-header">{{#t}}Verification link damaged{{/t}}</h1>
+  <h1 id="fxa-reset-link-damaged-header">{{#t}}Reset password link damaged{{/t}}</h1>
 </header>
 
 <section>

diff --git a/app/tests/spec/views/complete_reset_password.js b/app/tests/spec/views/complete_reset_password.js
@@ -72,7 +72,7 @@ function (chai, p, AuthErrors, Metrics, View, RouterMock, WindowMock, TestHelper
               testEventLogged('complete_reset_password:link_damaged');
             })
             .then(function () {
-              assert.ok(view.$('#fxa-verification-link-damaged-header').length);
+              assert.ok(view.$('#fxa-reset-link-damaged-header').length);
             });
       });
 
@@ -83,7 +83,7 @@ function (chai, p, AuthErrors, Metrics, View, RouterMock, WindowMock, TestHelper
               testEventLogged('complete_reset_password:link_damaged');
             })
             .then(function () {
-              assert.ok(view.$('#fxa-verification-link-damaged-header').length);
+              assert.ok(view.$('#fxa-reset-link-damaged-header').length);
             });
       });
 
@@ -94,18 +94,18 @@ function (chai, p, AuthErrors, Metrics, View, RouterMock, WindowMock, TestHelper
               testEventLogged('complete_reset_password:link_damaged');
             })
             .then(function () {
-              assert.ok(view.$('#fxa-verification-link-damaged-header').length);
+              assert.ok(view.$('#fxa-reset-link-damaged-header').length);
             });
       });
 
-      it('shows the expired screen if the token has already been verified', function () {
+      it('shows the expired screen if the token has already been used', function () {
         isPasswordResetComplete = true;
         return view.render()
             .then(function () {
               testEventLogged('complete_reset_password:link_expired');
             })
             .then(function () {
-              assert.ok(view.$('#fxa-verification-link-expired-header').length);
+              assert.ok(view.$('#fxa-reset-link-expired-header').length);
             });
       });
     });
@@ -223,7 +223,7 @@ function (chai, p, AuthErrors, Metrics, View, RouterMock, WindowMock, TestHelper
         };
         return view.validateAndSubmit()
             .then(function () {
-              assert.ok(view.$('#fxa-verification-link-expired-header').length);
+              assert.ok(view.$('#fxa-reset-link-expired-header').length);
             });
       });
 

diff --git a/tests/functional/reset_password.js b/tests/functional/reset_password.js
@@ -135,7 +135,7 @@ define([
         .end();
     },
 
-    'start verifiction - get token and code from email': function () {
+    'start reset - get token and code from email': function () {
       return setTokenAndCodeFromEmail(user, 1);
     },
 
@@ -144,7 +144,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-damaged-header')
+        .waitForElementById('fxa-reset-link-damaged-header')
 
         .end();
     },
@@ -155,7 +155,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-damaged-header')
+        .waitForElementById('fxa-reset-link-damaged-header')
 
         .end();
     },
@@ -167,7 +167,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-expired-header')
+        .waitForElementById('fxa-reset-link-expired-header')
 
         .end();
     },
@@ -177,7 +177,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-damaged-header')
+        .waitForElementById('fxa-reset-link-damaged-header')
 
         .end();
     },
@@ -189,7 +189,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-damaged-header')
+        .waitForElementById('fxa-reset-link-damaged-header')
 
         .end();
     },
@@ -199,7 +199,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-damaged-header')
+        .waitForElementById('fxa-reset-link-damaged-header')
 
         .end();
     },
@@ -209,7 +209,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-damaged-header')
+        .waitForElementById('fxa-reset-link-damaged-header')
 
         .end();
     },
@@ -263,7 +263,7 @@ define([
           });
     },
 
-    'complete verification': function () {
+    'complete reset': function () {
       var url = COMPLETE_PAGE_URL_ROOT + '?token=' + token + '&code=' + code + '&email=' + encodeURIComponent(email);
 
       return this.get('remote')
@@ -293,7 +293,7 @@ define([
 
       return this.get('remote')
         .get(require.toUrl(url))
-        .waitForElementById('fxa-verification-link-expired-header')
+        .waitForElementById('fxa-reset-link-expired-header')
         .end()
 
         .elementById('resend')