Skip to content

Commit

Permalink
Merge in 'release/8.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Jan 17, 2024
2 parents 4855269 + 658ddfb commit fd749a7
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions src/SignalR/clients/ts/FunctionalTests/scripts/karma.local.conf.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const os = require('os');

try {
// Karma configuration for a local run (the default)
const createKarmaConfig = require("./karma.base.conf");
Expand Down Expand Up @@ -45,8 +47,16 @@ try {
// We use the launchers themselves to figure out if the browser exists. It's a bit sneaky, but it works.
tryAddBrowser("ChromeHeadlessNoSandbox", ChromeHeadlessBrowser.prototype);
tryAddBrowser("ChromiumHeadlessIgnoreCert", ChromiumHeadlessBrowser.prototype);
if (!tryAddBrowser("FirefoxHeadless", FirefoxHeadlessBrowser.prototype)) {
tryAddBrowser("FirefoxDeveloperHeadless", FirefoxDeveloperHeadlessBrowser.prototype);

if (os.platform() !== 'darwin') {
if (!tryAddBrowser("FirefoxHeadless", FirefoxHeadlessBrowser.prototype)) {
tryAddBrowser("FirefoxDeveloperHeadless", FirefoxDeveloperHeadlessBrowser.prototype);
}
} else {
// https://bugzilla.mozilla.org/show_bug.cgi?id=1871366
// https://bugzilla.mozilla.org/show_bug.cgi?id=1871447
// It looks like some Entitlements issue with Firefox and macOS, additionally, it seems 'firefox-bin' is being removed which is what the karma firefox launcher uses by default
tryAddBrowser("FirefoxHeadlessMac", FirefoxHeadlessBrowser.prototype);
}

// We need to receive an argument from the caller, but globals don't seem to work, so we use an environment variable.
Expand All @@ -71,6 +81,11 @@ try {

// Ignore cert errors to allow our test cert to work (NEVER do this outside of testing)
flags: ["--allow-insecure-localhost", "--ignore-certificate-errors"]
},
FirefoxHeadlessMac: {
base: 'FirefoxHeadless',

command: '/Applications/FireFox.app/Contents/MacOS/firefox'
}
},
});
Expand Down

0 comments on commit fd749a7

Please sign in to comment.