From 7c489e69bb0e00b08ad5bdeacb0a9c50da829347 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 5 Aug 2017 08:56:52 +0300 Subject: [PATCH] Make tests pass (#374) * wct misbehaves on hyphen casing on FF * Upgrade web-component-tester to 6.0.0 * Update some bower packages to prevent conflicts * Pin webcomponentsjs to 1.0.4 --- bower.json | 14 +++++++++----- package.json | 2 +- test/state-info-test.html | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index 5f1dc013c2..0aaa129adc 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,7 @@ "app-storage": "^2.0.2", "fecha": "~2.3.0", "font-roboto-local": "~1.0.1", - "google-apis": "GoogleWebComponents/google-apis#~1.1.6", + "google-apis": "GoogleWebComponents/google-apis#~2.0.0", "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^2.0.0", "iron-flex-layout": "PolymerElements/iron-flex-layout#^2.0.0", "iron-icon": "PolymerElements/iron-icon#^2.0.0", @@ -49,9 +49,10 @@ "paper-toggle-button": "PolymerElements/paper-toggle-button#^2.0.0", "polymer": "Polymer/polymer#~2.0.2", "polymer-sortablejs": "^0.1.3", - "vaadin-combo-box": "vaadin/vaadin-combo-box#v2.0.0-alpha4", - "vaadin-date-picker": "vaadin/vaadin-date-picker#v2.0.0-alpha1", - "web-animations-js": "^2.2.5" + "vaadin-combo-box": "vaadin/vaadin-combo-box#^2.0.0", + "vaadin-date-picker": "vaadin/vaadin-date-picker#^2.0.0", + "web-animations-js": "^2.2.5", + "webcomponentsjs": "1.0.4" }, "resolutions": { "iron-a11y-announcer": "^2.0.0", @@ -110,6 +111,9 @@ "paper-toast": "^2.0.0", "paper-toggle-button": "^2.0.0", "polymer": "^2.0.2", - "webcomponentsjs": "^v1.0.2" + "webcomponentsjs": "1.0.4" + }, + "devDependencies": { + "web-component-tester": "^6.0.0" } } diff --git a/package.json b/package.json index d48c7c1854..eb0a10c6e6 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,6 @@ "sw-precache": "^5.2.0", "uglify-js": "^3.0.27", "vulcanize": "^1.16.0", - "web-component-tester": "^5.0.1" + "web-component-tester": "^6.0.0" } } diff --git a/test/state-info-test.html b/test/state-info-test.html index 6319d39bef..336f62873a 100644 --- a/test/state-info-test.html +++ b/test/state-info-test.html @@ -6,12 +6,12 @@ - + - + @@ -28,7 +28,7 @@ var si; setup(function() { - si = fixture('state-info'); + si = fixture('stateInfo'); window.HAWS = {}; window.HAWS.extractDomain = function (entityId) { return entityId.substr(0, entityId.indexOf('.')); @@ -84,7 +84,7 @@ }); test('secondary line', function(done) { - si = fixture('state-info-secondary-line'); + si = fixture('stateInfoSecondaryLine'); si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}}; si.inDialog = false; flush(function() {