Tom kleingers

Author: karol-f

src/utils/registerCustomElement.js

@@ -22,6 +22,11 @@ export default function registerCustomElement(tag, options = {}) {
     typeof options.attributeChangedCallback === 'function' && options.attributeChangedCallback.call(this, name, oldValue, value);
   }
 
+  function define(tagName, CustomElement) {
+    const existingCustomElement = customElements.get(tagName);
+    return typeof existingCustomElement !== 'undefined' ? existingCustomElement : customElements.define(tagName, CustomElement);
+  }
+
   if (isES2015) {
     // ES2015 detected. We will use "class" based Custom Elements V1 specification.
     // If it's natively supported it will run without polyfill
@@ -45,7 +50,7 @@ export default function registerCustomElement(tag, options = {}) {
     CustomElement.prototype.disconnectedCallback = disconnectedCallback;
     CustomElement.prototype.attributeChangedCallback = attributeChangedCallback;
 
-    customElements.define(tag, CustomElement);
+    define(tag, CustomElement);
     return CustomElement; // eslint-disable-line consistent-return
   } else { // eslint-disable-line no-else-return
     // not ES2015. We will use polyfill supported version of registering Custom Elements
@@ -73,7 +78,7 @@ export default function registerCustomElement(tag, options = {}) {
     CustomElement.prototype.disconnectedCallback = disconnectedCallback;
     CustomElement.prototype.attributeChangedCallback = attributeChangedCallback;
 
-    customElements.define(tag, CustomElement);
+    define(tag, CustomElement);
     return CustomElement; // eslint-disable-line consistent-return
   }
 }

test/e2e/nightwatch.conf.js

@@ -1,5 +1,6 @@
 require('babel-register')
 var config = require('../../config')
+var seleniumJar = require('shelljs').find('node_modules/selenium-server/lib/runner').filter(function(file){ return file.match(/selenium-server-standalone-.*\.jar$/); });
 
 // http://nightwatchjs.org/guide#settings-file
 module.exports = {
@@ -8,7 +9,7 @@ module.exports = {
 
   selenium: {
     start_process: true,
-    server_path: 'node_modules/selenium-server/lib/runner/selenium-server-standalone-3.3.0.jar',
+    server_path: seleniumJar,
     host: '127.0.0.1',
     port: 4444,
     cli_args: {

test/e2e/specs/basic.js

@@ -2,7 +2,7 @@
 // http://nightwatchjs.org/guide#usage
 
 module.exports = {
-  'basic': function test(browser) {
+  basic: function test(browser) {
     // automatically uses dev Server port from /config.index.js
     // default: http://localhost:8080
     // see nightwatch.conf.js
@@ -12,5 +12,5 @@ module.exports = {
       .url(`${devServer}/#/demos/basic`)
       .waitForElementVisible('demo-basic', 5000)
       .end();
-  },
+  }
 };