Update to es6

Author: benjaminapetersen

test/.jshintrc

@@ -1,7 +1,7 @@
 {
   "node": true,
   "browser": true,
-  "esnext": true,
+  "esversion": 6,
   "bitwise": true,
   "camelcase": false,
   "curly": true,
@@ -18,6 +18,7 @@
   "sub" : true,
   "undef": true,
   "unused": true,
+  "expr" : true,
   "globals": {
     "ace": false,
     "after": false,

test/integration/helpers/inputs.js

@@ -1,45 +1,45 @@
 'use strict';
+/*jshint esversion: 6 */
 
 // is a pain to get an array of input values because .getAttribute()
 // is a promise
-// example:
-//  getInputValues(element(by.css('input[type="text"]')))
-//   .then(function(values) {  /* do stuff */  });
-var getInputValues = function(inputs) {
-  var allValues = protractor.promise.defer();
-  var values = [];
-  var count;
-  inputs.count().then(function(num) {
-    count = num;
-  });
-  inputs.each(function(input, i) {
-    input.getAttribute('value').then(function(val) {
-      values.push(val);
-      if((i+1) === count) {
-        allValues.fulfill(values);
-      }
+const getInputValues = (inputs) => {
+  let allValues = protractor.promise.defer();
+  let values = [];
+  let count;
+  inputs.count()
+    .then((num) => {
+      count = num + 1;
     });
+  inputs.each((input, i) => {
+    input
+      .getAttribute('value')
+      .then(function(val) {
+        values.push(val);
+        if((i) === count) {
+          allValues.fulfill(values);
+        }
+      });
   });
   return allValues.promise;
 };
 
-
 // inputs: protractor object
 //  - element.all(by.model('parameter.value'))
 // value: string
-var findValueInInputs = function(inputs, value) {
-  return getInputValues(inputs).then(function(values) {
-    var found = values.find(function(val) {
-      return val === value;
-    });
-    return found;
-  });
+const findValueInInputs = (inputs, value) => {
+  return getInputValues(inputs)
+          .then((values) => {
+            let found = values.find((val) => { val === value; });
+            return found;
+          });
 };
 
+
 // example:
 //   check(element(by.css('input[type="checkbox"]')))
-var check = function(checkboxElem) {
-  return checkboxElem.isSelected().then(function(selected) {
+const check = (checkboxElem) => {
+  return checkboxElem.isSelected().then((selected) => {
     if(!selected) {
       return checkboxElem.click();
     }
@@ -48,8 +48,8 @@ var check = function(checkboxElem) {
 
 // example:
 //   unCheck(element(by.css('input[type="checkbox"]')))
-var uncheck = function(checkboxElem) {
-  return checkboxElem.isSelected().then(function(selected) {
+const uncheck = (checkboxElem) => {
+  return checkboxElem.isSelected().then((selected) => {
     if(selected) {
       return checkboxElem.click();
     }

test/integration/page-objects/builds.js

@@ -1,15 +1,14 @@
 'use strict';
 
-var _ = require('lodash');var Page = require('./page').Page;
+const Page = require('./page').Page;
 
-var BuildsPage = function(project) {
-  this.project = project;
-};
-
-_.extend(BuildsPage.prototype, Page.prototype, {
-  getUrl: function() {
+class BuildsPage extends Page {
+  constructor(project, menu) {
+    super(project, menu);
+  }
+  getUrl() {
     return 'project/' + this.project.name + '/browse/builds';
   }
-});
+}
 
 exports.BuildsPage = BuildsPage;

test/integration/page-objects/catalog.js

@@ -1,12 +1,10 @@
 'use strict';
 
-var h = require('../helpers.js');
-var _ = require('lodash');
-var inputs = require('../helpers/inputs');
-var Page = require('./page').Page;
-//var logger = require('../helpers/logger');
+const h = require('../helpers.js');
+const inputs = require('../helpers/inputs');
+const Page = require('./page').Page;
 
-var AddTemplateModal = function(project) {
+let AddTemplateModal = function(project) {
   this.project = project;
   this.modal = element(by.css('.modal-dialog'));
   this.checkboxes = this.modal.all(by.css('input[type="checkbox"]'));
@@ -33,62 +31,59 @@ var AddTemplateModal = function(project) {
   };
 };
 
-var CatalogPage = function(project) {
-  this.project = project;
-};
-
-_.extend(CatalogPage.prototype, Page.prototype, {
-  getUrl: function() {
-    // ?tab=tab=fromFile, ?tab=fromCatalog, ?tab=deployImage
+class CatalogPage extends Page {
+  constructor(project, menu) {
+    super(project, menu);
+  }
+  getUrl() {
+    // TODO: ?tab=tab=fromFile, ?tab=fromCatalog, ?tab=deployImage
     return 'project/' + this.project.name + '/create';
-  },
-  // TODO: push this up into Page, include a way to pass tab names to the constructor &
-  // auto generate clickTab<name>() functions?
-  _findTabs: function() {
-    var tabs = element(by.css('.nav-tabs'));
+  }
+  _findTabs() {
+    let tabs = element(by.css('.nav-tabs'));
     h.waitForElem(tabs);
     return tabs;
-  },
-  clickBrowseCatalog: function() {
+  }
+  clickBrowseCatalog() {
     return this._findTabs()
                .element(by.cssContainingText('a', 'Browse Catalog'))
                .click();
-  },
-  clickDeployImage: function() {
+  }
+  clickDeployImage() {
     return this._findTabs()
                .element(by.cssContainingText('a', 'Deploy Image'))
                .click();
-  },
-  clickImport: function() {
+  }
+  clickImport() {
     return this._findTabs()
                .element(by.cssContainingText('a', 'Import YAML / JSON'))
                .click();
-  },
-  setImportValue: function(str) {
-    return browser.executeScript(function(value) {
+  }
+  setImportValue(str) {
+    return browser.executeScript((value) => {
       window.ace.edit('add-component-editor').setValue(value);
     }, str);
-  },
-  getImportValue: function() {
-    return browser.executeScript(function() {
+  }
+  getImportValue() {
+    return browser.executeScript(() => {
       return window.ace.edit('add-component-editor').getValue();
     });
-  },
-  submitImport: function() {
+  }
+  submitImport() {
     element(by.cssContainingText('.btn-primary','Create')).click();
-    return browser.sleep(500).then(function() {
+    return browser.sleep(500).then(() => {
       return new AddTemplateModal(this.project);
-    }.bind(this));
-  },
-  processTemplate: function(templateStr) {
+    });
+  }
+  processTemplate(templateStr) {
     this.clickImport();
-    return this.setImportValue(templateStr).then(function() {
-      return this.submitImport().then(function(addTemplateModal) {
+    return this.setImportValue(templateStr).then(() => {
+      return this.submitImport().then((addTemplateModal) => {
         // implicit nav therefore returns new CreateFromTemplatePage()
         return addTemplateModal.process();
       });
-    }.bind(this));
+    });
   }
-});
+}
 
 exports.CatalogPage = CatalogPage;

test/integration/page-objects/createFromTemplate.js

@@ -1,32 +1,29 @@
 'use strict';
 
-var h = require('../helpers');
-var scroll = require('../helpers/scroll');
-var _ = require('lodash');
-var Page = require('./page').Page;
-//var logger = require('../helpers/logger');
+const h = require('../helpers');
+const Page = require('./page').Page;
+const scroller = require('../helpers/scroll'); 
 
-var CreateFromTemplatePage = function(project, template) {
-  this.project = project;
-  this.template = template;
-};
-
-_.extend(CreateFromTemplatePage.prototype, Page.prototype, {
-  getUrl: function() {
-    var url = 'project/' + this.project.name + '/create/fromtemplate';
+class CreateFromTemplatePage extends Page {
+  constructor(project, menu) {
+    super(project, menu);
+  }
+  getUrl() {
+    let url = 'project/' + this.project.name + '/create/fromtemplate';
     if(this.template) {
       url += '?template='+this.template.name; //+'&namespace='; may need template namespace...
     }
     return url;
-  },
-  clickCreate: function() {
-    scroll.toBottom();
-    var button = element(by.buttonText('Create'));
+  }
+  clickCreate() {
+    scroller.toBottom();
+    let button = element(by.buttonText('Create'));
     h.waitForElem(button);
-    return button.click().then(function() {
-      return new require('./overview').OverviewPage(this.project);
-    }.bind(this));
+    return button.click().then(() => {
+      const OverviewPage = require('./overview').OverviewPage;
+      return new OverviewPage(this.project);
+    });
   }
-});
+}
 
 exports.CreateFromTemplatePage = CreateFromTemplatePage;

test/integration/page-objects/createProject.js

@@ -1,36 +1,32 @@
 'use strict';
 
-var _ = require('lodash');
-var h = require('../helpers.js');
-var Page = require('./page').Page;
-var CatalogPage = require('./catalog').CatalogPage;
+const h = require('../helpers.js');
+const Page = require('./page').Page;
+const CatalogPage = require('./catalog').CatalogPage;
 
-var CreateProjectPage = function(project) {
-  this.project = project;
-};
-
-_.extend(CreateProjectPage.prototype, Page.prototype, {
-  getUrl: function() {
+class CreateProjectPage extends Page {
+  constructor(project, menu) {
+    super(project, menu);
+  }
+  getUrl() {
     return 'create-project';
-  },
-  enterProjectInfo: function() {
-    for (var key in this.project) {
+  }
+  enterProjectInfo() {
+    for (let key in this.project) {
       h.waitForElem( element( by.model( key )));
       h.setInputValue(key, this.project[key]);
     }
     return this;
-  },
-  submit: function() {
-    var button = element(by.buttonText('Create'));
+  }
+  submit() {
+    let button = element(by.buttonText('Create'));
     button.click();
     return new CatalogPage(this.project);
-  },
-  // call createProject() so you dont have to do the above manally
-  // returns a new CatalogPage()
-  createProject: function() {
+  }
+  createProject() {
     this.enterProjectInfo();
     return this.submit();
   }
-});
+}
 
 exports.CreateProjectPage = CreateProjectPage;

test/integration/page-objects/deployments.js

@@ -1,16 +1,14 @@
 'use strict';
 
-var _ = require('lodash');
-var Page = require('./page').Page;
+const Page = require('./page').Page;
 
-var DeploymentsPage = function(project) {
-  this.project = project;
-};
-
-_.extend(DeploymentsPage.prototype, Page.prototype, {
-  getUrl: function() {
+class DeploymentsPage extends Page {
+  constructor(project, menu) {
+    super(project, menu);
+  }
+  getUrl() {
     return 'project/' + this.project.name + '/browse/deployments';
   }
-});
+}
 
 exports.DeploymentsPage = DeploymentsPage;