Skip to content

Commit

Permalink
Merge branch 'master' into SSCSCI-449-removeFlag-webchatOpening
Browse files Browse the repository at this point in the history
  • Loading branch information
gemmatalbot committed Apr 17, 2024
2 parents 5f444ee + bcdfde1 commit 3247660
Show file tree
Hide file tree
Showing 14 changed files with 362 additions and 374 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and Child Support tribunal.

Should an appellant wish to appeal online this node.js web application allows them to do so. The application takes the
appellant on a journey, presenting a single question per page (GDS guidelines), at the end of their journey we present
an appeal summary page, allowing the user to edit their answers or sign and submit.
an appeal summary page, allowing the user to edit their answers or sign and submit.

## Dependencies
- [Docker](https://www.docker.com/)
Expand Down
5 changes: 2 additions & 3 deletions appConfigurations.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ const configureNunjucks = (app, commonContent) => {
webChatUrl: webChatBaseUrl,
paths,
urls,
featureToggles: {
welsh: () => process.env.FT_WELSH || config.features.welsh.enabled,
cookieBanner: () => process.env.ALLOW_COOKIE_BANNER_ENABLED || config.features.cookieBanner.enabled}
featureToggles: { welsh: () => process.env.FT_WELSH || config.features.welsh.enabled,
cookieBanner: () => process.env.ALLOW_COOKIE_BANNER_ENABLED || config.features.cookieBanner.enabled }
}
});
};
Expand Down
17 changes: 7 additions & 10 deletions assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,13 @@ function initShowHideContent() {
}

function initWebChat(language) {
if (document.welshWebchatFlag) {
const webChat = new WebChat();
webChat.init();
}
else {
if (language === 'en' && $('#antenna-web-chat').length) {
const webChat = new WebChat();
webChat.init();
}
}
if (document.welshWebchatFlag) {
const webChat = new WebChat();
webChat.init();
} else if (language === 'en' && $('#antenna-web-chat').length) {
const webChat = new WebChat();
webChat.init();
}
}
function initCookieBanner() {
if ($('#app-cookie-banner').length) {
Expand Down
20 changes: 10 additions & 10 deletions assets/js/web-chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ export class WebChat {

setMessage(ewt, ccState, availableAgents) {
if (ccState === OPEN_STATUS && this.isWebchatOpen()) {
if (ewt > MAX_WAIT_IN_SECONDS) {
link.style.display = 'none';
busy.style.display = 'block';
}
if (availableAgents <= 0) {
link.style.display = 'none';
noAgents.style.display = 'block';
}
} else {
if (ewt > MAX_WAIT_IN_SECONDS) {
link.style.display = 'none';
busy.style.display = 'block';
}
if (availableAgents <= 0) {
link.style.display = 'none';
close.style.display = 'block';
noAgents.style.display = 'block';
}
} else {
link.style.display = 'none';
close.style.display = 'block';
}
}

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"test": "yarn test:unit && yarn test:assets",
"test:all": "cross-env NODE_PATH=. NODE_ENV=test yarn test && yarn test:assets && yarn test:smoke",
"lint": "cross-env NODE_PATH=. eslint --fix .",
"test:smoke": "cross-env NODE_PATH=. NODE_ENV=test codeceptjs run -c test/e2e/smoke.conf.js --grep @smoke --steps --verbose --reporter mocha-multi",
"test:smoke": "yarn playwright install && cross-env NODE_PATH=. NODE_ENV=test codeceptjs run -c test/e2e/smoke.conf.js --grep @smoke --steps --verbose --reporter mocha-multi",
"test:evidence-upload": "cross-env NODE_PATH=. NODE_ENV=test codeceptjs run -c test/e2e/ --grep @evidence-upload --steps",
"test:mutation": "cross-env NODE_PATH=. NODE_ENV=test codeceptjs run-multiple parallel --all -c test/e2e/ --grep @functional --steps --reporter mocha-multi",
"test:functional": "cross-env NODE_PATH=. NODE_ENV=test codeceptjs run-multiple parallel --all -c test/e2e/ --grep @functional --steps --reporter mocha-multi",
Expand All @@ -27,7 +27,7 @@
"test:functional:batch": "cross-env NODE_PATH=. NODE_ENV=test codeceptjs run -c test/e2e/ --grep @batch-$BATCH --steps",
"test:functional:batches": "for i in `seq -w 1 12`; do BATCH=$i yarn test:functional:batch; [ $? -ne 0 ] && exit $?; done; exit 0;",
"test:coverage": "cross-env NODE_PATH=. NODE_ENV=test nyc mocha 'test/unit/**/*.test.js'",
"test:crossbrowser": "cross-env NODE_PATH=. NODE_ENV=test codeceptjs run-multiple ${BROWSER_GROUP:-'--all'} -c test/e2e/saucelabs.conf.js --grep @crossbrowser --steps --reporter mocha-multi --verbose",
"test:crossbrowser": "yarn playwright install && cross-env NODE_PATH=. NODE_ENV=test codeceptjs run-multiple ${BROWSER_GROUP:-'--all'} -c test/e2e/saucelabs.conf.js --grep @crossbrowser --steps --reporter mocha-multi --verbose",
"test:a11y": "cross-env NODE_PATH=. NODE_ENV=a11y LOG_LEVEL=ERROR mocha --exit test/accessibility/a11y.js --exit --timeout 60000 --reporter mochawesome --reporter-options reportDir=functional-output,reportFilename=a11y,inlineAssets=true,reportTitle=submit-your-appeal",
"fortifyScan": "./test/java/gradlew -p test/java fortifyScan",
"mock-uploader": "node test/file_acceptor/evidence_uploader.js",
Expand Down Expand Up @@ -115,6 +115,7 @@
"nock": "^13.3.3",
"nyc": "^15.1.0",
"pa11y": "^6.2.3",
"playwright": "^1.41.1",
"pre-commit": "^1.2.2",
"proxyquire": "^2.1.3",
"puppeteer": "^22.4.1",
Expand Down
36 changes: 18 additions & 18 deletions test/e2e/codecept.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@ exports.config = {
}
},
helpers: {
Puppeteer: {
Playwright: {
url: process.env.TEST_URL || config.get('e2e.frontendUrl'),
waitForTimeout: parseInt(config.get('e2e.waitForTimeout')),
waitForAction: parseInt(config.get('e2e.waitForAction')),
waitForNavigation: 'load',
getPageTimeout: 10000,
show: false,
windowSize: '1000x1000',
chrome: {
ignoreHTTPSErrors: true,
args: [
'--disable-gpu',
'--disable-dev-shm-usage',
'--no-sandbox',
'--allow-running-insecure-content',
'--ignore-certificate-errors'
]
}
browser: 'chromium',
show: process.env.SHOW_BROWSER_WINDOW === 'true' || false,
waitForTimeout: parseInt(process.env.WAIT_FOR_TIMEOUT_MS || 90000),
windowSize: '1280x960',
timeout: 30000,
waitForAction: 500,
video: true,
trace: true,
contextOptions: {
recordVideo: {
dir: 'failed-videos'
}
},
waitForNavigation: 'networkidle',
bypassCSP: true,
ignoreHTTPSErrors: true
},
MyHelper: {
require: './helpers/helper.js',
Expand Down Expand Up @@ -84,7 +84,7 @@ exports.config = {
multiple: {
parallel: {
chunks: process.env.CHUNKS || defaultChunks,
browsers: ['chrome']
browsers: ['chromium']
}
},
name: 'Submit Your Appeal Tests'
Expand Down
92 changes: 44 additions & 48 deletions test/e2e/crossbrowser/supportedBrowsers.js
Original file line number Diff line number Diff line change
@@ -1,75 +1,71 @@
const LATEST_MAC = 'macOS 11.00';
const LATEST_WINDOWS = 'Windows 10';

const supportedBrowsers = {
microsoft: {
// // ie11_win10: {
// // browserName: 'internet explorer',
// // name: 'IE11_Win10',
// // platform: 'Windows 10',
// // ignoreZoomSetting: true,
// // nativeEvents: false,
// // ignoreProtectedModeSettings: true,
// // version: '11'
// // },


edge_win10: {
browserName: 'MicrosoftEdge',
platformName: 'Windows 10',
ignoreZoomSetting: true,
nativeEvents: false,
ignoreProtectedModeSettings: true,
browserVersion: 'latest',
edge_win_latest: {
browserName: 'Microsoft Edge',
platformName: LATEST_WINDOWS,
browserVersion: 'latest-1',
'sauce:options': {
name: 'Edge_Win10_LATEST_SSCS'
name: 'SSCS: Edge_Win10',
screenResolution: '1400x1050'
}
}
},
chrome: {
chrome_win_latest: {
browserName: 'chrome',
platformName: 'Windows 10',
webkit: {
webkit_latest: {
browserName: 'webkit',
platformName: LATEST_MAC,
browserVersion: 'latest',
'sauce:options': {
name: 'WIN_CHROME_LATEST_SSCS'
name: 'SSCS: Webkit_MAC',
screenResolution: '1400x1050'
}
},
chrome_mac_latest: {
browserName: 'chrome',
platformName: 'macOS 10.15',
}
},
safari: {
safari_mac_latest: {
browserName: 'safari',
platformName: LATEST_MAC,
browserVersion: 'latest',
'sauce:options': {
name: 'MAC_CHROME_LATEST_SSCS'
name: 'SSCS: MAC_SAFARI',
seleniumVersion: '3.141.59',
screenResolution: '1376x1032'
}
}
},
chromium: {
chrome_win_latest: {
browserName: 'chromium',
platformName: LATEST_WINDOWS,
browserVersion: 'latest-1',
'sauce:options': {
name: 'SSCS: WIN_CHROME_LATEST',
screenResolution: '1600x1200'
}
}
},
firefox: {
firefox_win_latest: {
browserName: 'firefox',
platformName: 'Windows 10',
browserVersion: 'latest',
platformName: LATEST_WINDOWS,
browserVersion: 'latest-1',
'sauce:options': {
name: 'WIN_FIREFOX_LATEST_SSCS'
name: 'SSCS: WIN_FIREFOX_LATEST',
screenResolution: '1600x1200'
}
},
firefox_mac_latest: {
browserName: 'firefox',
platformName: 'macOS 10.15',
browserVersion: 'latest',
platformName: LATEST_MAC,
browserVersion: 'latest-1',
'sauce:options': {
name: 'MAC_FIREFOX_LATEST_SSCS'
}
}
},
safari: {
safari_mac_latest: {
browserName: 'safari',
platformName: 'macOS 11.00',
browserVersion: 'latest',
'sauce:options': {
name: 'MAC_SAFARI_LATEST_SSCS',
seleniumVersion: '3.141.59'
name: 'SSCS: MAC_FIREFOX_LATEST',
screenResolution: '1600x1200'
}
}
}
};

module.exports = supportedBrowsers;
module.exports = supportedBrowsers;
36 changes: 0 additions & 36 deletions test/e2e/helpers/SauceLabsReportingHelper.js

This file was deleted.

Loading

0 comments on commit 3247660

Please sign in to comment.