chore(test): Use selectors module in the cached signin tests.

I was writing tests for bz1509117 and noticed these files have loads of hard coded selectors, which are updated to use the selectors module. ref bz1509117
mozilla · Nov 22, 2018 · ddfc810 · ddfc810
1 parent a9ad335
commit ddfc810
Show file tree

Hide file tree

Showing 3 changed files with 147 additions and 144 deletions.
diff --git a/tests/functional/lib/selectors.js b/tests/functional/lib/selectors.js
@@ -19,6 +19,7 @@ module.exports = {
     AUTHENTICATED: '#loggedin',
     AUTHENTICATED_TOTP: '#loggedin span:first-child',
     BUTTON_SIGNIN: '.sign-in-button.signin',
+    BUTTON_SIGNIN_CHOOSE_FLOW_FOR_ME: '.ready #splash .sign-choose',
     BUTTON_SIGNUP: '.sign-in-button.signup',
     LINK_LOGOUT: '#logout'
   },
@@ -205,6 +206,7 @@ module.exports = {
     PASSWORD: 'input[type=password]',
     RESET_PASSWORD: 'a[href="/reset_password"]',
     SUBMIT: 'button[type=submit]',
+    SUBMIT_USE_SIGNED_IN: '.use-logged-in',
     SUB_HEADER: '#fxa-signin-header .service',
     TOOLTIP: '.tooltip',
   },

diff --git a/tests/functional/oauth_sign_in.js b/tests/functional/oauth_sign_in.js
@@ -52,7 +52,7 @@ const {
 
 const testAtOAuthApp = thenify(function () {
   return this.parent
-    .then(testElementExists('#loggedin'))
+    .then(testElementExists(selectors['123DONE'].AUTHENTICATED))
 
     .getCurrentUrl()
     .then(function (url) {
@@ -82,25 +82,25 @@ registerSuite('oauth signin', {
   tests: {
     'with missing client_id': function () {
       return this.remote
-        .then(openPage(SIGNIN_ROOT + '?scope=profile', '#fxa-400-header'));
+        .then(openPage(SIGNIN_ROOT + '?scope=profile', selectors['400'].HEADER));
     },
 
     'with missing scope': function () {
       return this.remote
-        .then(openPage(SIGNIN_ROOT + '?client_id=client_id', '#fxa-400-header'));
+        .then(openPage(SIGNIN_ROOT + '?client_id=client_id', selectors['400'].HEADER));
     },
 
     'with invalid client_id': function () {
       return this.remote
-        .then(openPage(SIGNIN_ROOT + '?client_id=invalid_client_id&scope=profile', '#fxa-400-header'));
+        .then(openPage(SIGNIN_ROOT + '?client_id=invalid_client_id&scope=profile', selectors['400'].HEADER));
     },
 
     'with service=sync specified': function () {
       return this.remote
         .then(openFxaFromRp('signin'))
         .then(reOpenWithAdditionalQueryParams({
           service: 'sync'
-        }, '#fxa-400-header'));
+        }, selectors['400'].HEADER));
     },
 
     'verified': function () {
@@ -123,15 +123,15 @@ registerSuite('oauth signin', {
         .then(fillOutSignIn(email, PASSWORD))
 
         .then(testAtOAuthApp())
-        .then(click('#logout'))
+        .then(click(selectors['123DONE'].LINK_LOGOUT))
 
-        .then(visibleByQSA('.ready #splash .signin'))
+        .then(visibleByQSA(selectors['123DONE'].BUTTON_SIGNIN))
         // round 2 - with the cached credentials
-        .then(click('.ready #splash .signin'))
+        .then(click(selectors['123DONE'].BUTTON_SIGNIN))
 
-        .then(testElementExists('#fxa-signin-header'))
-        .then(type('input[type=password]', PASSWORD))
-        .then(click('button[type="submit"]'))
+        .then(testElementExists(selectors.SIGNIN.HEADER))
+        .then(type(selectors.SIGNIN.PASSWORD, PASSWORD))
+        .then(click(selectors.SIGNIN.SUBMIT))
 
         .then(testAtOAuthApp());
     },
@@ -143,58 +143,58 @@ registerSuite('oauth signin', {
 
         .then(fillOutSignIn(email, PASSWORD))
 
-        .then(testElementExists('#fxa-confirm-header'))
+        .then(testElementExists(selectors.CONFIRM_SIGNUP.HEADER))
 
         // get the second email, the first was sent on client.signUp w/
         // preVerified: false above. The second email has the `service` and
         // `resume` parameters.
         .then(openVerificationLinkInSameTab(email, 1))
         // user verifies in the same tab, so they are logged in to the RP.
-        .then(testElementExists('#loggedin'));
+        .then(testElementExists(selectors['123DONE'].AUTHENTICATED));
 
     },
 
     'unverified with a cached login': function () {
       return this.remote
         .then(openFxaFromRp('signup'))
-        .then(testElementExists('#fxa-signup-header'))
+        .then(testElementExists(selectors.SIGNUP.HEADER))
 
         // first, sign the user up to cache the login
         .then(fillOutSignUp(email, PASSWORD))
 
-        .then(testElementExists('#fxa-confirm-header'))
+        .then(testElementExists(selectors.CONFIRM_SIGNUP.HEADER))
 
         // round 2 - try to sign in with the unverified user.
         .then(openFxaFromRp('signin'))
 
-        .then(testElementExists('#fxa-signin-header .service'))
-        .then(type('input[type=password]', PASSWORD))
-        .then(click('button[type="submit"]'))
+        .then(testElementExists(selectors.SIGNIN.SUB_HEADER))
+        .then(type(selectors.SIGNIN.PASSWORD, PASSWORD))
+        .then(click(selectors.SIGNIN.SUBMIT))
 
         // success is using a cached login and being redirected
         // to a confirmation screen
-        .then(testElementExists('#fxa-confirm-header'));
+        .then(testElementExists(selectors.CONFIRM_SIGNUP.HEADER));
     },
 
     'oauth endpoint chooses the right auth flows': function () {
       return this.remote
         .then(openPage(OAUTH_APP, '.ready #splash'))
 
         // use the 'Choose my sign-in flow for me' button
-        .then(click('.ready #splash .sign-choose'))
+        .then(click(selectors['123DONE'].BUTTON_SIGNIN_CHOOSE_FLOW_FOR_ME))
 
-        .then(testElementExists('#fxa-signup-header'))
+        .then(testElementExists(selectors.SIGNUP.HEADER))
         .then(fillOutSignUp(email, PASSWORD))
 
-        .then(testElementExists('#fxa-confirm-header'))
+        .then(testElementExists(selectors.CONFIRM_SIGNUP.HEADER))
 
         // go back to the OAuth app, the /oauth flow should
         // now suggest a cached login
         .get(OAUTH_APP)
         // again, use the 'Choose my sign-in flow for me' button
-        .then(click('.ready #splash .sign-choose'))
+        .then(click(selectors['123DONE'].BUTTON_SIGNIN_CHOOSE_FLOW_FOR_ME))
 
-        .then(testElementExists('#fxa-signin-header'));
+        .then(testElementExists(selectors.SIGNIN.HEADER));
     },
 
     'verified, blocked': function () {
@@ -206,7 +206,7 @@ registerSuite('oauth signin', {
 
         .then(fillOutSignIn(email, PASSWORD))
 
-        .then(testElementExists('#fxa-signin-unblock-header'))
+        .then(testElementExists(selectors.SIGNIN_UNBLOCK.HEADER))
         .then(fillOutSignInUnblock(email, 0))
 
         .then(testAtOAuthApp());
@@ -221,18 +221,18 @@ registerSuite('oauth signin', {
 
         .then(fillOutSignIn(email, 'bad' + PASSWORD))
 
-        .then(testElementExists('#fxa-signin-unblock-header'))
+        .then(testElementExists(selectors.SIGNIN_UNBLOCK.HEADER))
         .then(fillOutSignInUnblock(email, 0))
 
         // wait until at the signin page to check the URL to
         // avoid latency problems with submitting the unblock code.
         // w/o the wait, the URL can be checked before
         // the submit completes.
-        .then(testElementExists('#fxa-signin-header'))
+        .then(testElementExists(selectors.SIGNIN.HEADER))
         .then(testUrlPathnameEquals('/oauth/signin'))
         .then(fillOutSignIn(email, PASSWORD))
 
-        .then(testElementExists('#fxa-signin-unblock-header'))
+        .then(testElementExists(selectors.SIGNIN_UNBLOCK.HEADER))
         .then(fillOutSignInUnblock(email, 1))
 
         .then(testAtOAuthApp());