diff --git a/test/integration/helpers/env.js b/test/integration/helpers/env.js index 23e374ab1f..669cc7d650 100644 --- a/test/integration/helpers/env.js +++ b/test/integration/helpers/env.js @@ -5,8 +5,8 @@ // from whatever namespace is added to the whitelist since there ins't a way // to give access to 'openshift' for installing templates and things initially. // - the browse catalog flow can be run w/o needing this, however -exports.addNamespaceToCreateWhitelist = function(namespace) { - return browser.executeScript(function(namespace) { +exports.addNamespaceToCreateWhitelist = (namespace) => { + return browser.executeScript((namespace) => { window.OPENSHIFT_CONSTANTS.CREATE_FROM_URL_WHITELIST.push(namespace); }, namespace); }; diff --git a/test/integration/helpers/inputs.js b/test/integration/helpers/inputs.js index eb8c0c218a..0477b764ac 100644 --- a/test/integration/helpers/inputs.js +++ b/test/integration/helpers/inputs.js @@ -14,7 +14,7 @@ const getInputValues = (inputs) => { inputs.each((input, i) => { input .getAttribute('value') - .then(function(val) { + .then((val) => { values.push(val); if((i) === count) { allValues.fulfill(values); diff --git a/test/integration/helpers/logger.js b/test/integration/helpers/logger.js index 30a027fa60..3b74bc0e58 100644 --- a/test/integration/helpers/logger.js +++ b/test/integration/helpers/logger.js @@ -14,9 +14,9 @@ // logger.log('Foo'); // in Promise queue // element(by.buttonText(buttonText)).click(); // in Promise queue // logger.log('Bar'); // in Promise queue yay! happens after above. -['log', 'info', 'warn', 'error'].forEach(function(logType) { +['log', 'info', 'warn', 'error'].forEach((logType) => { exports[logType] = function() { - var args = Array.prototype.slice.call(arguments); + let args = Array.prototype.slice.call(arguments); browser.sleep(0).then(function() { console[logType].apply(console, args); }); @@ -26,8 +26,8 @@ // use to check the actual browser logs to see if there is a useful error // can also browser.pause(), browser.sleep(longTime), browser.debugger() -exports.getBrowserLogs = function() { - return browser.manage().logs().get('browser').then(function(browserLog) { +exports.getBrowserLogs = () => { + return browser.manage().logs().get('browser').then((browserLog) => { exports.log('log: ' + require('util').inspect(browserLog)); }); }; diff --git a/test/integration/helpers/matchers.js b/test/integration/helpers/matchers.js index 30db5f8721..175cc93e85 100644 --- a/test/integration/helpers/matchers.js +++ b/test/integration/helpers/matchers.js @@ -1,15 +1,15 @@ 'use strict'; -exports.expectAlert = function(msg) { -expect(element(by.css('.alert')).getText()).toEqual('error\n' + msg); +exports.expectAlert = (msg) => { + expect(element(by.css('.alert')).getText()).toEqual('error\n' + msg); }; -exports.expectHeading = function(text, level) { +exports.expectHeading = (text, level) => { expect(element(by.css(level || 'h1')).getText()).toEqual(text); }; -exports.expectPartialHeading = function(partialText, level, caseSensitive) { - element(by.css(level || 'h1')).getText().then(function(text) { +exports.expectPartialHeading = (partialText, level, caseSensitive) => { + element(by.css(level || 'h1')).getText().then((text) => { text = caseSensitive ? text : text.toLowerCase(); expect(text).toContain(partialText); }); diff --git a/test/integration/helpers/project.js b/test/integration/helpers/project.js index 2c9b5d53e5..0a46e4b169 100644 --- a/test/integration/helpers/project.js +++ b/test/integration/helpers/project.js @@ -1,15 +1,15 @@ 'use strict'; -var h = require('../helpers.js'); +const h = require('../helpers.js'); // TODO: factor this out into a proper page object -exports.visitCreatePage = function() { +exports.visitCreatePage = () => { h.goToPage('create-project'); }; -exports.projectDetails = function() { - var timestamp = (new Date()).getTime(); - var project = { +exports.projectDetails = () => { + let timestamp = (new Date()).getTime(); + let project = { name: 'console-test-project-' + timestamp, displayName: 'Console integration test Project ' + timestamp, description: 'Created by integration tests' @@ -17,19 +17,19 @@ exports.projectDetails = function() { return project; }; -exports.createProject = function(project, uri) { - for (var key in project) { +exports.createProject = (project, uri) => { + for (let key in project) { h.setInputValue(key, project[key]); } h.clickAndGo('Create', uri); }; -exports.deleteProject = function(project) { +exports.deleteProject = (project) => { h.goToPage('/'); - var projectTile = element(by.cssContainingText(".project-info", project['name'])); + let projectTile = element(by.cssContainingText(".project-info", project['name'])); projectTile.element(by.css('.fa-trash-o')).click(); h.setInputValue('confirmName', project.name); - var deleteButton = element(by.cssContainingText(".modal-dialog .btn", "Delete")); + let deleteButton = element(by.cssContainingText(".modal-dialog .btn", "Delete")); browser.wait(protractor.ExpectedConditions.elementToBeClickable(deleteButton), 2000); deleteButton.click(); h.waitForPresence(".alert-success", "marked for deletion"); @@ -39,13 +39,13 @@ exports.deleteProject = function(project) { // This function will click the 'delete' on every project that appears on the project list page. // Be careful about using this function if your test gives the e2e-user access // to internal projects such as openshift, or openshift-infra -exports.deleteAllProjects = function() { +exports.deleteAllProjects = () => { h.goToPage('/'); - var projectTiles = element.all(by.css(".project-info")); - var allDeleted = protractor.promise.defer(); - var numDeleted = 0; - var count; - projectTiles.count().then(function(num) { + let projectTiles = element.all(by.css(".project-info")); + let allDeleted = protractor.promise.defer(); + let numDeleted = 0; + let count; + projectTiles.count().then((num) => { count = num; // safely fulfill if there happen to be no projects. if(count === 0) { @@ -53,14 +53,14 @@ exports.deleteAllProjects = function() { } }); - projectTiles.each(function(elem) { - var projectTitle = elem.element(by.css('.tile-target span')).getText(); + projectTiles.each((elem) => { + let projectTitle = elem.element(by.css('.tile-target span')).getText(); // click trash first elem.element(by.css('.fa-trash-o')).click(); h.setInputValue('confirmName', projectTitle); // then click delete - var modal = element(by.css('.modal-dialog')); - var deleteButton = modal.element(by.cssContainingText(".modal-dialog .btn", "Delete")); + let modal = element(by.css('.modal-dialog')); + let deleteButton = modal.element(by.cssContainingText(".modal-dialog .btn", "Delete")); browser.wait(protractor.ExpectedConditions.elementToBeClickable(deleteButton), 2000); deleteButton.click(); h.waitForElem(element(by.cssContainingText(".alert-success", "marked for deletion"))); diff --git a/test/integration/helpers/screenshot.js b/test/integration/helpers/screenshot.js index 703cb70972..b534c9e1d8 100644 --- a/test/integration/helpers/screenshot.js +++ b/test/integration/helpers/screenshot.js @@ -1,11 +1,11 @@ 'use strict'; -var fs = require('fs'); +const fs = require('fs'); // for debugging only -exports.take = function(savePath) { - return browser.takeScreenshot().then(function(png) { - var stream = fs.createWriteStream(savePath || '/tmp/origin-web-console-e2e-screenshot.png'); +exports.take = (savePath) => { + return browser.takeScreenshot().then((png) => { + let stream = fs.createWriteStream(savePath || '/tmp/origin-web-console-e2e-screenshot.png'); stream.write(new Buffer(png, 'base64')); stream.end(); }); diff --git a/test/integration/helpers/scroll.js b/test/integration/helpers/scroll.js index 77b8ac18ed..ebff1d1e92 100644 --- a/test/integration/helpers/scroll.js +++ b/test/integration/helpers/scroll.js @@ -2,10 +2,10 @@ // example: // scroll.toBottom().then(function() { /* do work */ }); -exports.toBottom = function() { +exports.toBottom = () => { return browser.executeScript('window.scrollTo(0,document.body.scrollHeight);'); }; -exports.toTop = function() { +exports.toTop = () => { return browser.executeScript('window.scrollTo(0,0);'); }; diff --git a/test/integration/helpers/tables.js b/test/integration/helpers/tables.js index 95f9339263..99da442768 100644 --- a/test/integration/helpers/tables.js +++ b/test/integration/helpers/tables.js @@ -1,22 +1,22 @@ 'use strict'; -var h = require('../helpers.js'); +const h = require('../helpers.js'); // takes a protractor element representing a table & returns a list of // names found in the first td of each row -exports.getNames = function(elem) { +exports.getNames = (elem) => { h.waitForElem(elem); - return elem.all(by.tagName('tr')).map(function(tableRow) { + return elem.all(by.tagName('tr')).map((tableRow) => { return tableRow.element(by.css('td[data-title="Name"]')) - .getText().then(function(text) { + .getText().then((text) => { return text; }); }); }; // takes a protractor element representing a table & returns a row count -exports.countRows = function(elem) { - return elem.all(by.css('tr')).count().then(function(numRows) { +exports.countRows = (elem) => { + return elem.all(by.css('tr')).count().then((numRows) => { return numRows; }); }; diff --git a/test/integration/page-objects/createFromURL.js b/test/integration/page-objects/createFromURL.js index 8b0ae26904..a90a7812eb 100644 --- a/test/integration/page-objects/createFromURL.js +++ b/test/integration/page-objects/createFromURL.js @@ -15,7 +15,7 @@ class CreateFromURLPage extends Page { // does not work here, so we have to override. visit(qs) { this.qs = qs; - logger.log('CreateFromURLPage.visit(): url:',this.getUrl(this.qs)); + logger.log('visiting url:', this.getUrl(this.qs)); return browser.get('create' + this.qs); } clickCreateNewProjectTab() {