Resolve conflict for 4.3.0 (#1081)

* Release v4.2.3 (#1045) Merging 4.2.3 to master * Release v4.2.3 (#1056) * Fixing funnelback search test
qld-gov-au · Aug 21, 2023 · ee34f8b · ee34f8b
1 parent c73d72e
commit ee34f8b
Show file tree

Hide file tree

Showing 31 changed files with 462 additions and 227 deletions.
diff --git a/e2e/__tests__/components/accordion-test.js b/e2e/__tests__/components/accordion-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
 });

diff --git a/e2e/__tests__/components/alert-test.js b/e2e/__tests__/components/alert-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
 });

diff --git a/e2e/__tests__/components/call-out-box-test.js b/e2e/__tests__/components/call-out-box-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
 });

diff --git a/e2e/__tests__/components/carousel-test.js b/e2e/__tests__/components/carousel-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components/carousel.html`, { waitUntil: 'networkidle0' });

diff --git a/e2e/__tests__/components/facebook-feed-test.js b/e2e/__tests__/components/facebook-feed-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components/facebook-feed.html`, { waitUntil: 'networkidle0' });

diff --git a/e2e/__tests__/components/funnelback-search-test.js b/e2e/__tests__/components/funnelback-search-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components.html`, { waitUntil: 'networkidle0' });

diff --git a/e2e/__tests__/components/quick-exit-test.js b/e2e/__tests__/components/quick-exit-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components/quick-exit.html`, { waitUntil: 'networkidle0' });

diff --git a/e2e/__tests__/components/twitter-feed-test.js b/e2e/__tests__/components/twitter-feed-test.js
@@ -4,7 +4,7 @@ let browser;
 let page;
 jest.setTimeout(40000);
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components/twitter-feed.html`, { waitUntil: 'networkidle0' });

diff --git a/e2e/__tests__/layout/footer-feedback-test.js b/e2e/__tests__/layout/footer-feedback-test.js
@@ -4,7 +4,7 @@ const ct = require('../../config/constants');
 let browser;
 let page;
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_XL, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components.html`, { waitUntil: 'networkidle0' });

diff --git a/e2e/__tests__/layout/header-sm-screen-test.js b/e2e/__tests__/layout/header-sm-screen-test.js
@@ -4,7 +4,7 @@ const ct = require('../../config/constants');
 let browser;
 let page;
 beforeAll(async () => {
-  browser = await puppeteer.launch({headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox']});
+  browser = await puppeteer.launch({headless: "new", args: ['--no-sandbox', '--disable-setuid-sandbox']});
   page = await browser.newPage();
   await page.setViewport({ width: ct.BT_SM, height: ct.WH });
   await page.goto(`${ct.APP_URL}/docs/components.html`, { waitUntil: 'networkidle0' });