From 0b001cd09da2178c4246abc38c23db4123c6c6bb Mon Sep 17 00:00:00 2001
From: Ian Storm Taylor <ian@ianstormtaylor.com>
Date: Sun, 17 Jul 2016 16:02:12 -0700
Subject: [PATCH] fix html serializer tests

---
 .../html/deserialize/block-nested/index.js    | 36 +++++++-------
 .../html/deserialize/block-with-data/index.js | 26 +++++-----
 .../deserialize/block-with-is-void/index.js   | 24 +++++-----
 .../fixtures/html/deserialize/block/index.js  | 24 +++++-----
 .../html/deserialize/inline-nested/index.js   | 48 ++++++++++---------
 .../deserialize/inline-with-data/index.js     | 40 ++++++++--------
 .../deserialize/inline-with-is-void/index.js  | 36 +++++++-------
 .../fixtures/html/deserialize/inline/index.js | 36 +++++++-------
 .../deserialize/mark-interleaved/index.js     | 48 ++++++++++---------
 .../html/deserialize/mark-nested/index.js     | 48 ++++++++++---------
 .../fixtures/html/deserialize/mark/index.js   | 36 +++++++-------
 11 files changed, 212 insertions(+), 190 deletions(-)

diff --git a/test/serializers/fixtures/html/deserialize/block-nested/index.js b/test/serializers/fixtures/html/deserialize/block-nested/index.js
index 40ee3b4ec..9580667fd 100644
--- a/test/serializers/fixtures/html/deserialize/block-nested/index.js
+++ b/test/serializers/fixtures/html/deserialize/block-nested/index.js
@@ -1,23 +1,25 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'blockquote': {
-          return {
-            kind: 'block',
-            type: 'quote',
-            nodes: next(el.children)
+          case 'blockquote': {
+            return {
+              kind: 'block',
+              type: 'quote',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/block-with-data/index.js b/test/serializers/fixtures/html/deserialize/block-with-data/index.js
index fb09dd585..c4ac2c5e6 100644
--- a/test/serializers/fixtures/html/deserialize/block-with-data/index.js
+++ b/test/serializers/fixtures/html/deserialize/block-with-data/index.js
@@ -1,17 +1,19 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            data: { key: 'value' },
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              data: { key: 'value' },
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/block-with-is-void/index.js b/test/serializers/fixtures/html/deserialize/block-with-is-void/index.js
index 96483e174..4e66b7664 100644
--- a/test/serializers/fixtures/html/deserialize/block-with-is-void/index.js
+++ b/test/serializers/fixtures/html/deserialize/block-with-is-void/index.js
@@ -1,16 +1,18 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            isVoid: true
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              isVoid: true
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/block/index.js b/test/serializers/fixtures/html/deserialize/block/index.js
index 5b7c1e619..52e38b12d 100644
--- a/test/serializers/fixtures/html/deserialize/block/index.js
+++ b/test/serializers/fixtures/html/deserialize/block/index.js
@@ -1,16 +1,18 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/inline-nested/index.js b/test/serializers/fixtures/html/deserialize/inline-nested/index.js
index 709586a9f..44303a100 100644
--- a/test/serializers/fixtures/html/deserialize/inline-nested/index.js
+++ b/test/serializers/fixtures/html/deserialize/inline-nested/index.js
@@ -1,30 +1,32 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'a': {
-          return {
-            kind: 'inline',
-            type: 'link',
-            nodes: next(el.children)
+          case 'a': {
+            return {
+              kind: 'inline',
+              type: 'link',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'b': {
-          return {
-            kind: 'inline',
-            type: 'hashtag',
-            nodes: next(el.children)
+          case 'b': {
+            return {
+              kind: 'inline',
+              type: 'hashtag',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/inline-with-data/index.js b/test/serializers/fixtures/html/deserialize/inline-with-data/index.js
index 17d656636..629c3bee3 100644
--- a/test/serializers/fixtures/html/deserialize/inline-with-data/index.js
+++ b/test/serializers/fixtures/html/deserialize/inline-with-data/index.js
@@ -1,26 +1,28 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'a': {
-          return {
-            kind: 'inline',
-            type: 'link',
-            nodes: next(el.children),
-            data: {
-              href: el.attribs.href
+          case 'a': {
+            return {
+              kind: 'inline',
+              type: 'link',
+              nodes: next(el.children),
+              data: {
+                href: el.attribs.href
+              }
             }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/inline-with-is-void/index.js b/test/serializers/fixtures/html/deserialize/inline-with-is-void/index.js
index e4d708733..66526ce8e 100644
--- a/test/serializers/fixtures/html/deserialize/inline-with-is-void/index.js
+++ b/test/serializers/fixtures/html/deserialize/inline-with-is-void/index.js
@@ -1,23 +1,25 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'a': {
-          return {
-            kind: 'inline',
-            type: 'link',
-            isVoid: true
+          case 'a': {
+            return {
+              kind: 'inline',
+              type: 'link',
+              isVoid: true
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/inline/index.js b/test/serializers/fixtures/html/deserialize/inline/index.js
index 776ac0183..4f362bef4 100644
--- a/test/serializers/fixtures/html/deserialize/inline/index.js
+++ b/test/serializers/fixtures/html/deserialize/inline/index.js
@@ -1,23 +1,25 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'a': {
-          return {
-            kind: 'inline',
-            type: 'link',
-            nodes: next(el.children)
+          case 'a': {
+            return {
+              kind: 'inline',
+              type: 'link',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/mark-interleaved/index.js b/test/serializers/fixtures/html/deserialize/mark-interleaved/index.js
index b3f711620..2866022dc 100644
--- a/test/serializers/fixtures/html/deserialize/mark-interleaved/index.js
+++ b/test/serializers/fixtures/html/deserialize/mark-interleaved/index.js
@@ -1,30 +1,32 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'em': {
-          return {
-            kind: 'mark',
-            type: 'italic',
-            nodes: next(el.children)
+          case 'em': {
+            return {
+              kind: 'mark',
+              type: 'italic',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'strong': {
-          return {
-            kind: 'mark',
-            type: 'bold',
-            nodes: next(el.children)
+          case 'strong': {
+            return {
+              kind: 'mark',
+              type: 'bold',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/mark-nested/index.js b/test/serializers/fixtures/html/deserialize/mark-nested/index.js
index b3f711620..2866022dc 100644
--- a/test/serializers/fixtures/html/deserialize/mark-nested/index.js
+++ b/test/serializers/fixtures/html/deserialize/mark-nested/index.js
@@ -1,30 +1,32 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'em': {
-          return {
-            kind: 'mark',
-            type: 'italic',
-            nodes: next(el.children)
+          case 'em': {
+            return {
+              kind: 'mark',
+              type: 'italic',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'strong': {
-          return {
-            kind: 'mark',
-            type: 'bold',
-            nodes: next(el.children)
+          case 'strong': {
+            return {
+              kind: 'mark',
+              type: 'bold',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}
diff --git a/test/serializers/fixtures/html/deserialize/mark/index.js b/test/serializers/fixtures/html/deserialize/mark/index.js
index e5f82aff6..fc363e085 100644
--- a/test/serializers/fixtures/html/deserialize/mark/index.js
+++ b/test/serializers/fixtures/html/deserialize/mark/index.js
@@ -1,23 +1,25 @@
 
-export default [
-  {
-    deserialize(el, next) {
-      switch (el.tagName) {
-        case 'p': {
-          return {
-            kind: 'block',
-            type: 'paragraph',
-            nodes: next(el.children)
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
           }
-        }
-        case 'em': {
-          return {
-            kind: 'mark',
-            type: 'italic',
-            nodes: next(el.children)
+          case 'em': {
+            return {
+              kind: 'mark',
+              type: 'italic',
+              nodes: next(el.children)
+            }
           }
         }
       }
     }
-  }
-]
+  ]
+}