Fixed test cases and added function to replace font tags with span + param to setNodeTag to keep attributes from original node.

3 files changed, 27 insertions, 12 deletions

diff --git a/test/test-pages/clean-links/expected.html b/test/test-pages/clean-links/expected.html
index 23f1aa5..b8cf601 100644
--- a/test/test-pages/clean-links/expected.html
+++ b/test/test-pages/clean-links/expected.html
@@ -1,6 +1,6 @@
 <div><td>
         <h3 align="center ">Study Webtext</h3>
-        <h2 align="center "><font color="Maroon&#xA;        " face="Lucida Handwriting ">"Bartleby the Scrivener: A Story of Wall-Street " </font>(1853) <br></br>
+        <h2 align="center "><span color="Maroon&#xA;        " face="Lucida Handwriting ">"Bartleby the Scrivener: A Story of Wall-Street " </span>(1853) <br></br>
           Herman Melville</h2>
         <h2 align="center "><a href="http://www.vcu.edu/engweb/webtexts/bartleby.html&#xA;        " target="_blank "><img align="absmiddle " alt="To the story text without notes&#xA;        " height="38 " src="http://fakehost/test/hmhome.gif " width="38 "></img></a> 
         </h2>
diff --git a/test/test-pages/mozilla-2/expected.html b/test/test-pages/mozilla-2/expected.html
index 7a14801..c27cb2b 100644
--- a/test/test-pages/mozilla-2/expected.html
+++ b/test/test-pages/mozilla-2/expected.html
@@ -2,7 +2,7 @@
       <p>Get to know the features that make it the most complete browser for building the Web.</p>
     </header><ul class="features"><li class="feature">
         <a class="video-play" href="https://www.youtube.com/watch?v=1R9_WdXwUsE" rel="external">
-          <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-webide.16763db341cb.jpg"></img></a>
+          <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-webide.16763db341cb.jpg"></img></a>
         <h2>WebIDE</h2>
         <p>Develop, deploy and debug Firefox OS apps directly in your browser, or on a Firefox OS device, with this tool that replaces App Manager.</p>
         <a class="more" href="https://developer.mozilla.org/docs/Tools/WebIDE" rel="external">Learn more about WebIDE</a>
@@ -10,7 +10,7 @@
       </li>
       <li class="feature">
         <a class="video-play" href="https://www.youtube.com/watch?v=eH0R10Ga4Hs" rel="external">
-          <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-valence.251f9def4d8d.jpg"></img></a>
+          <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-valence.251f9def4d8d.jpg"></img></a>
         <h2>Valence</h2>
         <p>Develop and debug your apps across multiple browsers and devices with this powerful extension that comes pre-installed with Firefox Developer Edition.</p>
         <a class="more" href="https://developer.mozilla.org/docs/Tools/Firefox_Tools_Adapter" rel="external">Learn more about Valence</a>
@@ -27,7 +27,7 @@
       <header><h2>Features and tools</h2>
       </header><ul class="features"><li class="feature">
           <a class="video-play" href="https://www.youtube.com/watch?v=eQqNfkqIJdw" rel="external">
-            <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-inspector.c791bf1f1a59.jpg"></img></a>
+            <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-inspector.c791bf1f1a59.jpg"></img></a>
           <h2>Page Inspector</h2>
           <p>Examine the HTML and CSS of any Web page and easily modify the structure and layout of a page.</p>
           <a class="more" href="https://developer.mozilla.org/docs/Tools/Page_Inspector" rel="external">Learn more about Page Inspector</a>
@@ -35,7 +35,7 @@
         </li>
         <li class="feature">
           <a class="video-play" href="https://www.youtube.com/watch?v=iEDk8o9ehlw" rel="external">
-            <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-console.42666aaf6d03.jpg"></img></a>
+            <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-console.42666aaf6d03.jpg"></img></a>
           <h2>Web Console</h2>
           <p>See logged information associated with a Web page and use Web Console to interact with Web pages using JavaScript.</p>
           <a class="more" href="https://developer.mozilla.org/docs/Tools/Web_Console" rel="external">Learn more about Web Console</a>
@@ -43,7 +43,7 @@
         </li>
         <li class="feature">
           <a class="video-play" href="https://www.youtube.com/watch?v=OS4AxYFLCIE" rel="external">
-            <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-debugger.02ed86fb0c9f.jpg"></img></a>
+            <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-debugger.02ed86fb0c9f.jpg"></img></a>
           <h2>JavaScript Debugger</h2>
           <p>Step through JavaScript code and examine or modify its state to help track down bugs.</p>
           <a class="more" href="https://developer.mozilla.org/docs/Tools/Debugger" rel="external">Learn more about JavaScript Debugger</a>
@@ -51,7 +51,7 @@
         </li>
         <li class="feature">
           <a class="video-play" href="https://www.youtube.com/watch?v=w4zSG53Qlbk" rel="external">
-            <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-network.740d6082b3f6.jpg"></img></a>
+            <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-network.740d6082b3f6.jpg"></img></a>
           <h2>Network Monitor</h2>
           <p>See all the network requests your browser makes, how long each request takes and details of each request.</p>
           <a class="more" href="https://developer.mozilla.org/docs/Tools/Network_Monitor" rel="external">Learn more about Network Monitor</a>
@@ -59,7 +59,7 @@
         </li>
         <li class="feature">
           <a class="video-play" href="https://www.youtube.com/watch?v=R_qDaLQ8ghg" rel="external">
-            <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-webaudio.a10ebc48d017.jpg"></img></a>
+            <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-webaudio.a10ebc48d017.jpg"></img></a>
           <h2>Web Audio Editor</h2>
           <p>Inspect and interact with Web Audio API in real time to ensure that all audio nodes are connected in the way you expect.</p>
           <a class="more" href="https://developer.mozilla.org/docs/Tools/Web_Audio_Editor" rel="external">Learn more about Web Audio Editor</a>
@@ -67,7 +67,7 @@
         </li>
         <li class="feature">
           <a class="video-play" href="https://www.youtube.com/watch?v=3kdBvvIZIqU" rel="external">
-            <img alt="Screenshot" class="screenshot" src="//mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-style-editor.87c5d2017506.jpg"></img></a>
+            <img alt="Screenshot" class="screenshot" src="http://mozorg.cdn.mozilla.net/media/img/firefox/firstrun/dev/feature-style-editor.87c5d2017506.jpg"></img></a>
           <h2>Style Editor</h2>
           <p>View and edit CSS styles associated with a Web page, create new ones and apply existing CSS stylesheets to any page.</p>
           <a class="more" href="https://developer.mozilla.org/docs/Tools/Style_Editor" rel="external">Learn more about Style Editor</a>
diff --git a/test/test-pages/replace-font-tags/expected.html b/test/test-pages/replace-font-tags/expected.html
index 0734fb3..52a5cf3 100644
--- a/test/test-pages/replace-font-tags/expected.html
+++ b/test/test-pages/replace-font-tags/expected.html
@@ -1,3 +1,18 @@
-    <article>
-        <p> <span face="Arial" size="2">Lorem ipsum dolor</span> sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. <span face="Arial" size="2">Duis</span> aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p>
-        <p> Tempor incididunt ut labore et <span face="Arial" size="2">dolore</span> magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. <span face="Arial" size="2">Excepteur sint occaecat</span> cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p>
\ No newline at end of file
+<article>
+    <p>
+    <span face="Arial" size="2">Lorem ipsum dolor</span> sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. <span face="Arial" size="2">Duis</span> aute irure dolor in reprehenderit in voluptate velit esse
+      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+      proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    </p>
+    
+    <p>
+      Tempor incididunt ut labore et <span face="Arial" size="2">dolore</span> magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      cillum dolore eu fugiat nulla pariatur. <span face="Arial" size="2">Excepteur sint occaecat</span> cupidatat non
+      proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    </p>
+  </article>
\ No newline at end of file