fix testing failures on assert.notInclude of null

Polymer · Mar 8, 2016 · 8066919 · 8066919
1 parent 58e6713
commit 8066919
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/test/unit/styling-remote.html b/test/unit/styling-remote.html
@@ -107,14 +107,14 @@
     assertComputed(d, '4px');
     Polymer.dom(document.body).appendChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when added to other root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when added to other root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when added to other root');
     Polymer.dom(styled.root).appendChild(d);
     Polymer.dom.flush();
     assertComputed(d, '4px');
     Polymer.dom(styled.root).removeChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when removed from root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when removed from root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when removed from root');
     Polymer.dom(styled.root).appendChild(d);
     Polymer.dom.flush();
@@ -131,14 +131,14 @@
     assertComputed(d, '0px');
     Polymer.dom(document.body).appendChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when added to other root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when added to other root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when added to other root');
     Polymer.dom(styled).appendChild(d);
     Polymer.dom.flush();
     assertComputed(d, '0px');
     Polymer.dom(styled).removeChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when removed from root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when removed from root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when removed from root');
     Polymer.dom(styled).appendChild(d);
     Polymer.dom.flush();

diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
@@ -130,14 +130,14 @@
     assertComputed(d, '4px');
     Polymer.dom(document.body).appendChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when added to other root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when added to other root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when added to other root');
     Polymer.dom(styled.root).appendChild(d);
     Polymer.dom.flush();
     assertComputed(d, '4px');
     Polymer.dom(styled.root).removeChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when removed from root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when removed from root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when removed from root');
     Polymer.dom(styled.root).appendChild(d);
     Polymer.dom.flush();
@@ -154,14 +154,14 @@
     assertComputed(d, '0px');
     Polymer.dom(document.body).appendChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when added to other root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when added to other root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when added to other root');
     Polymer.dom(styled).appendChild(d);
     Polymer.dom.flush();
     assertComputed(d, '0px');
     Polymer.dom(styled).removeChild(d);
     Polymer.dom.flush();
-    assert.notInclude(d.getAttribute('style-scoped'), styled.is, 'scoping attribute not removed when removed from root');
+    assert.notInclude(d.getAttribute('style-scoped') || '', styled.is, 'scoping attribute not removed when removed from root');
     assert.notInclude(d.className, styled.is, 'scoping class not removed when removed from root');
     Polymer.dom(styled).appendChild(d);
     Polymer.dom.flush();
@@ -336,7 +336,6 @@
       test('x-scope with no class attribute', function () {
         assert.equal(document.querySelector('x-scope-no-class > div').className, 'style-scope x-scope-no-class');
       });
-
     });
 
     test('svg classes are dynamically scoped correctly', function() {