Merge branch 'master' of https://github.com/bcgov/EDUC-EDX

kamal-mohammed · Sep 15, 2022 · 60f5c90 · 60f5c90
2 parents 42a08d5 + ac2c939
commit 60f5c90
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/backend/src/components/secureExchange.js b/backend/src/components/secureExchange.js
@@ -770,7 +770,7 @@ function mapEdxUserActivationErrorMessage(message) {
   } else if (msg.includes('This Activation Code has expired')) {
     return 'Your activation code has expired. Please contact your administrator for a new activation code.';
   } else if (msg.includes('This User Activation Link has expired')) {
-    return 'Your activation link is expired; the activation link should only be usable one time. Please contact your administrator for a new activation code.';
+    return 'Your activation link has expired. Please contact your administrator for a new activation code.';
   } else if (msg.includes('This user is already associated to the school')) {
     return 'This user account is already associated to the school';
   }
@@ -797,7 +797,7 @@ async function verifyActivateUserLink(req, res) {
     if (e.status === 400) {
       msg = 'Invalid link clicked. Please click the link provided in your email';
     } else if (e.status === 410) {
-      msg = 'Your activation link is expired; the activation link should only be usable one time. Please contact your administrator for a new activation code.';
+      msg = 'Your activation link has expired. Please contact your administrator for a new activation code.';
     }
     log.error(e, 'verifyValidationCode', 'Error verifying Validation Code ');
     return res.redirect(baseUrl + `/activation-error?errorMessage= ${msg}`);

diff --git a/...test_cases/edx-user-activation/district/test-district-user-activation-error-scenario-1.js b/...test_cases/edx-user-activation/district/test-district-user-activation-error-scenario-1.js
@@ -20,7 +20,7 @@ test('when_url_visited_twice_user_gets_error_link_expired', async t => {
   await t.navigateTo(t.fixtureCtx.activationUrl[0]);
   await t.navigateTo(t.fixtureCtx.activationUrl[0]);
   const errorText = await Selector('#user_activation_error_message').innerText;
-  await t.expect(errorText).contains('Your activation link is expired; the activation link should only be usable one time. Please contact your administrator for a new activation code.');
+  await t.expect(errorText).contains('Your activation link has expired. Please contact your administrator for a new activation code.');
   log.info('activation link expired on double click on activation url is verified');
 });
 

diff --git a/...src/test_cases/edx-user-activation/school/test-school-user-activation-error-scenario-1.js b/...src/test_cases/edx-user-activation/school/test-school-user-activation-error-scenario-1.js
@@ -20,7 +20,7 @@ test('when_url_visited_twice_user_gets_error_link_expired', async t => {
   await t.navigateTo(t.fixtureCtx.activationUrl[0]);
   await t.navigateTo(t.fixtureCtx.activationUrl[0]);
   const errorText = await Selector('#user_activation_error_message').innerText;
-  await t.expect(errorText).contains('Your activation link is expired; the activation link should only be usable one time. Please contact your administrator for a new activation code.');
+  await t.expect(errorText).contains('Your activation link has expired. Please contact your administrator for a new activation code.');
   log.info('activation link expired on double click on activation url is verified');
 });