diff --git a/package.json b/package.json index 8104942d2a..3b71863483 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "lodash": "^2.4.1", "sprintf-js": "1.0.*", "q": "^1.0.1", - "protractor": "1.5.x", + "protractor": "1.6.x", "run-sequence": "^0.3.6", "through2": "^0.6.1", "minimist": "1.1.x" diff --git a/protractor-shared.js b/protractor-shared.js index 1ed5b86788..19cd324af2 100644 --- a/protractor-shared.js +++ b/protractor-shared.js @@ -18,6 +18,8 @@ var config = exports.config = { } }, + framework: 'jasmine2', + jasmineNodeOpts: { showColors: true, defaultTimeoutInterval: 30000 @@ -66,4 +68,4 @@ if (cmdLineBrowsers.length) { }); } else { config.multiCapabilities = [POSSIBLE_CAPS.ChromeDesktop]; -} \ No newline at end of file +}