Skip to content

Commit

Permalink
Fix/karma sauce errors (axios#3717)
Browse files Browse the repository at this point in the history
* [Updated] karma sauce launcher which should fix suace tests that are no longer showing as passed and rather completed

* [Updated] karma config to follow es-lint rules of axios

* [Updated] karma version to latest

* [Added] propper browsers when testing local
  • Loading branch information
jasonsaayman committed Apr 1, 2021
1 parent 66e2172 commit 9d18b20
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
36 changes: 19 additions & 17 deletions karma.conf.js
@@ -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
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

0 comments on commit 9d18b20

Please sign in to comment.