Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/karma sauce errors #3717

Merged
merged 5 commits into from Apr 1, 2021
Merged

Fix/karma sauce errors #3717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ea937b
[Updated] karma sauce launcher which should fix suace tests that are …
jasonsaayman Mar 30, 2021
7dd3d3e
[Updated] karma config to follow es-lint rules of axios
jasonsaayman Mar 31, 2021
fc57486
[Updated] karma version to latest
jasonsaayman Mar 31, 2021
cec71ab
[Added] propper browsers when testing local
jasonsaayman Mar 31, 2021
b07b0fb
Merge branch 'master' into fix/karma-sauce-errors
jasonsaayman Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 19 additions & 17 deletions karma.conf.js
View file
Open in desktop
@@ -1,6 +1,11 @@
/* eslint-disable no-console */
/* eslint-disable no-unused-vars */
/* eslint-disable func-names */
// Karma configuration
// Generated on Fri Aug 15 2014 23:11:13 GMT-0500 (CDT)

'use strict';

var webpack = require('webpack');

function createCustomLauncher(browser, version, platform) {
Expand All @@ -19,7 +24,7 @@ module.exports = function(config) {

if (process.env.SAUCE_USERNAME || process.env.SAUCE_ACCESS_KEY) {
customLaunchers = {};

var runAll = true;
var options = [
'SAUCE_CHROME',
Expand All @@ -32,7 +37,7 @@ module.exports = function(config) {
'SAUCE_ANDROID'
];

options.forEach(function (opt) {
options.forEach(function(opt) {
if (process.env[opt]) {
runAll = false;
}
Expand All @@ -56,21 +61,20 @@ module.exports = function(config) {
if (runAll || process.env.SAUCE_SAFARI) {
// customLaunchers.SL_Safari7 = createCustomLauncher('safari', 7);
// customLaunchers.SL_Safari8 = createCustomLauncher('safari', 8);

customLaunchers.SL_Safari9 = createCustomLauncher(
"safari",
'safari',
9.0,
"OS X 10.11"
'OS X 10.11'
);
customLaunchers.SL_Safari10 = createCustomLauncher(
"safari",
"10.1",
"macOS 10.12"
'safari',
'10.1',
'macOS 10.12'
);
customLaunchers.SL_Safari11 = createCustomLauncher(
"safari",
"11.1",
"macOS 10.13"
'safari',
'11.1',
'macOS 10.13'
);
}

Expand Down Expand Up @@ -127,7 +131,7 @@ module.exports = function(config) {
console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.');
browsers = ['Firefox', 'Chrome'];
}

config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
Expand All @@ -141,14 +145,12 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'test/specs/__helpers.js',
'test/specs/**/*.spec.js',
'test/specs/**/*.spec.js'
],


// list of files to exclude
exclude: [

],
exclude: [],


// preprocess matching files before serving them to the browser
Expand Down Expand Up @@ -209,7 +211,7 @@ module.exports = function(config) {
{
'./adapters/http': 'var undefined'
}
],
]
},

webpackServer: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@
"grunt-webpack": "^4.0.2",
"istanbul-instrumenter-loader": "^1.0.0",
"jasmine-core": "^2.4.1",
"karma": "^5.2.3",
"karma": "^6.3.2",
"karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^2.1.0",
"karma-jasmine": "^1.1.1",
Expand Down