From 28de135dec4a7e8c5af66a896fb7a76210204840 Mon Sep 17 00:00:00 2001 From: krishs03 Date: Tue, 31 Oct 2023 11:22:56 +0000 Subject: [PATCH 1/3] IPLAYER-43569 Attempt split sign in before signing in --- lib/bbcA11y.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bbcA11y.js b/lib/bbcA11y.js index e4caff5..00b83e0 100644 --- a/lib/bbcA11y.js +++ b/lib/bbcA11y.js @@ -64,6 +64,7 @@ function pathToOutput(baseUrl, path, options = {}, signedIn) { } function getVisitOption(baseUrl, path, signedIn, options) { + console.log('Attempting split sign in') if (signedIn) { const { username, password } = getSignInCredentials(); const url = baseUrl + path; @@ -75,6 +76,7 @@ function getVisitOption(baseUrl, path, signedIn, options) { frame.onload = function () { var loginPage = frame.contentDocument; loginPage.getElementById('user-identifier-input').value = '${username}'; + loginPage.getElementById('submit-button').click(); loginPage.getElementById('password-input').value = '${password}'; loginPage.getElementById('submit-button').click(); frame.onload = test From 9cf7767c38f65436d80c0d03983adf8c649c563f Mon Sep 17 00:00:00 2001 From: krishs03 Date: Tue, 31 Oct 2023 12:56:24 +0000 Subject: [PATCH 2/3] Remove console statement --- lib/bbcA11y.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bbcA11y.js b/lib/bbcA11y.js index 00b83e0..2546158 100644 --- a/lib/bbcA11y.js +++ b/lib/bbcA11y.js @@ -64,7 +64,6 @@ function pathToOutput(baseUrl, path, options = {}, signedIn) { } function getVisitOption(baseUrl, path, signedIn, options) { - console.log('Attempting split sign in') if (signedIn) { const { username, password } = getSignInCredentials(); const url = baseUrl + path; From 4e2213e07f96b2046a0c5b6e9dc13b2731965615 Mon Sep 17 00:00:00 2001 From: krishs03 Date: Tue, 31 Oct 2023 18:57:25 +0000 Subject: [PATCH 3/3] Fix failing integraiton tests --- lib/bbcA11y.js | 3 +-- test/lib/bbcA11y.js | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/bbcA11y.js b/lib/bbcA11y.js index 2546158..331fdb0 100644 --- a/lib/bbcA11y.js +++ b/lib/bbcA11y.js @@ -68,9 +68,8 @@ function getVisitOption(baseUrl, path, signedIn, options) { const { username, password } = getSignInCredentials(); const url = baseUrl + path; const encodedUrl = encodeURIComponent(url); - return `visit: function (frame) { - frame.src = 'https://account.bbc.com/signin?ptrt=${encodedUrl}'; + frame.src = 'https://account.bbc.com/auth?ptrt=${encodedUrl}'; return new Promise(function (test) { frame.onload = function () { var loginPage = frame.contentDocument; diff --git a/test/lib/bbcA11y.js b/test/lib/bbcA11y.js index 61aa3ea..9d5415a 100644 --- a/test/lib/bbcA11y.js +++ b/test/lib/bbcA11y.js @@ -21,6 +21,7 @@ const VISIT_OPTION_BODY = ` frame.onload = function () { var loginPage = frame.contentDocument; loginPage.getElementById('user-identifier-input').value = 'my-username'; + loginPage.getElementById('submit-button').click(); loginPage.getElementById('password-input').value = 'my-password'; loginPage.getElementById('submit-button').click(); frame.onload = test @@ -235,7 +236,7 @@ describe('bbcA11y', () => { page("http://base.url/path/3", { visit: function (frame) { - frame.src = 'https://account.bbc.com/signin?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F3'; + frame.src = 'https://account.bbc.com/auth?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F3'; ${VISIT_OPTION_BODY} } } @@ -244,14 +245,13 @@ describe('bbcA11y', () => { page("http://base.url/path/4", { visit: function (frame) { - frame.src = 'https://account.bbc.com/signin?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F4'; + frame.src = 'https://account.bbc.com/auth?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F4'; ${VISIT_OPTION_BODY} } } ) `; const matcher = getMinifiedMatcher(expectedOutput); - bbcA11y.build(); sandbox.assert.calledWith( @@ -289,7 +289,7 @@ describe('bbcA11y', () => { page("http://base.url/path/3", { visit: function (frame) { - frame.src = 'https://account.bbc.com/signin?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F3'; + frame.src = 'https://account.bbc.com/auth?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F3'; ${VISIT_OPTION_BODY} }, some: "option" @@ -299,7 +299,7 @@ describe('bbcA11y', () => { page("http://base.url/path/4", { visit: function (frame) { - frame.src = 'https://account.bbc.com/signin?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F4'; + frame.src = 'https://account.bbc.com/auth?ptrt=http%3A%2F%2Fbase.url%2Fpath%2F4'; ${VISIT_OPTION_BODY} }, some: "option"