diff --git a/templates/app/mocha.conf.js b/templates/app/mocha.conf.js index 76f56625e..e0b771496 100644 --- a/templates/app/mocha.conf.js +++ b/templates/app/mocha.conf.js @@ -3,7 +3,7 @@ // Register the Babel require hook require('babel-core/register'); -var chai = require('chai'); +const chai = require('chai'); // Load Chai assertions global.expect = chai.expect; @@ -16,4 +16,4 @@ global.sinon = require('sinon'); // Initialize Chai plugins chai.use(require('sinon-chai')); chai.use(require('chai-as-promised')); -chai.use(require('chai-things')) +chai.use(require('chai-things')); diff --git a/templates/app/protractor.conf.js b/templates/app/protractor.conf.js index 021a54eaf..ca911b15d 100644 --- a/templates/app/protractor.conf.js +++ b/templates/app/protractor.conf.js @@ -13,10 +13,7 @@ var config = { // with relative paths will be prepended with this. baseUrl: 'http://localhost:' + (process.env.PORT || '<%= Number(devPort) + 1 %>'), - // Credientials for Saucelabs - sauceUser: process.env.SAUCE_USERNAME, - - sauceKey: process.env.SAUCE_ACCESS_KEY, + directConnect: true, // list of files / patterns to load in the browser specs: [ @@ -35,8 +32,9 @@ var config = { capabilities: { 'browserName': 'chrome', 'name': 'Fullstack E2E', - 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, - 'build': process.env.TRAVIS_BUILD_NUMBER + 'chromeOptions': { + 'args': ['show-fps-counter=true'] + }, }, // ----- The test framework -----