Update DOMTokenList's contains and add replace

jsdom · May 6, 2016 · 9384cd0 · 9384cd0
1 parent c2933e9
commit 9384cd0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 34 deletions.
diff --git a/lib/jsdom/living/dom-token-list.js b/lib/jsdom/living/dom-token-list.js
@@ -19,15 +19,29 @@ class DOMTokenList {
 
   contains(token) {
     token = String(token);
-
-    validateToken(token);
     return indexOf(this, token) !== -1;
   }
 
+  replace(token, newToken) {
+    token = String(token);
+    newToken = String(newToken);
+    validateTokens(token, newToken);
+    const tokenIndex = indexOf(this, token);
+    if (tokenIndex === -1) {
+      return;
+    }
+    const newTokenIndex = indexOf(this, newToken);
+    if (newTokenIndex !== -1) {
+      spliceLite(this, newTokenIndex, 1);
+    }
+    this[INTERNAL].tokens[tokenIndex] = newToken;
+    update(this);
+  }
+
   add(/* tokens... */) {
     for (let i = 0; i < arguments.length; i++) {
       const token = String(arguments[i]);
-      validateToken(token);
+      validateTokens(token);
 
       if (indexOf(this, token) === -1) {
         push(this, token);
@@ -39,7 +53,7 @@ class DOMTokenList {
   remove(/* tokens... */) {
     for (let i = 0; i < arguments.length; i++) {
       const token = String(arguments[i]);
-      validateToken(token);
+      validateTokens(token);
 
       const index = indexOf(this, token);
       if (index !== -1) {
@@ -57,7 +71,7 @@ class DOMTokenList {
     token = String(token);
     force = force === undefined ? undefined : Boolean(force);
 
-    validateToken(token);
+    validateTokens(token);
 
     const index = indexOf(this, token);
 
@@ -102,14 +116,19 @@ function serialize(list) {
   return value === null ? "" : value;
 }
 
-function validateToken(token) {
-  if (token === "") {
-    throw new DOMException(DOMException.SYNTAX_ERR, "The token provided must not be empty.");
+function validateTokens(/* tokens... */) {
+  for (let i = 0; i < arguments.length; i++) {
+    const token = String(arguments[i]);
+    if (token === "") {
+      throw new DOMException(DOMException.SYNTAX_ERR, "The token provided must not be empty.");
+    }
   }
-
-  if (/\s/.test(token)) {
-    const whitespaceMsg = "The token provided contains HTML space characters, which are not valid in tokens.";
-    throw new DOMException(DOMException.INVALID_CHARACTER_ERR, whitespaceMsg);
+  for (let i = 0; i < arguments.length; i++) {
+    const token = String(arguments[i]);
+    if (/\s/.test(token)) {
+      const whitespaceMsg = "The token provided contains HTML space characters, which are not valid in tokens.";
+      throw new DOMException(DOMException.INVALID_CHARACTER_ERR, whitespaceMsg);
+    }
   }
 }
 

diff --git a/test/living-dom/class-list.js b/test/living-dom/class-list.js
@@ -77,28 +77,6 @@ exports[".contains(token) returns whether token exists"] = t => {
   t.done();
 };
 
-exports[".contains() throws if token empty"] = t => {
-  function block() {
-    el.classList.contains("");
-  }
-
-  // TODO: should be SyntaxError
-  t.throws(block, window.DOMException);
-
-  t.done();
-};
-
-exports[".contains() throws if token contains whitespace"] = t => {
-  function block() {
-    el.classList.contains(" ");
-  }
-
-  // TODO: should be InvalidCharacterError
-  t.throws(block, window.DOMException);
-
-  t.done();
-};
-
 exports[".add(tokens...) adds provided tokens"] = t => {
   // add zero tokens
   el.classList.add();