Skip to content

Commit 4005ea9

Browse files
author
nfrasser
committed
Fix IE8 tests by downgrading uglify
Also adding Safari to Sauce browser matrix
1 parent 77494f1 commit 4005ea9

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

.eslintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,4 @@
2828
"describe": false,
2929
"it": false
3030
}
31-
3231
}

gulpfile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const eslint = require('gulp-eslint');
1818
const mocha = require('gulp-mocha');
1919
const rename = require('gulp-rename');
2020
const replace = require('gulp-replace');
21+
// NOTE: DO NOT Upgrade gulp-uglify, it breaks IE8 and the options don't seem to be working
2122
const uglify = require('gulp-uglify');
2223
const wrap = require('gulp-wrap');
2324

@@ -347,6 +348,7 @@ gulp.task('build-benchmark', ['build-legacy'], () =>
347348
.pipe(gulp.dest('build/benchmark'))
348349
);
349350

351+
// NOTE: DO NOT Upgrade gulp-uglify, it breaks IE8 and the options don't seem to be working
350352
gulp.task('uglify', ['build-legacy'], () => {
351353
let options = {
352354
mangleProperties: {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"gulp-mocha": "^3.0.1",
4646
"gulp-rename": "^1.2.0",
4747
"gulp-replace": "^0.5.4",
48-
"gulp-uglify": "^2.0.0",
48+
"gulp-uglify": "^1.5.4",
4949
"gulp-util": "^3.0.7",
5050
"gulp-wrap": "^0.13.0",
5151
"jsdom": "^9.3.0",

src/linkify/core/state.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,11 @@ const TokenState = inherits(BaseState, createStateClass(), {
182182
@return {Array} list of newly-created states
183183
*/
184184
function stateify(str, start, endToken, defaultToken) {
185-
186-
let newStates = [];
187-
188-
var i = 0;
189-
var len = str.length;
190-
var state = start;
191-
var nextState;
185+
let i = 0,
186+
len = str.length,
187+
state = start,
188+
newStates = [],
189+
nextState;
192190

193191
// Find the next state without a jump to the next character
194192
while (i < len && (nextState = state.next(str[i]))) {

test/ci.amd.conf.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Karma CI configuration
22

3-
var
4-
base = require('./amd.conf'),
5-
extend = require('lodash/extend');
3+
const base = require('./amd.conf');
4+
const extend = require('lodash/extend');
65

76
module.exports = function (config) {
87

@@ -18,6 +17,11 @@ module.exports = function (config) {
1817
browserName: 'firefox',
1918
version: '45'
2019
},
20+
sl_safari: {
21+
base: 'SauceLabs',
22+
browserName: 'safari',
23+
version: '7'
24+
},
2125
sl_edge: {
2226
base: 'SauceLabs',
2327
browserName: 'MicrosoftEdge',
@@ -49,11 +53,11 @@ module.exports = function (config) {
4953
// level of logging
5054
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
5155
sauceLabs: {
52-
testName: 'Linkify Browser AMD Tests',
53-
browserDisconnectTimeout: 30000,
54-
browserNoActivityTimeout: 30000,
55-
browserDisconnectTolerance: 3
56+
testName: 'Linkify Browser AMD Tests'
5657
},
58+
browserDisconnectTimeout: 30000,
59+
browserNoActivityTimeout: 30000,
60+
browserDisconnectTolerance: 3,
5761
customLaunchers: customLaunchers,
5862
browsers: Object.keys(customLaunchers),
5963
autoWatch: false,

test/ci.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = function (config) {
5252
// level of logging
5353
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
5454
sauceLabs: {
55-
testName: 'Linkify Browser Tests',
55+
testName: 'Linkify Browser Tests'
5656
},
5757
browserDisconnectTimeout: 30000,
5858
browserNoActivityTimeout: 30000,

0 commit comments

Comments
 (0)