Skip to content

Revert "Getting green Travis tests" #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
sudo: false

os:
- linux
- osx
Expand All @@ -12,5 +14,9 @@ cache:
directories:
- node_modules

install:
- npm i -g npm@latest
- npm install

notifications:
email: false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Parallel.js
===========
[![Build Status](https://travis-ci.org/parallel-js/parallel.js.svg?branch=develop)](https://travis-ci.org/parallel-js/parallel.js)
[![Build Status](https://travis-ci.org/parallel-js/parallel.js.svg?branch=master)](https://travis-ci.org/parallel-js/parallel.js)
[![NPM version](https://badge.fury.io/js/paralleljs.svg)](http://badge.fury.io/js/paralleljs)
[![Dependency Status](https://img.shields.io/david/parallel-js/parallel.js.svg)](https://david-dm.org/parallel-js/parallel.js)
[![npm](https://img.shields.io/npm/dm/paralleljs.svg?maxAge=2592000)]()
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "BSD",
"scripts": {
"lint": "eslint test lib *.js",
"test": "jasmine-node --verbose test/specs"
"test": "npm run lint && jasmine-node --verbose test/specs"
},
"main": "lib/parallel.js",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions test/specs/performance.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var isNode = typeof module !== 'undefined' && module.exports;
var Parallel = isNode ? require('../../lib/parallel.js') : self.Parallel;

xit.('.map() should be using multi-threading (could fail on single-core)', function () {
it('.map() should be using multi-threading (could fail on single-core)', function () {
var slowSquare = function (n) {
var i = 0;
while (++i < n * n) { }
Expand Down Expand Up @@ -54,4 +54,4 @@
expect(time2).toBeLessThan(time * 0.8);
});
});
});
});