2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-20 20:00:40 +03:00

Fix/karma sauce errors (#3717)

* [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
This commit is contained in:
Jay
2021-04-01 07:41:15 +02:00
committed by GitHub
parent c461ae9e97
commit d99d5faac2
2 changed files with 20 additions and 18 deletions
+19 -17
View File
@@ -1,6 +1,11 @@
/* eslint-disable no-console */
/* eslint-disable no-unused-vars */
/* eslint-disable func-names */
// Karma configuration // Karma configuration
// Generated on Fri Aug 15 2014 23:11:13 GMT-0500 (CDT) // Generated on Fri Aug 15 2014 23:11:13 GMT-0500 (CDT)
'use strict';
var webpack = require('webpack'); var webpack = require('webpack');
function createCustomLauncher(browser, version, platform) { function createCustomLauncher(browser, version, platform) {
@@ -19,7 +24,7 @@ module.exports = function(config) {
if (process.env.SAUCE_USERNAME || process.env.SAUCE_ACCESS_KEY) { if (process.env.SAUCE_USERNAME || process.env.SAUCE_ACCESS_KEY) {
customLaunchers = {}; customLaunchers = {};
var runAll = true; var runAll = true;
var options = [ var options = [
'SAUCE_CHROME', 'SAUCE_CHROME',
@@ -32,7 +37,7 @@ module.exports = function(config) {
'SAUCE_ANDROID' 'SAUCE_ANDROID'
]; ];
options.forEach(function (opt) { options.forEach(function(opt) {
if (process.env[opt]) { if (process.env[opt]) {
runAll = false; runAll = false;
} }
@@ -56,21 +61,20 @@ module.exports = function(config) {
if (runAll || process.env.SAUCE_SAFARI) { if (runAll || process.env.SAUCE_SAFARI) {
// customLaunchers.SL_Safari7 = createCustomLauncher('safari', 7); // customLaunchers.SL_Safari7 = createCustomLauncher('safari', 7);
// customLaunchers.SL_Safari8 = createCustomLauncher('safari', 8); // customLaunchers.SL_Safari8 = createCustomLauncher('safari', 8);
customLaunchers.SL_Safari9 = createCustomLauncher( customLaunchers.SL_Safari9 = createCustomLauncher(
"safari", 'safari',
9.0, 9.0,
"OS X 10.11" 'OS X 10.11'
); );
customLaunchers.SL_Safari10 = createCustomLauncher( customLaunchers.SL_Safari10 = createCustomLauncher(
"safari", 'safari',
"10.1", '10.1',
"macOS 10.12" 'macOS 10.12'
); );
customLaunchers.SL_Safari11 = createCustomLauncher( customLaunchers.SL_Safari11 = createCustomLauncher(
"safari", 'safari',
"11.1", '11.1',
"macOS 10.13" 'macOS 10.13'
); );
} }
@@ -127,7 +131,7 @@ module.exports = function(config) {
console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.'); console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.');
browsers = ['Firefox', 'Chrome']; browsers = ['Firefox', 'Chrome'];
} }
config.set({ config.set({
// base path that will be used to resolve all patterns (eg. files, exclude) // base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '', basePath: '',
@@ -141,14 +145,12 @@ module.exports = function(config) {
// list of files / patterns to load in the browser // list of files / patterns to load in the browser
files: [ files: [
'test/specs/__helpers.js', 'test/specs/__helpers.js',
'test/specs/**/*.spec.js', 'test/specs/**/*.spec.js'
], ],
// list of files to exclude // list of files to exclude
exclude: [ exclude: [],
],
// preprocess matching files before serving them to the browser // preprocess matching files before serving them to the browser
@@ -209,7 +211,7 @@ module.exports = function(config) {
{ {
'./adapters/http': 'var undefined' './adapters/http': 'var undefined'
} }
], ]
}, },
webpackServer: { webpackServer: {
+1 -1
View File
@@ -46,7 +46,7 @@
"grunt-webpack": "^4.0.2", "grunt-webpack": "^4.0.2",
"istanbul-instrumenter-loader": "^1.0.0", "istanbul-instrumenter-loader": "^1.0.0",
"jasmine-core": "^2.4.1", "jasmine-core": "^2.4.1",
"karma": "^5.2.3", "karma": "^6.3.2",
"karma-chrome-launcher": "^3.1.0", "karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^2.1.0", "karma-firefox-launcher": "^2.1.0",
"karma-jasmine": "^1.1.1", "karma-jasmine": "^1.1.1",