Skip to content

Commit 2356b42

Browse files
risadamsrisadams
committedJan 27, 2022
Updated test suite
·
v0.15.2v0.13.5
1 parent d71d8b1 commit 2356b42

File tree

5 files changed

+4277
-3004
lines changed

5 files changed

+4277
-3004
lines changed
 

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ node_modules
44
bower_components
55
*.log
66
.vscode
7-
build
7+
build
8+
coverage/

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fund=false

‎karma.conf.js

+38-84
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,41 @@
1-
module.exports = function(config) {
2-
// workaround for https://github.com/karma-runner/karma-sauce-launcher/issues/40
3-
var saucelabsBatchID = Number(process.env.SAUCELABS_BATCH) - 1;
4-
var saucelabsConcurrency = 4;
5-
var saucelabsBrowsers = [
6-
// mobile
7-
{platform: 'OS X 10.10', browserName: 'iPhone', version: '8.1'},
8-
//{platform: 'OS X 10.10 ', browserName: 'iPhone', version: '6.0'},
9-
{platform: 'OS X 10.10', browserName: 'iPad', version: '8.1'},
10-
//{platform: 'OS X 10.10', browserName: 'iPad', version: '6.0'},
11-
{platform: 'Linux', browserName: 'android', version: '4.4'},
12-
{platform: 'Linux', browserName: 'android', version: '4.3'},
13-
// desktop (safari)
14-
{platform: 'OS X 10.8', browserName: 'safari', version: 6},
15-
{platform: 'OS X 10.9', browserName: 'safari', version: 7},
16-
{platform: 'OS X 10.10', browserName: 'safari', version: 8},
17-
// desktop (chrome)
18-
{platform: 'OS X 10.10', browserName: 'chrome', version: 39},
19-
{platform: 'OS X 10.10', browserName: 'chrome', version: 38},
20-
{platform: 'OS X 10.10', browserName: 'chrome', version: 37},
21-
{platform: 'Windows 7', browserName: 'chrome', version: 39},
22-
{platform: 'Windows 7', browserName: 'chrome', version: 38},
23-
{platform: 'Windows 7', browserName: 'chrome', version: 37},
24-
// desktop (firefox)
25-
{platform: 'Windows 7', browserName: 'firefox', version: 35},
26-
{platform: 'Windows 8', browserName: 'firefox', version: 35},
27-
{platform: 'OS X 10.10', browserName: 'firefox', version: 34},
28-
{platform: 'OS X 10.10', browserName: 'firefox', version: 33},
29-
{platform: 'OS X 10.10', browserName: 'firefox', version: 32},
30-
// desktop (internet explorer)
31-
{platform: 'Windows 8', browserName: 'iexplore', version: 10},
32-
{platform: 'Windows 8.1', browserName: 'iexplore', version: 11},
33-
{platform: 'Windows 7', browserName: 'iexplore', version: 9}
34-
];
1+
module.exports = function (config) {
2+
var targets = {
3+
'phantomjs': ['PhantomJS']
4+
};
355

36-
if (process.env.TARGET === 'saucelabs') {
37-
saucelabsBrowsers = saucelabsBrowsers.slice(saucelabsBatchID * saucelabsConcurrency, saucelabsBatchID * saucelabsConcurrency + saucelabsConcurrency);
38-
if (!saucelabsBrowsers.length) process.exit(0);
39-
}
6+
var browsers = targets[process.env.TARGET || 'phantomjs'];
7+
if (process.env.BROWSERS) {
8+
browsers = process.env.BROWSERS.split(',');
9+
}
4010

41-
var customLaunchers = {};
42-
saucelabsBrowsers.forEach(function(browser, i) {
43-
browser.base = 'SauceLabs';
44-
customLaunchers['SL_' + i] = browser;
45-
});
46-
47-
var targets = {
48-
'saucelabs': Object.keys(customLaunchers),
49-
'phantomjs': ['PhantomJS']
50-
};
51-
52-
var browsers = targets[process.env.TARGET || 'phantomjs'];
53-
if (process.env.BROWSERS) {
54-
browsers = process.env.BROWSERS.split(',');
55-
}
56-
57-
config.set({
58-
frameworks: ['mocha', 'chai'],
59-
files: [
60-
'dist/css/selectize.default.css',
61-
'node_modules/jquery/dist/jquery.js',
62-
'node_modules/microplugin/src/microplugin.js',
63-
'node_modules/sifter/sifter.js',
64-
'test/support/*.js',
65-
'src/contrib/*.js',
66-
'src/constants.js',
67-
'src/utils.js',
68-
'src/selectize.js',
69-
'src/defaults.js',
70-
'src/selectize.jquery.js',
71-
'test/*.js'
72-
],
73-
preprocessors: {
74-
'src/*.js': ['coverage']
75-
},
76-
customLaunchers: customLaunchers,
77-
port: 8888,
78-
colors: true,
79-
captureTimeout: 0,
80-
logLevel: config.LOG_INFO,
81-
browsers: browsers,
82-
browserDisconnectTolerance: 2,
83-
browserDisconnectTimeout: 10000,
84-
browserNoActivityTimeout: 120000,
85-
singleRun: true
86-
});
11+
config.set({
12+
frameworks: ['mocha', 'chai'],
13+
files: [
14+
'dist/css/selectize.default.css',
15+
'node_modules/jquery/dist/jquery.js',
16+
'node_modules/microplugin/src/microplugin.js',
17+
'node_modules/sifter/sifter.js',
18+
'test/support/*.js',
19+
'src/contrib/*.js',
20+
'src/constants.js',
21+
'src/utils.js',
22+
'src/selectize.js',
23+
'src/defaults.js',
24+
'src/selectize.jquery.js',
25+
'test/*.js'
26+
],
27+
preprocessors: {
28+
'src/*.js': ['coverage']
29+
},
30+
reporters: ['progress', 'coverage'],
31+
port: 8888,
32+
colors: true,
33+
captureTimeout: 0,
34+
logLevel: config.LOG_INFO,
35+
browsers: browsers,
36+
browserDisconnectTolerance: 2,
37+
browserDisconnectTimeout: 10000,
38+
browserNoActivityTimeout: 120000,
39+
singleRun: true
40+
});
8741
};

‎package-lock.json

+4,231-2,914
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
"sifter": "^0.5.4"
2828
},
2929
"devDependencies": {
30-
"@types/jquery": "^3.5.8",
30+
"@types/jquery": "^3.5.13",
3131
"bootstrap-sass": "^3.4.1",
3232
"bootstrap2": "npm:bootstrap-2.3.2@1.0.0",
3333
"bootstrap3": "npm:bootstrap@3.4.1",
3434
"bootstrap4": "npm:bootstrap@4.6.0",
3535
"bootstrap5": "npm:bootstrap@5.1.3",
36-
"chai": "^4.3.4",
36+
"chai": "4.3.4",
3737
"grunt": "~1.4.1",
3838
"grunt-cli": "^1.4.3",
3939
"grunt-contrib-clean": "^2.0.0",
@@ -46,8 +46,8 @@
4646
"grunt-replace": "^2.0.2",
4747
"grunt-sass": "^3.1.0",
4848
"jquery": "^3.6.0",
49-
"jshint": "^2.13.1",
50-
"karma": "^6.3.5",
49+
"jshint": "^2.13.4",
50+
"karma": "6.3.11",
5151
"karma-chai": "^0.1.0",
5252
"karma-chrome-launcher": "^3.1.0",
5353
"karma-coverage": "^2.0.3",
@@ -59,7 +59,7 @@
5959
"karma-safari-launcher": "^1.0.0",
6060
"karma-sauce-launcher": "^4.3.6",
6161
"load-grunt-tasks": "^5.1.0",
62-
"mocha": "^9.1.3",
62+
"mocha": "9.1.3",
6363
"popper.js": "1.16.1",
6464
"sass": "1.49.0"
6565
},

0 commit comments

Comments
 (0)
Please sign in to comment.