Skip to content

Commit

Permalink
Merge pull request #384 from auth0/changed-build-process
Browse files Browse the repository at this point in the history
Move to CircleCI
  • Loading branch information
hzalaz authored Mar 10, 2017
2 parents 749f09c + 7732bd6 commit d93b7b1
Show file tree
Hide file tree
Showing 10 changed files with 4,447 additions and 36 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ example/auth0.js

.gitignore
coverage
test-results.xml

.idea/
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# auth0.js

[![Build Status][circleci-image]][circleci-url]
[![NPM version][npm-image]][npm-url]
[![Build status][travis-image]][travis-url]
[![Coverage][codecov-image]][codecov-url]
[![License][license-image]][license-url]
[![Downloads][downloads-image]][downloads-url]
Expand Down Expand Up @@ -241,8 +241,8 @@ This project is licensed under the MIT license. See the [LICENSE](LICENSE.txt) f

[npm-image]: https://img.shields.io/npm/v/auth0-js.svg?style=flat-square
[npm-url]: https://npmjs.org/package/auth0-js
[travis-image]: http://img.shields.io/travis/auth0/auth0.js.svg?branch=v8&style=flat-square
[travis-url]: https://travis-ci.org/auth0/auth0.js
[circleci-image]: http://img.shields.io/circleci/project/github/auth0/auth0.js.svg?branch=master&style=flat-square
[circleci-url]: https://circleci.com/gh/auth0/auth0.js
[codecov-image]: https://img.shields.io/codecov/c/github/auth0/auth0.js/v8.svg?style=flat-square
[codecov-url]: https://codecov.io/github/auth0/auth0.js?branch=v8
[license-image]: http://img.shields.io/npm/l/auth0-js.svg?style=flat-square
Expand Down
23 changes: 23 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
machine:
node:
version: v6.10.0
environment:
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
dependencies:
override:
- yarn
cache_directories:
- ~/.cache/yarn
test:
pre:
- yarn run build
- yarn run lint
override:
- yarn run ci:test:
environment:
MOCHA_FILE: $CIRCLE_TEST_REPORTS/junit/test-results.xml
post:
- yarn run ci:coverage
general:
artifacts:
- build
File renamed without changes.
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"build": "gulp build",
"test": "mocha test/**/*.test.js",
"test:integration": "mocha-parallel-tests --max-parallel 2 integration/**/*.test.js",
"test:watch": "mocha --watch -R min test/**/*.test.js",
"test:coverage": "istanbul cover _mocha -R test/**/*",
"test:ci": "istanbul cover _mocha --report lcovonly -R test/**/* && codecov",
"test:watch": "mocha --watch -R min test/**/*.test.js",
"ci:test": "istanbul cover _mocha --report lcovonly -R test/**/* -- -R mocha-multi --reporter-options spec=-,mocha-junit-reporter=-",
"ci:coverage": "codecov",
"lint": "eslint ./src",
"publish:cdn": "ccu",
"release": "scripts/release.sh"
Expand Down Expand Up @@ -49,6 +49,8 @@
"istanbul": "^0.4.5",
"jsdoc-to-markdown": "^2.0.1",
"mocha": "^3.2.0",
"mocha-junit-reporter": "^1.13.0",
"mocha-multi": "^0.10.0",
"mocha-parallel-tests": "^1.2.5",
"selenium-webdriver": "^3.0.1",
"semver": "^5.3.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ npm_release()
npm run lint

# Test
npm run test:ci
npm run ci:test

# Clean
rm -f build/*.js
Expand Down
4 changes: 2 additions & 2 deletions src/helper/popup-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ PopupHandler.prototype.load = function (url, relayUrl, options, cb) {
url: url,
relay_url: relayUrl,
window_features: qs.stringify(popupOptions, {
delimiter: ',',
encode: false
delimiter: ',',
encode: false
}),
popup: this._current_popup
}).with(options);
Expand Down
6 changes: 3 additions & 3 deletions test/helper/storage-handler.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ var CookieStorage = require('../../src/helper/storage/cookie');
var DummyStorage = require('../../src/helper/storage/dummy');

function MockLocalStorage() {}
MockLocalStorage.prototype.getItem = function() { throw new Error('fail'); }
MockLocalStorage.prototype.removeItem = function() { throw new Error('fail'); }
MockLocalStorage.prototype.setItem = function() { throw new Error('fail'); }
MockLocalStorage.prototype.getItem = function() { throw new Error('fail'); };
MockLocalStorage.prototype.removeItem = function() { throw new Error('fail'); };
MockLocalStorage.prototype.setItem = function() { throw new Error('fail'); };

describe('helpers storage handler', function () {
it('should use localStorage by default', function () {
Expand Down
Loading

0 comments on commit d93b7b1

Please sign in to comment.