From a03046400ce89feebe68146b8a830990682da9cd Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 30 Jul 2015 11:15:03 -0700 Subject: [PATCH] [Tests] Separate out page launcher WTD-1287 --- protractor/UI/DragDrop.js | 30 ++++++------- protractor/UI/Fullscreen.js | 16 +++---- protractor/UI/InfoBubble.js | 9 ++-- protractor/UI/NewWindow.js | 33 +++++++------- protractor/UI/RightClick.js | 17 +++----- protractor/common/Launch.js | 8 ++++ protractor/conf.js | 58 ++++++++++++++++++------- protractor/create/CreateActivity.js | 16 +++---- protractor/create/CreateActivityMode.js | 18 +++----- protractor/create/CreateButton.js | 18 +++----- protractor/create/CreateClock.js | 38 ++++++++-------- protractor/create/CreateDisplay.js | 18 +++----- protractor/create/CreateFolder.js | 20 ++++----- protractor/create/CreateSineWave.js | 16 +++---- protractor/create/CreateTelemetry.js | 19 ++++---- protractor/create/CreateTimeline.js | 20 ++++----- protractor/create/CreateTimer.js | 21 ++++----- protractor/create/CreateWebPage.js | 18 ++++---- protractor/delete/DeleteActivity.js | 10 ++--- protractor/delete/DeleteActivityMode.js | 10 ++--- protractor/delete/DeleteClock.js | 10 ++--- protractor/delete/DeleteDisplay.js | 10 ++--- protractor/delete/DeleteFolder.js | 10 ++--- protractor/delete/DeleteTelemetry.js | 10 ++--- protractor/delete/DeleteTimeline.js | 10 ++--- protractor/delete/DeleteTimer.js | 10 ++--- protractor/delete/DeleteWebPage.js | 10 ++--- 27 files changed, 214 insertions(+), 269 deletions(-) create mode 100644 protractor/common/Launch.js diff --git a/protractor/UI/DragDrop.js b/protractor/UI/DragDrop.js index 80fb12ea03..8841be3984 100644 --- a/protractor/UI/DragDrop.js +++ b/protractor/UI/DragDrop.js @@ -11,25 +11,21 @@ describe('Test Drag and Drop', function() { var rightMenuClass = new rightMenu(); var dragDrop = new Drag(); - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(4000); // 4 seconds - }); - + beforeEach(require('../common/Launch')); + it('should create a folder', function(){ var ITEM_NAME = "Folder"; var ITEM_TYPE = "folder"; var ITEM_MENU_GLYPH = 'F\nFolder'; var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - + browser.wait(function() { - return createClass.createButton().click(); + return createClass.createButton().click(); }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE); expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -46,14 +42,14 @@ describe('Test Drag and Drop', function() { var ITEM_TYPE = "timer"; var ITEM_MENU_GLYPH = 'õ\nTimer'; var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - + browser.wait(function() { - return createClass.createButton().click(); + return createClass.createButton().click(); }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -65,12 +61,12 @@ describe('Test Drag and Drop', function() { expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); it('should drag timer into folder', function(){ var ITEM_SIDE_SELECT = ">\nF\nFolder" var name = "õ\nTimer"; - + rightMenuClass.select(ITEM_SIDE_SELECT, true).click(); browser.sleep(2000); var object = element.all(by.css('.ng-isolate-scope.ng-pristine.ng-valid')).filter(function (ele){ @@ -80,10 +76,10 @@ describe('Test Drag and Drop', function() { }); var clock = object.get(1); var panel = element(by.css('.items-holder.grid.abs.ng-scope')); - + //drag expect(panel.isPresent()).toBe(true) - expect(clock.isPresent()).toBe(true) + expect(clock.isPresent()).toBe(true) browser.executeScript(dragDrop.DragDrop,clock.getWebElement(),panel.getWebElement()) browser.sleep(3000); //check @@ -115,4 +111,4 @@ describe('Test Drag and Drop', function() { rightMenuClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); -}); \ No newline at end of file +}); diff --git a/protractor/UI/Fullscreen.js b/protractor/UI/Fullscreen.js index 91c0fea36e..ddda3136ce 100644 --- a/protractor/UI/Fullscreen.js +++ b/protractor/UI/Fullscreen.js @@ -3,19 +3,19 @@ var fullScreenFile = require("../common/Buttons"); describe('Test Fullscreen', function() { var fullScreenClass = new fullScreenFile(); - + + beforeEach(require('../common/Launch')); + beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(1000); browser.wait(function(){ return element(by.css('[title="Enter full screen mode"]')).isPresent(); }, 7000); - browser.sleep(1000) + browser.sleep(1000); }); + it('should find fullscreen button', function(){ expect(element(by.css('[title="Enter full screen mode"]')).isDisplayed()).toBeTruthy(); - + });it('should enter fullscreen when fullscreen button is pressed', function(){ function getFullScreen(){ return document.webkitIsFullScreen; @@ -24,6 +24,6 @@ describe('Test Fullscreen', function() { expect(fullscreen).toBeFalsy(); fullScreenClass.fullScreen() fullscreen = browser.executeScript(getFullScreen) - expect(fullscreen).toBeTruthy(); + expect(fullscreen).toBeTruthy(); }); -}); \ No newline at end of file +}); diff --git a/protractor/UI/InfoBubble.js b/protractor/UI/InfoBubble.js index 0b32ec46f7..9b69a14072 100644 --- a/protractor/UI/InfoBubble.js +++ b/protractor/UI/InfoBubble.js @@ -11,15 +11,12 @@ describe('Test Info Bubble', function() { var rightMenuClass = new rightMenu(); var dragDrop = new Drag(); - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(4000); // 4 seconds - }); + beforeEach(require('../common/Launch')); + it('should detect info bubble', function(){ var myitem = (element.all(by.repeater('child in composition'))).get(0); browser.actions().mouseMove(myitem).perform(); browser.sleep(4000); expect(element(by.css('.t-infobubble.s-infobubble.l-infobubble-wrapper')).isDisplayed()).toBe(true); }); -}); \ No newline at end of file +}); diff --git a/protractor/UI/NewWindow.js b/protractor/UI/NewWindow.js index 56831dc045..06cbe811cb 100644 --- a/protractor/UI/NewWindow.js +++ b/protractor/UI/NewWindow.js @@ -8,30 +8,27 @@ describe('Test New Window', function() { var createClass = new createClassFile(); var editItemClass = new itemEdit(); var rightMenuClass = new rightMenu(); - + var ITEM_NAME = "Folder"; var ITEM_TYPE = "folder"; var ITEM_MENU_GLYPH = 'F\nFolder'; var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); + it('should create an object and open it in new window', function(){ function replaceString(string){ //used to remove timestamp on the output so files can be compared return string.replace(new RegExp("([0-1]?[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]","g"),"z"); } browser.wait(function() { - return createClass.createButton().click(); + return createClass.createButton().click(); }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE); expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -42,20 +39,20 @@ describe('Test New Window', function() { //open file in new page var before = browser.driver.getPageSource(); before = browser.executeScript(replaceString, before) - - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); + + var item = editItemClass.SelectItem(ITEM_GRID_SELECT); expect(item.count()).toBe(1); - browser.sleep(1000); + browser.sleep(1000); fullScreenClass.newWidnow().click(); - + var after = browser.driver.getPageSource(); after = browser.executeScript(replaceString, after) - + browser.getAllWindowHandles().then(function (handles) { browser.driver.switchTo().window(handles[1]); - browser.sleep(1000); + browser.sleep(1000); expect(before).toEqual(after); - browser.sleep(1000); + browser.sleep(1000); browser.driver.close(); browser.driver.switchTo().window(handles[0]); }); @@ -68,5 +65,5 @@ describe('Test New Window', function() { rightMenuClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/UI/RightClick.js b/protractor/UI/RightClick.js index aa892286e2..d23f921e3b 100644 --- a/protractor/UI/RightClick.js +++ b/protractor/UI/RightClick.js @@ -6,18 +6,15 @@ describe('Right Click Interations', function() { var ITEM_NAME = "Folder"; var ITEM_TYPE = "folder"; var ITEM_MENU_GLYPH = 'F\nFolder'; - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); + it('should delete the specified object', function(){ - createClass.createButton().click(); + createClass.createButton().click(); var folder = createClass.selectNewItem(ITEM_TYPE); expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() browser.sleep(1000); browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -26,5 +23,5 @@ describe('Right Click Interations', function() { clickClass.delete(ITEM_NAME); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/common/Launch.js b/protractor/common/Launch.js new file mode 100644 index 0000000000..1f86346fc0 --- /dev/null +++ b/protractor/common/Launch.js @@ -0,0 +1,8 @@ +/*global module,browser*/ + +module.exports = function launch() { + 'use strict'; + browser.ignoreSynchronization = true; + browser.get('https://localhost:1984/'); + browser.sleep(2000); // 20 seconds +}; diff --git a/protractor/conf.js b/protractor/conf.js index 9d2693c2cf..46ff2603ee 100644 --- a/protractor/conf.js +++ b/protractor/conf.js @@ -1,20 +1,46 @@ +/*global exports,process*/ + // conf.js exports.config = { - allScriptsTimeout: 500000, - defaultTimeoutInterval: 60000, - seleniumAddress: 'http://localhost:4444/wd/hub', - //specs: ['StressTest.js'], - specs: [ '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', 'create/CreateFolder.js', 'delete/DeleteFolder.js', - 'create/CreateTelemetry.js', 'delete/DeleteTelemetry.js', 'create/CreateTimeline.js', 'delete/DeleteTimeline.js', - 'create/CreateTimer.js', 'delete/DeleteTimer.js', 'create/CreateWebPage.js', 'delete/DeleteWebPage.js', - 'UI/Fullscreen.js', 'create/CreateButton.js', "UI/DragDrop.js", "UI/NewWindow.js", 'UI/InfoBubble.js' + allScriptsTimeout: 500000, + defaultTimeoutInterval: 60000, + seleniumAddress: 'http://localhost:4444/wd/hub', + //specs: ['StressTest.js'], + specs: [ + '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', + 'create/CreateFolder.js', + 'delete/DeleteFolder.js', + 'create/CreateTelemetry.js', + 'delete/DeleteTelemetry.js', + 'create/CreateTimeline.js', + 'delete/DeleteTimeline.js', + 'create/CreateTimer.js', + 'delete/DeleteTimer.js', + 'create/CreateWebPage.js', + 'delete/DeleteWebPage.js', + 'UI/Fullscreen.js', + 'create/CreateButton.js', + "UI/DragDrop.js", + "UI/NewWindow.js", + 'UI/InfoBubble.js' ], - capabilities: { - 'browserName': 'chrome', // or 'safari' - 'chromeOptions': { - // 'args' : ['--remote-debugging-port=9222'] - } - }, + capabilities: { + 'browserName': 'chrome', // or 'safari' + 'chromeOptions': {} + } +}; + +// Allow specifying binary location as an environment variable, +// for cases where Chrome is not installed in a usual location. +if (process.env.PROTRACTOR_CHROME_BINARY) { + exports.config.capabilities.chromeOptions.binary = + process.env.PROTRACTOR_CHROME_BINARY; } diff --git a/protractor/create/CreateActivity.js b/protractor/create/CreateActivity.js index 2045d0df4c..4303e018da 100644 --- a/protractor/create/CreateActivity.js +++ b/protractor/create/CreateActivity.js @@ -8,21 +8,17 @@ describe('Create Activity', function() { var ITEM_TYPE = "activity"; var ITEM_MENU_GLYPH = 'a\nActivity'; var ITEM_GRID_SELECT = 'P\na\nActivity\n0 Items'; - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 2 seconds - }); + beforeEach(require('../common/Launch')); it('should Create new Activity', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -34,7 +30,7 @@ describe('Create Activity', function() { var item = editItemClass.SelectItem(ITEM_GRID_SELECT); expect(item.count()).toBe(1); }); - + }); - + }); diff --git a/protractor/create/CreateActivityMode.js b/protractor/create/CreateActivityMode.js index f9354ec492..b042547322 100644 --- a/protractor/create/CreateActivityMode.js +++ b/protractor/create/CreateActivityMode.js @@ -8,34 +8,30 @@ describe('Create Web Page', function() { var ITEM_TYPE = "activity-mode"; var ITEM_MENU_GLYPH = 'A\nActivity Mode'; var ITEM_GRID_SELECT = 'P\nA\nActivity Mode'; - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should Create new Activity Mode', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); }) createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); browser.sleep(1000); - + }).then(function (){ var item = editItemClass.SelectItem(ITEM_GRID_SELECT); expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); - + }); diff --git a/protractor/create/CreateButton.js b/protractor/create/CreateButton.js index a64266d88a..2d394cf80c 100644 --- a/protractor/create/CreateButton.js +++ b/protractor/create/CreateButton.js @@ -1,23 +1,19 @@ //TODO Add filter for duplications/ describe('Create Button', function() { - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 10 seconds - }); + beforeEach(require('../common/Launch')); //it('should hava title "My Items"', function(){ // expect(browser.getTitle()).toEqual('My Items'); //}); it('should find create menu to be invisible', function(){ - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeFalsy(); + expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeFalsy(); }); it('should find create menu only visable after the create button clicked', function(){ - element(by.css('[ng-click="createController.toggle()"]')).click(); - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); + element(by.css('[ng-click="createController.toggle()"]')).click(); + expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); }); it('should find create menu only visable after the create button clicked', function(){ - element(by.css('[ng-click="createController.toggle()"]')).click(); - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); + element(by.css('[ng-click="createController.toggle()"]')).click(); + expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); }); - + }); diff --git a/protractor/create/CreateClock.js b/protractor/create/CreateClock.js index 7a42b45527..ad74119b94 100644 --- a/protractor/create/CreateClock.js +++ b/protractor/create/CreateClock.js @@ -5,26 +5,22 @@ describe('Create Clock', function() { var createClass = new itemCreate(); var editItemClass = new itemEdit(); var rightClickClass = new rightClick(); - + var ITEM_NAME = "Clock"; var ITEM_TYPE = "clock"; var ITEM_MENU_GLYPH = 'C\nClock'; var ITEM_GRID_SELECT = 'P\nC\nClock'; - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should Create new Clock', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -36,10 +32,10 @@ describe('Create Clock', function() { expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); it('should check clock', function () { - + function getTime() { function addZero(time){ if(time < 10){ @@ -48,27 +44,27 @@ describe('Create Clock', function() { return time; } var currentdate = new Date(); - - + + var month = currentdate.getMonth() + 1; month = addZero(month); - + var day = currentdate.getDate(); day = addZero(day); - + var hour = currentdate.getHours() - 5; hour = addZero(hour); - + var second = currentdate.getSeconds(); second = addZero(second); - + var minute = currentdate.getMinutes(); minute = addZero(minute); - + return ("UTC " + currentdate.getFullYear() + "/" + (month) + "/" + day + " " + (hour) + ":" + minute + ":" + second + " PM"); } - + var current,clock; rightClickClass.select(ITEM_MENU_GLYPH, true).click().then(function () { browser.sleep(1000); @@ -76,8 +72,8 @@ describe('Create Clock', function() { }).then(function () { clock = element(by.css('.l-time-display.l-digital.l-clock.s-clock.ng-scope')); clock.getText().then(function (time) { - expect(current).toEqual(time); - }) + expect(current).toEqual(time); + }) }) }); diff --git a/protractor/create/CreateDisplay.js b/protractor/create/CreateDisplay.js index 71fe5091b7..aaa3470b57 100644 --- a/protractor/create/CreateDisplay.js +++ b/protractor/create/CreateDisplay.js @@ -8,22 +8,18 @@ describe('Create Display', function() { var ITEM_TYPE = "display"; var ITEM_MENU_GLYPH = 'L\nDisplay Layout'; var ITEM_GRID_SELECT = 'P\nL\nDisplay\n0 Items'; - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); it('should Create new Display', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -35,7 +31,7 @@ describe('Create Display', function() { expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); - + }); diff --git a/protractor/create/CreateFolder.js b/protractor/create/CreateFolder.js index 26b6bfb8d1..f33a8e5bb7 100644 --- a/protractor/create/CreateFolder.js +++ b/protractor/create/CreateFolder.js @@ -9,22 +9,18 @@ describe('Create Folder', function() { var ITEM_TYPE = "folder"; var ITEM_MENU_GLYPH = 'F\nFolder'; var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); it('should Create new Folder', function(){ - + browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE); expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -36,7 +32,7 @@ describe('Create Folder', function() { expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); - + }); diff --git a/protractor/create/CreateSineWave.js b/protractor/create/CreateSineWave.js index ed1d454e27..112f2159e7 100644 --- a/protractor/create/CreateSineWave.js +++ b/protractor/create/CreateSineWave.js @@ -5,21 +5,17 @@ describe('Create Sine Wave Generator', function() { var ITEM_NAME = "Sine Wave G"; var ITEM_TYPE = "sinewave"; var ITEM_MENU_GLYPH = 'T\nSine Wave Generator' - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should Create new Sin Wave Generator' , function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -36,7 +32,7 @@ describe('Create Sine Wave Generator', function() { expect(checkfolder.getText()).toEqual([ '', 'Sine Wave G' ]); }); - + }); - + }); diff --git a/protractor/create/CreateTelemetry.js b/protractor/create/CreateTelemetry.js index fbf3da1362..b36c27989c 100644 --- a/protractor/create/CreateTelemetry.js +++ b/protractor/create/CreateTelemetry.js @@ -8,22 +8,19 @@ describe('Create Telemetry', function() { var ITEM_TYPE = "telemetry"; var ITEM_MENU_GLYPH = 't\nTelemetry Panel' var ITEM_GRID_SELECT = 'P\nt\nTelemetry\n0 Items'; - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); + it('should Create new Telemetry', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -35,7 +32,7 @@ describe('Create Telemetry', function() { expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); - + }); diff --git a/protractor/create/CreateTimeline.js b/protractor/create/CreateTimeline.js index 69fc31b006..8f815c9d49 100644 --- a/protractor/create/CreateTimeline.js +++ b/protractor/create/CreateTimeline.js @@ -8,20 +8,16 @@ describe('Create Timeline', function() { var ITEM_TYPE = "timeline"; var ITEM_MENU_GLYPH = 'S\nTimeline'; var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should Create Timeline', function(){ //button.click() browser.wait(function() { - createItemClass.createButton().click(); - return true; + createItemClass.createButton().click(); + return true; }).then(function (){ var folder = createItemClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -29,7 +25,7 @@ describe('Create Timeline', function() { createItemClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); browser.sleep(1000); }).then(function (){ - var fo= element.all(by.css('.item.grid-item.ng-scope')).filter(function (arg){ + var fo= element.all(by.css('.item.grid-item.ng-scope')).filter(function (arg){ return arg.getText().then(function (text) { expect(text).toEqual("fh"); return text == ITEM_GRID_SELECT; @@ -37,13 +33,13 @@ describe('Create Timeline', function() { }); var item = editItemClass.SelectItem(ITEM_GRID_SELECT); expect(item.count()).toBe(1); - + }); }); it('should Create Timeline Activity', function(){ var item = editItemClass.SelectItem(ITEM_GRID_SELECT); expect(item.count()).toBe(1); - item.click(); + item.click(); browser.sleep(1000); expect(browser.getTitle()).toEqual(ITEM_NAME); browser.sleep(1000); @@ -60,5 +56,5 @@ describe('Create Timeline', function() { //save.click(); browser.sleep(5000); }); - + }); diff --git a/protractor/create/CreateTimer.js b/protractor/create/CreateTimer.js index bd49451106..2c5b167ee0 100644 --- a/protractor/create/CreateTimer.js +++ b/protractor/create/CreateTimer.js @@ -6,27 +6,24 @@ describe('Create Timer', function() { var createClass = new itemCreate(); var editItemClass = new itemEdit(); var rightMenu = new rightClick(); - + var ITEM_NAME = "Timer"; var ITEM_TYPE = "timer"; var ITEM_MENU_GLYPH = 'õ\nTimer'; var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); + it('should Create Timer', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem(ITEM_TYPE) expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -37,7 +34,7 @@ describe('Create Timer', function() { var item = editItemClass.SelectItem(ITEM_GRID_SELECT); expect(item.count()).toBe(1); browser.sleep(1000); - }); + }); }); it('should test Timer', function(){ browser.sleep(2000) @@ -48,5 +45,5 @@ describe('Create Timer', function() { expect(time).toEqual("0D 00:00:01") }) }); - + }); diff --git a/protractor/create/CreateWebPage.js b/protractor/create/CreateWebPage.js index a54a32cf7e..d71acbbea1 100644 --- a/protractor/create/CreateWebPage.js +++ b/protractor/create/CreateWebPage.js @@ -8,21 +8,19 @@ describe('Create Web Page', function() { var ITEM_TYPE = "webpage"; var ITEM_MENU_GLYPH = 'ê\nWeb Page'; var ITEM_GRID_SELECT = 'P\nê\nWebpage'; - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + + beforeEach(require('../common/Launch')); + it('should Create new Web Page', function(){ //button.click() browser.wait(function() { - createClass.createButton().click(); - return true; + createClass.createButton().click(); + return true; }).then(function (){ var folder = createClass.selectNewItem('webpage') expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); browser.sleep(1000); - folder.click() + folder.click() }).then(function() { browser.wait(function () { return element.all(by.model('ngModel[field]')).isDisplayed(); @@ -34,7 +32,7 @@ describe('Create Web Page', function() { expect(item.count()).toBe(1); browser.sleep(1000); }); - + }); - + }); diff --git a/protractor/delete/DeleteActivity.js b/protractor/delete/DeleteActivity.js index c33f533ea1..6015b9462f 100644 --- a/protractor/delete/DeleteActivity.js +++ b/protractor/delete/DeleteActivity.js @@ -8,14 +8,10 @@ describe('Delete Activity', function() { var ITEM_MENU_GLYPH = 'a\nActivity'; //var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; var ITEM_SIDE_SELECT = ">\na\nActivity" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Activity', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteActivityMode.js b/protractor/delete/DeleteActivityMode.js index 33212c2283..b04376726b 100644 --- a/protractor/delete/DeleteActivityMode.js +++ b/protractor/delete/DeleteActivityMode.js @@ -8,14 +8,10 @@ describe('Delete Activity Mode', function() { var ITEM_MENU_GLYPH = 'A\nActivity Mode'; var ITEM_GRID_SELECT = 'P\nA\nActivity Mode'; var ITEM_SIDE_SELECT = "A\nActivity Mode" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Activty Mode', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteClock.js b/protractor/delete/DeleteClock.js index b7d5fb5d51..3113076567 100644 --- a/protractor/delete/DeleteClock.js +++ b/protractor/delete/DeleteClock.js @@ -8,14 +8,10 @@ describe('Delete Clock', function() { var ITEM_MENU_GLYPH = 'C\nClock'; var ITEM_GRID_SELECT = 'P\nC\nClock'; var ITEM_SIDE_SELECT = "C\nClock"; - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Clock', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteDisplay.js b/protractor/delete/DeleteDisplay.js index 101392638c..0e0fb85110 100644 --- a/protractor/delete/DeleteDisplay.js +++ b/protractor/delete/DeleteDisplay.js @@ -8,14 +8,10 @@ describe('Delete Display', function() { var ITEM_MENU_GLYPH = 'L\nDisplay Layout'; var ITEM_GRID_SELECT = 'P\nL\nDisplay Layout'; var ITEM_SIDE_SELECT = ">\nL\nDisplay" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Dispay', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteFolder.js b/protractor/delete/DeleteFolder.js index 4a1180e3ab..b25699b911 100644 --- a/protractor/delete/DeleteFolder.js +++ b/protractor/delete/DeleteFolder.js @@ -8,14 +8,10 @@ describe('Delete Folder', function() { var ITEM_MENU_GLYPH = 'F\nFolder'; var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; var ITEM_SIDE_SELECT = ">\nF\nFolder" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the folder', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteTelemetry.js b/protractor/delete/DeleteTelemetry.js index 26a0bfe0f1..844680c75f 100644 --- a/protractor/delete/DeleteTelemetry.js +++ b/protractor/delete/DeleteTelemetry.js @@ -8,14 +8,10 @@ describe('Delete Telemetry', function() { var ITEM_MENU_GLYPH = 't\nTelemetry Panel' var ITEM_GRID_SELECT = 'P\nt\nTelemetry\n0 Items'; var ITEM_SIDE_SELECT = ">\nt\nTelemetry" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Telemetry', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteTimeline.js b/protractor/delete/DeleteTimeline.js index c693911ec5..bf9ad30c28 100644 --- a/protractor/delete/DeleteTimeline.js +++ b/protractor/delete/DeleteTimeline.js @@ -8,14 +8,10 @@ describe('Delete Timeline', function() { var ITEM_MENU_GLYPH = 'S\nTimeline'; var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; var ITEM_SIDE_SELECT = ">\nS\nTimeline" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the specified object', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteTimer.js b/protractor/delete/DeleteTimer.js index 4c5645760d..66f73bfe0e 100644 --- a/protractor/delete/DeleteTimer.js +++ b/protractor/delete/DeleteTimer.js @@ -8,14 +8,10 @@ describe('Delete Timer', function() { var ITEM_MENU_GLYPH = 'õ\nTimer'; var ITEM_GRID_SELECT = 'P\nõ\nTimer'; var ITEM_SIDE_SELECT = "õ\nTimer" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Timer', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +}); diff --git a/protractor/delete/DeleteWebPage.js b/protractor/delete/DeleteWebPage.js index aa40e86453..d4b696af22 100644 --- a/protractor/delete/DeleteWebPage.js +++ b/protractor/delete/DeleteWebPage.js @@ -7,14 +7,10 @@ describe('Delete Webpage', function() { var ITEM_TYPE = "webpage"; var ITEM_MENU_GLYPH = 'ê\nWeb Page'; var ITEM_SIDE_SELECT = "ê\nWebpage" - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); + beforeEach(require('../common/Launch')); it('should delete the Webpage', function(){ clickClass.delete(ITEM_SIDE_SELECT); browser.sleep(1000); }); - -}); \ No newline at end of file + +});