' +
diff --git a/test/commons/color/color.js b/test/commons/color/color.js
index 3c1722c113..c7057bb69a 100644
--- a/test/commons/color/color.js
+++ b/test/commons/color/color.js
@@ -301,6 +301,19 @@ describe('color.Color', () => {
assert.equal(c.blue, 144);
assert.equal(c.alpha, 0.5);
});
+
+ it('clips out of gamut values', () => {
+ const c = new Color();
+ c.parseColorFnString('oklch(25% 0.75 345)');
+ assert.equal(c.red, 186);
+ assert.equal(c.green, 0);
+ assert.equal(c.blue, 103);
+ assert.equal(c.alpha, 1);
+
+ assert.equal(c.red, Math.round(c.r * 255));
+ assert.equal(c.green, Math.round(c.g * 255));
+ assert.equal(c.blue, Math.round(c.b * 255));
+ });
});
});
diff --git a/test/get-webdriver.js b/test/get-webdriver.js
index 6ead098e7c..c71a55710a 100644
--- a/test/get-webdriver.js
+++ b/test/get-webdriver.js
@@ -1,16 +1,21 @@
const { Builder } = require('selenium-webdriver');
const chrome = require('selenium-webdriver/chrome');
-const chromedriverPath = require('chromedriver').path;
+const chromedriverPath =
+ process.env.CHROMEDRIVER_BIN ?? require('chromedriver').path;
const getWebdriver = () => {
const service = new chrome.ServiceBuilder(chromedriverPath);
+ const options = new chrome.Options().addArguments('--headless');
- const webdriver = new Builder()
- .setChromeOptions(new chrome.Options().addArguments('headless'))
+ if (process.env.CHROME_BIN) {
+ options.setBinaryPath(process.env.CHROME_BIN);
+ }
+
+ return new Builder()
+ .setChromeOptions(options)
.forBrowser('chrome')
.setChromeService(service)
.build();
- return webdriver;
};
module.exports.getWebdriver = getWebdriver;
diff --git a/test/integration/full/contrast/prototype.html b/test/integration/full/contrast/prototype.html
index f7f915d6bf..5c1f665783 100644
--- a/test/integration/full/contrast/prototype.html
+++ b/test/integration/full/contrast/prototype.html
@@ -24,7 +24,7 @@
-
Text
+
Text
diff --git a/test/integration/full/preload-cssom/preload-cssom.js b/test/integration/full/preload-cssom/preload-cssom.js
index 24a998063c..63e25b11a5 100644
--- a/test/integration/full/preload-cssom/preload-cssom.js
+++ b/test/integration/full/preload-cssom/preload-cssom.js
@@ -40,6 +40,10 @@ describe('preload cssom integration test', function () {
styleTagWithCyclicCrossOriginImports: {
id: 'styleTagWithCyclicCrossOriginImports',
text: '@import "cyclic-cross-origin-import-1.css";'
+ },
+ styleTagWithNonExistentImport: {
+ id: 'styleTagWithNonExistentImport',
+ text: '@import "non-existent-import.css";'
}
};
let stylesForPage;
@@ -141,12 +145,7 @@ describe('preload cssom integration test', function () {
});
it('throws if cross-origin stylesheet fail to load', done => {
- stylesForPage = [
- {
- id: 'nonExistingStylesheet',
- text: '@import "import-non-existing-cross-origin.css";'
- }
- ];
+ stylesForPage = [styleSheets.styleTagWithNonExistentImport];
attachStylesheets(
{
root: root,
@@ -157,8 +156,12 @@ describe('preload cssom integration test', function () {
done(err);
}
getPreloadCssom(root)
- .then(() => {
- done(new Error('Expected getPreload to reject.'));
+ .then(sheets => {
+ done(
+ new Error(
+ `Expected getPreload to reject, but it resolved with ${JSON.stringify(sheets)}.`
+ )
+ );
})
.catch(e => {
assert.isDefined(e);
diff --git a/test/integration/full/test-webdriver.js b/test/integration/full/test-webdriver.js
index 89d9e8a863..5a85fe5b61 100644
--- a/test/integration/full/test-webdriver.js
+++ b/test/integration/full/test-webdriver.js
@@ -1,7 +1,8 @@
const { globSync } = require('glob');
const chrome = require('selenium-webdriver/chrome');
const firefox = require('selenium-webdriver/firefox');
-const chromedriver = require('chromedriver');
+const chromedriver =
+ process.env.CHROMEDRIVER_BIN ?? require('chromedriver').path;
const args = process.argv.slice(2);
@@ -118,22 +119,32 @@ function buildWebDriver(browser) {
let webdriver;
const mobileBrowser = browser.split('-mobile');
- // fix chrome DevToolsActivePort file doesn't exist in CricleCI (as well as a
+ // fix chrome DevToolsActivePort file doesn't exist in CircleCI (as well as a
// host of other problems with starting Chrome). the only thing that seems to
// allow Chrome to start without problems consistently is using ChromeHeadless
// @see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t
if (browser === 'chrome') {
- const service = new chrome.ServiceBuilder(chromedriver.path).build();
+ const service = new chrome.ServiceBuilder(chromedriver).build();
const options = new chrome.Options().addArguments([
- 'headless',
+ '--headless',
'--no-sandbox',
'--disable-extensions',
'--disable-dev-shm-usage'
]);
+
+ if (process.env.CHROME_BIN) {
+ options.setBinaryPath(process.env.CHROME_BIN);
+ }
+
webdriver = chrome.Driver.createSession(options, service);
} else if (browser === 'firefox') {
const options = new firefox.Options().addArguments('--headless');
+
+ if (process.env.FIREFOX_BIN) {
+ options.setBinary(process.env.FIREFOX_BIN);
+ }
+
webdriver = firefox.Driver.createSession(options);
}
diff --git a/test/integration/rules/color-contrast/color-contrast.html b/test/integration/rules/color-contrast/color-contrast.html
index bf47ee73ce..20b7082e7a 100644
--- a/test/integration/rules/color-contrast/color-contrast.html
+++ b/test/integration/rules/color-contrast/color-contrast.html
@@ -282,6 +282,44 @@
note: gives firefox to load (document.stylesheets), other browsers are fine.
+ // In Firefox, there is a delay between adding the element and it appearing in
+ // document.styleSheets, so we poll until we see it there.
+ const timeoutAt = Date.now() + 500;
+ const interval = setInterval(function () {
+ const isLoaded = Array.from(doc.styleSheets).some(
+ sheet => sheet.ownerNode === style
+ );
+ if (isLoaded) {
+ clearInterval(interval);
+ resolve();
+ } else if (Date.now() > timeoutAt) {
+ clearInterval(interval);
+ reject(
+ new Error(
+ 'Added