Added Fix for Protractor Test

This commit is contained in:
Jesse
2015-08-07 11:28:18 -07:00
committed by Victor Woeltjen
parent 7ded288154
commit ef7c1bd025
11 changed files with 405 additions and 43 deletions

View File

@ -24,33 +24,33 @@
// conf.js
exports.config = {
allScriptsTimeout: 500000,
defaultTimeoutInterval: 60000,
jasmineNodeOpts: {defaultTimeoutInterval: 360000},
seleniumAddress: 'http://localhost:4444/wd/hub',
//specs: ['StressTest.js'],
//specs: ['StressTestCarrot.js'],
specs: [
//'create/CreateActivity.js',
//'delete/DeleteActivity.js',
//'create/CreateActivityMode.js',
//'delete/DeleteActivityMode.js',
//'create/CreateActivityMode.js',
//'create/CreateClock.js',
//'delete/DeleteClock.js',
'create/CreateActivity.js',
'delete/DeleteActivity.js',
'create/CreateActivityMode.js',
'delete/DeleteActivityMode.js',
'create/CreateActivityMode.js',
'create/CreateClock.js',
'delete/DeleteClock.js',
'create/CreateDisplay.js',
//'delete/DeleteDisplay.js',
'delete/DeleteDisplay.js',
'create/CreateFolder.js',
//'delete/DeleteFolder.js',
'delete/DeleteFolder.js',
'create/CreateTelemetry.js',
//'delete/DeleteTelemetry.js',
//'create/CreateTimeline.js',
//'delete/DeleteTimeline.js',
//'create/CreateTimer.js',
//'delete/DeleteTimer.js',
'delete/DeleteTelemetry.js',
'create/CreateTimeline.js',
'delete/DeleteTimeline.js',
'create/CreateTimer.js',
'delete/DeleteTimer.js',
'create/CreateWebPage.js',
//'delete/DeleteWebPage.js',
'delete/DeleteWebPage.js',
'UI/Fullscreen.js',
'create/CreateButton.js',
//"UI/DragDrop.js",
//"UI/NewWindow.js",
"UI/DragDrop.js",
"UI/NewWindow.js",
'UI/InfoBubble.js'
],
capabilities: {