Skip to content

Commit

Permalink
Updated travis testing
Browse files Browse the repository at this point in the history
  • Loading branch information
itrew authored and jgravois committed Jan 24, 2018
1 parent 94edc2a commit c76ce9b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,18 @@ node_js:
cache:
directories: # Cache dependencies
- node_modules
before_install:
- google-chrome-stable --headless --disable-gpu
before_script:
- npm run bootstrap
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
script:
- npm run test:all
- npm run test:ci
deploy:
provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
on:
branch: master
local-dir: docs/build
target_branch: gh-pages # default
target_branch: gh-pages
before_deploy:
- npm run docs:build
env:
Expand Down
8 changes: 7 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ module.exports = function(config) {

// Concurrency level
// how many browsers should be started simultaneously
concurrency: Infinity
concurrency: Infinity,
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
});
};
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@
"test": "npm run test:node && npm run test:chrome",
"test:chrome:debug": "karma start --auto-watch --no-single-run --browsers=Chrome",
"test:chrome": "karma start --single-run --browsers=Chrome",
"test:chrome:ci": "karma start --single-run --browsers ChromeHeadlessCI karma.conf.js",
"test:firefox": "karma start --single-run --browsers=Firefox",
"test:node": "jasmine --config=jasmine.json",
"test:node:debug": "inspect jasmine --config=jasmine.json",
"test:ci": "npm run test:node && npm run test:chrome:ci && npm run test:firefox",
"test:all": "npm run test:node && npm run test:firefox && npm run test:chrome",
"docs:build": "rimraf docs/build && npm run docs:typedoc && npm run docs:build:acetate && npm run docs:build:sass && npm run docs:build:images",
"docs:build:acetate": "ENV=prod acetate build --config docs/acetate.config.js",
Expand Down
6 changes: 2 additions & 4 deletions rollup.config.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const globals = packageNames.reduce((globals, p) => {
*/
export default {
entry: "./src/index.ts",
dest: `./dist/umd/${name.replace("@esri/", "")}.umd.js`,
dest: `./dist/browser/${name.replace("@esri/", "")}.umd.js`,
format: "umd",
sourceMap: true,
context: "window",
Expand All @@ -58,9 +58,7 @@ export default {
plugins: [
typescript(),
json(),
resolve({
browser: true
}),
resolve(),
commonjs(),
uglify(),
filesize()
Expand Down

0 comments on commit c76ce9b

Please sign in to comment.