Merge pull request #1323 from benjaminapetersen/test-updates

Merged by openshift-bot

Author: OpenShift Bot

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);
 };

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);

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));
   });
 };

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);
   });

test/integration/helpers/project.js

@@ -1,35 +1,35 @@
 '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'
   };
   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,28 +39,28 @@ 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) {
       allDeleted.fulfill();
     }
   });
 
-  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")));

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();
   });

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);');
 };

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;
   });
 };

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() {