Skip to content

Commit

Permalink
Merge pull request #2885 from karma-runner/prep-2
Browse files Browse the repository at this point in the history
Prep for 2.0
  • Loading branch information
dignifiedquire authored Nov 25, 2017
2 parents 7bd54ed + 00e3f88 commit 10fac07
Show file tree
Hide file tree
Showing 40 changed files with 406 additions and 355 deletions.
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ sudo: false
language: node_js
node_js:
- 4
- 5
- 7
- 6
- 8
- 9

env:
global:
Expand All @@ -14,7 +14,7 @@ env:
matrix:
fast_finish: true
include:
- node_js: "6"
- node_js: "8"
env: VALIDATE_COMMIT_MSG=true LINT=true

before_install:
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ version: "{build}"
environment:
matrix:
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "6"
- nodejs_version: "7"
- nodejs_version: "8"

matrix:
Expand Down
1 change: 0 additions & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ module.exports = function (grunt) {
},
mochaTest: {
options: {
require: 'babel-register',
reporter: 'dot',
ui: 'bdd',
quiet: false,
Expand Down
7 changes: 2 additions & 5 deletions lib/file-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
// Dependencies
// ------------

var Map = require('core-js/library/fn/map')
var Set = require('core-js/library/fn/set')
var from = require('core-js/library/fn/array/from')
var Promise = require('bluebird')
var mm = require('minimatch')
var Glob = require('glob').Glob
Expand Down Expand Up @@ -120,7 +117,7 @@ List.prototype._findFile = function (path, pattern) {
if (!path || !pattern) return
if (!this.buckets.has(pattern.pattern)) return

return _.find(from(this.buckets.get(pattern.pattern)), function (file) {
return _.find(Array.from(this.buckets.get(pattern.pattern)), function (file) {
return file.originalPath === path
})
}
Expand Down Expand Up @@ -229,7 +226,7 @@ Object.defineProperty(List.prototype, 'files', {
}

var expandPattern = function (p) {
return from(self.buckets.get(p.pattern) || []).sort(byPath)
return Array.from(self.buckets.get(p.pattern) || []).sort(byPath)
}

var served = this._patterns.filter(function (pattern) {
Expand Down
11 changes: 5 additions & 6 deletions lib/middleware/source_files.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var from = require('core-js/library/fn/array/from')
var querystring = require('querystring')
var _ = require('lodash')

Expand All @@ -8,17 +7,17 @@ var log = logger.create('middleware:source-files')

// Files is a Set
var findByPath = function (files, path) {
return _.find(from(files), function (file) {
return _.find(Array.from(files), function (file) {
return file.path === path
})
}

var composeUrl = function (url, basePath, urlRoot, mustEscape) {
return (mustEscape ? querystring.unescape(url) : url)
.replace(urlRoot, '/')
.replace(/\?.*$/, '')
.replace(/^\/absolute/, '')
.replace(/^\/base/, basePath)
.replace(urlRoot, '/')
.replace(/\?.*$/, '')
.replace(/^\/absolute/, '')
.replace(/^\/base/, basePath)
}

// Source Files middleware is responsible for serving all the source files under the test.
Expand Down
1 change: 0 additions & 1 deletion lib/reporter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var util = require('util')
var resolve = require('url').resolve
var SourceMapConsumer = require('source-map').SourceMapConsumer
var WeakMap = require('core-js/es6/weak-map')
var _ = require('lodash')

var log = require('./logger').create('reporter')
Expand Down
34 changes: 16 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -350,25 +350,23 @@
"range-parser": "^1.2.0",
"rimraf": "^2.6.0",
"safe-buffer": "^5.0.1",
"socket.io": "2.0.3",
"source-map": "^0.5.3",
"tmp": "0.0.31",
"socket.io": "2.0.4",
"source-map": "^0.6.1",
"tmp": "0.0.33",
"useragent": "^2.1.12"
},
"devDependencies": {
"LiveScript": "^1.3.0",
"babel": "^6.23.0",
"babel-preset-es2015": "^6.22.0",
"babel-register": "^6.23.0",
"chai": "^3.3.0",
"chai-as-promised": "^6.0.0",
"babel-core": "^6.26.0",
"chai": "^4.1.2",
"chai-as-promised": "^7.1.1",
"chai-subset": "^1.2.2",
"coffee-script": "^1.12.4",
"cucumber": "^2.2.0",
"eslint": "^3.15.0",
"coffeescript": "^1.12.7",
"cucumber": "^3.1.0",
"eslint": "^4.11.0",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-promise": "^3.4.2",
"eslint-plugin-react": "^7.0.1",
"eslint-plugin-standard": "^3.0.1",
Expand All @@ -380,12 +378,12 @@
"grunt-contrib-watch": "^1.0.0",
"grunt-conventional-changelog": "^6.0.1",
"grunt-conventional-github-releaser": "^1.0.0",
"grunt-cucumberjs": "^1.0.0",
"grunt-eslint": "^19.0.0",
"grunt-cucumberjs": "^2.0.2",
"grunt-eslint": "^20.1.0",
"grunt-mocha-test": "^0.13.2",
"grunt-npm": "0.0.2",
"http2": "^3.3.6",
"husky": "^0.13.1",
"husky": "^0.14.3",
"jasmine-core": "^2.3.4",
"json3": "^3.3.2",
"karma-browserify": "^5.0.1",
Expand All @@ -411,13 +409,13 @@
"karma-script-launcher": "^1.0.0",
"load-grunt-tasks": "^3.1.0",
"mkdirp": "^0.5.0",
"mocha": "^3.2.0",
"mocha": "^4.0.1",
"mocks": "^0.0.15",
"phantomjs-prebuilt": "^2.1.3",
"proxyquire": "^1.7.11",
"qunitjs": "^2.1.1",
"requirejs": "^2.1.20",
"sinon": "^2.2.0",
"sinon": "^4.1.2",
"sinon-chai": "^2.7.0",
"supertest": "^3.0.0",
"timer-shim": "^0.3.0",
Expand All @@ -434,7 +432,7 @@
"version": "1.7.1",
"license": "MIT",
"scripts": {
"lint": "eslint client/**/*.js common/**/*.js context/**/*.js gruntfile.js wallaby.js lib/**/*.js test/**/*.js static/debug.js",
"lint": "eslint client/**/*.js common/**/*.js context/**/*.js gruntfile.js wallaby.js lib/**/*.js test/unit/**/*.js test/client/*.js test/e2e/**/*.js static/debug.js",
"test": "grunt test",
"build": "grunt build",
"test:appveyor": "grunt test-appveyor",
Expand Down
Loading

0 comments on commit 10fac07

Please sign in to comment.