Skip to content

Commit 01e97b5

Browse files
authored
Revert "Getting green Travis tests" (#147)
1 parent d39014c commit 01e97b5

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
sudo: false
2+
13
os:
24
- linux
35
- osx
@@ -12,5 +14,9 @@ cache:
1214
directories:
1315
- node_modules
1416

17+
install:
18+
- npm i -g npm@latest
19+
- npm install
20+
1521
notifications:
1622
email: false

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Parallel.js
22
===========
3-
[![Build Status](https://travis-ci.org/parallel-js/parallel.js.svg?branch=develop)](https://travis-ci.org/parallel-js/parallel.js)
3+
[![Build Status](https://travis-ci.org/parallel-js/parallel.js.svg?branch=master)](https://travis-ci.org/parallel-js/parallel.js)
44
[![NPM version](https://badge.fury.io/js/paralleljs.svg)](http://badge.fury.io/js/paralleljs)
55
[![Dependency Status](https://img.shields.io/david/parallel-js/parallel.js.svg)](https://david-dm.org/parallel-js/parallel.js)
66
[![npm](https://img.shields.io/npm/dm/paralleljs.svg?maxAge=2592000)]()

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "BSD",
1111
"scripts": {
1212
"lint": "eslint test lib *.js",
13-
"test": "jasmine-node --verbose test/specs"
13+
"test": "npm run lint && jasmine-node --verbose test/specs"
1414
},
1515
"main": "lib/parallel.js",
1616
"repository": {

test/specs/performance.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var isNode = typeof module !== 'undefined' && module.exports;
33
var Parallel = isNode ? require('../../lib/parallel.js') : self.Parallel;
44

5-
xit.('.map() should be using multi-threading (could fail on single-core)', function () {
5+
it('.map() should be using multi-threading (could fail on single-core)', function () {
66
var slowSquare = function (n) {
77
var i = 0;
88
while (++i < n * n) { }
@@ -54,4 +54,4 @@
5454
expect(time2).toBeLessThan(time * 0.8);
5555
});
5656
});
57-
});
57+
});

0 commit comments

Comments
 (0)