Update test expectations

5 files changed, 61 insertions, 56 deletions

diff --git a/test/test-pages/gmw/expected.html b/test/test-pages/gmw/expected.html
index 13ed014..1b69754 100644
--- a/test/test-pages/gmw/expected.html
+++ b/test/test-pages/gmw/expected.html
@@ -1,8 +1,8 @@
 <div id="contentMsg">
                 <p><span id="pubTime">2017-03-10 09:58</span>　<span id="source">来源：<a href="http://tech.163.com/17/0228/00/CEAPST9C00097U81.html" target="_blank">网易科学人</a></span>　<span id="author"></span></p></div><div id="contentMain">
-
-
-
+                
+                
+                
                 <p>　　翱翔于距地球数千公里的太空中，进入广袤漆黑的未知领域，是一项艰苦卓绝的工作。这让人感到巨大压力和极度恐慌。那么，为什么不能让宇航员来一杯“地球末日”鸡尾酒来放松一下？</p>
                 <p>　　不幸的是，对于希望能喝上一杯的太空探险者，那些将他们送上太空的政府机构普遍禁止他们染指包括酒在内的含酒精饮料。</p>
                 <p>　　但是，很快普通人都会有机会向人类“最终的边疆”出发——以平民化旅行的形式，去探索和殖民火星。确实，火星之旅将是一次令人感到痛苦的旅行，可能一去不复返并要几年时间才能完成，但是否应该允许参与者在旅程中痛饮一番？或至少携带能在火星上发酵自制酒精饮料的设备？</p>
@@ -51,8 +51,8 @@
                 <p><strong>　　作者︱春春</strong>
                     <a href="http://www.gmw.cn" target="_blank"><img src="https://img.gmw.cn/pic/content_logo.png" title="返回光明网首页"></img></a>
                 </p>
-
+                
                 <p>[责任编辑:肖春芳]</p>
-
-
+                
+                
             </div>
\ No newline at end of file
diff --git a/test/test-pages/keep-images/expected-metadata.json b/test/test-pages/keep-images/expected-metadata.json
index 3956602..6c2c29a 100644
--- a/test/test-pages/keep-images/expected-metadata.json
+++ b/test/test-pages/keep-images/expected-metadata.json
@@ -1,5 +1,5 @@
 {
-  "Title": "Inside the Deep Web Drug Lab — Backchannel — Medium",
+  "Title": "Inside the Deep Web Drug Lab",
   "Author": "Joseph Cox",
   "Excerpt": "Welcome to DoctorX’s Barcelona lab, where the drugs you bought online are tested for safety and purity. No questions ask…"
 }
diff --git a/test/test-pages/keep-images/expected.html b/test/test-pages/keep-images/expected.html
index 30597de..d3696f7 100644
--- a/test/test-pages/keep-images/expected.html
+++ b/test/test-pages/keep-images/expected.html
@@ -4,16 +4,16 @@
                                                 <div>
                                                     <div>
                                                         <figure id="b9ad" name="b9ad"><div>
-
+                                                                
                                                                 <p><img data-height="1402" data-image-id="1*sLDnS1UWEFIS33uLMxq3cw.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*sLDnS1UWEFIS33uLMxq3cw.jpeg"></img></p></div>
                                                         </figure></div>
                                                     <div>
-
-
+                                                        
+                                                        
                                                         <h4 data-align="center" id="9736" name="9736">Welcome to DoctorX’s Barcelona lab, where the drugs you bought online are tested for safety and purity. No questions asked.</h4>
-
+                                                        
                                                         <figure id="7417" name="7417"><div>
-
+                                                                
                                                                 <p><img data-action="zoom" data-action-value="1*3vIhkoHIzcxvUdijoCVx6w.png" data-height="24" data-image-id="1*3vIhkoHIzcxvUdijoCVx6w.png" data-width="1200" src="https://d262ilb51hltx0.cloudfront.net/max/800/1*3vIhkoHIzcxvUdijoCVx6w.png"></img></p></div>
                                                         </figure><p id="8a83" name="8a83">Standing at a table in a chemistry lab in Barcelona, Cristina Gil Lladanosa
                                                             tears open a silver, smell-proof protective envelope. She slides out a
@@ -31,7 +31,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="c4e6" name="c4e6"><div>
-
+                                                                
                                                                 <p><img data-height="1402" data-image-id="1*4gN1-fzOwCniw-DbqQjDeQ.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*4gN1-fzOwCniw-DbqQjDeQ.jpeg"></img></p></div>
                                                             <figcaption>Cristina Gil Lladanosa, at the Barcelona testing lab | photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -61,7 +61,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="559c" name="559c"><div>
-
+                                                                
                                                                 <p><img data-height="1402" data-image-id="1*2KPmZkIBUrhps-2uwDvYFQ.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*2KPmZkIBUrhps-2uwDvYFQ.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -76,7 +76,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="d6aa" name="d6aa"><div>
-
+                                                                
                                                                 <p><img data-height="1241" data-image-id="1*PU40bbbox2Ompc5I3RE99A.jpeg" data-width="2013" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*PU40bbbox2Ompc5I3RE99A.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -101,7 +101,7 @@
                                                             that numbs the gums, giving the impression that the user is taking higher
                                                             quality cocaine; and common caffeine.</p>
                                                         <figure id="b821" name="b821"><div>
-
+                                                                
                                                                 <p><img data-action="zoom" data-action-value="1*ohyycinH18fz98TCyUzVgQ.png" data-height="24" data-image-id="1*ohyycinH18fz98TCyUzVgQ.png" data-width="1200" src="https://d262ilb51hltx0.cloudfront.net/max/800/1*ohyycinH18fz98TCyUzVgQ.png"></img></p></div>
                                                         </figure><p id="39a6" name="39a6">The deep web drug lab is the brainchild of Fernando Caudevilla, a Spanish
                                                             physician who is better known as “DoctorX” on the deep web, a nickname
@@ -114,7 +114,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="eebc" name="eebc"><div>
-
+                                                                
                                                                 <p><img data-height="1241" data-image-id="1*mKvUNOAVQxl6atCbxbCZsg.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*mKvUNOAVQxl6atCbxbCZsg.jpeg"></img></p></div>
                                                             <figcaption>Fernando Caudevilla, AKA DoctorX. Photo: Joseph Cox</figcaption></figure></div>
                                                     <div>
@@ -158,12 +158,12 @@
                                                     </div>
                                                     <div>
                                                         <figure id="4058" name="4058"><div>
-
+                                                                
                                                                 <p><img data-height="3141" data-image-id="1*knT10_FNVUmqQIBLnutmzQ.jpeg" data-width="4400" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*knT10_FNVUmqQIBLnutmzQ.jpeg"></img></p></div>
                                                             <figcaption>Photo: Joseph Cox</figcaption></figure></div>
                                                     <div>
                                                         <figure id="818c" name="818c"><div>
-
+                                                                
                                                                 <p><img data-action="zoom" data-action-value="1*ohyycinH18fz98TCyUzVgQ.png" data-height="24" data-image-id="1*ohyycinH18fz98TCyUzVgQ.png" data-width="1200" src="https://d262ilb51hltx0.cloudfront.net/max/800/1*ohyycinH18fz98TCyUzVgQ.png"></img></p></div>
                                                         </figure><p id="7b5e" name="7b5e">While the Energy Control lab in Madrid lab only tests Spanish drugs from
                                                             various sources, it is the Barcelona location which vets the substances
@@ -190,7 +190,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="b885" name="b885"><div>
-
+                                                                
                                                                 <p><img data-height="1402" data-image-id="1*Vr61dyCTRwk6CemmVF8YAQ.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*Vr61dyCTRwk6CemmVF8YAQ.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -229,12 +229,12 @@
                                                     </div>
                                                     <div>
                                                         <figure id="8544" name="8544"><div>
-
+                                                                
                                                                 <p><img data-height="1402" data-image-id="1*a-1_13xE6_ErQ-QSlz6myw.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*a-1_13xE6_ErQ-QSlz6myw.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
                                                         <figure id="d521" name="d521"><div>
-
+                                                                
                                                                 <p><img data-action="zoom" data-action-value="1*ohyycinH18fz98TCyUzVgQ.png" data-height="24" data-image-id="1*ohyycinH18fz98TCyUzVgQ.png" data-width="1200" src="https://d262ilb51hltx0.cloudfront.net/max/800/1*ohyycinH18fz98TCyUzVgQ.png"></img></p></div>
                                                         </figure><p id="126b" name="126b">Despite the prevalence of people using the service to gauge the quality
                                                             of what goes up their nose, many users send samples to Energy Control in
@@ -273,7 +273,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="552a" name="552a"><div>
-
+                                                                
                                                                 <p><img data-height="1192" data-image-id="1*IWXhtSsVv0gNnCwnDEXk-Q.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*IWXhtSsVv0gNnCwnDEXk-Q.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -298,7 +298,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="9d32" name="9d32"><div>
-
+                                                                
                                                                 <p><img data-height="913" data-image-id="1*NGcrjfkV0l37iQH2uyYjEw.jpeg" data-width="1368" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*NGcrjfkV0l37iQH2uyYjEw.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -355,7 +355,7 @@
                                                     </div>
                                                     <div>
                                                         <figure id="890b" name="890b"><div>
-
+                                                                
                                                                 <p><img data-height="1373" data-image-id="1*WRlKt3q3mt7utmwxcbl3sQ.jpeg" data-width="2100" src="https://d262ilb51hltx0.cloudfront.net/max/2000/1*WRlKt3q3mt7utmwxcbl3sQ.jpeg"></img></p></div>
                                                             <figcaption>Photo by Joan Bardeletti</figcaption></figure></div>
                                                     <div>
@@ -368,7 +368,7 @@
                                                             had it shipped to their doorstep in Canada, got hold of some seriously
                                                             good, and relatively safe drugs. And now they know it.</p>
                                                         <figure id="31cf" name="31cf"><div>
-
+                                                                
                                                                 <p><img data-action="zoom" data-action-value="1*320_4I0lxbn5x3bx4XPI5Q.png" data-height="24" data-image-id="1*320_4I0lxbn5x3bx4XPI5Q.png" data-width="1200" src="https://d262ilb51hltx0.cloudfront.net/max/800/1*320_4I0lxbn5x3bx4XPI5Q.png"></img></p></div>
                                                         </figure><p data-align="center" id="9b87" name="9b87"><em>Top photo by Joan Bardeletti</em>
                                                         </p>
diff --git a/test/test-pages/remove-extra-brs/expected.html b/test/test-pages/remove-extra-brs/expected.html
index 71ff530..e064a49 100644
--- a/test/test-pages/remove-extra-brs/expected.html
+++ b/test/test-pages/remove-extra-brs/expected.html
@@ -1,11 +1,16 @@
-
-    <div>
-        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
-        <p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-        <p>Duis 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>
-    </div>
-    <div>
-        <p>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.</p>
-        <p>Duis 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>
-    </div>
-</div>
\ No newline at end of file
+<div>
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua.</p>
+      <p>Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat.</p><p>Duis 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>
+    </div><div>
+      <p>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.</p>
+      <p>Duis 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>
+    </div>
\ No newline at end of file
diff --git a/test/test-pages/table-style-attributes/expected.html b/test/test-pages/table-style-attributes/expected.html
index 75a5b35..4d2e894 100644
--- a/test/test-pages/table-style-attributes/expected.html
+++ b/test/test-pages/table-style-attributes/expected.html
@@ -3,54 +3,54 @@
         <span size="+3"><b>linux usability
     <span size="4"><br></br>...or, why do I bother.</span></b></span><br></br> © 2002, 2003
         <a href="mailto:/dev/[email protected]?subject=Please%20delete%20this%20message%20without%20reading%20it.">Jamie Zawinski</a> </p>
-
-
+    
+    
     <div>
         <table><tbody><tr><td>
                         <p> In December 2002, I tried to install some software on my computer. The experience was, shall we say, less than pleasant. On many levels. I wrote about my experience, as I so often do. </p>
                         <p> Then in January, the jackasses over at Slashdot <a href="http://slashdot.org/article.pl?sid=03/01/24/1440207">posted</a> a link to it, calling it a "review" of Linux video software. I guess you could consider it a review, if you were to squint at it just right. But really what it is is a <i>rant</i> about how I had an evening stolen from me by crap software design. It is a flame about the pathetic state of Linux usability in general, and the handful of video players I tried out in particular. It makes no attempt to be balanced or objective or exhaustive. It is a description of my experience. Perhaps your experience was different. Good for you. </p>
                         <p> So of course that day I got hundreds of emails about it. Every Linux apologist in the world wanted to make sure I was fully informed of their opinion. The replies were roughly in the following groups: </p>
-
+                        
                         <ul><li> "Right on! I had exactly the same experience! Thank you for putting it into words." <i>(This was about 1/3 of the replies.)</i>
-
+                                
                             </li>
                             <li> "You're clearly an idiot, Linux is too sophisticated for you, you clearly are incapable of understanding anything, you should go back to kindergarten and/or use a Mac." <i>(Oddly, all of these messages used the word</i> `clearly' <i>repeatedly.)</i>
-
+                                
                             </li>
                             <li> "If you don't like it, fix it yourself."
-
+                                
                             </li>
                             <li> "Netscape sucks! XEmacs sucks! You suck! I never liked you anyway! And you swear too much!"
-
+                                
                             </li>
                             <li> "How dare you criticize someone else's work! You got it for free! You should be on your knees thanking them for wasting your time!"
-
+                                
                             </li>
                             <li> "While you have some valid complaints, I'm going to focus on this one inconsequential error you made in your characterization of one of the many roadblocks you encountered. You suck!"
-
+                                
                             </li>
                             <li> "It's your fault for using Red Hat! You should be using Debian/<wbr></wbr>Mandrake/<wbr></wbr>Gentoo instead!"
-
+                                
                             </li>
                             <li> "Red Hat 7.2 is totally obsolete! It's almost 14 months old! What were you expecting!" </li>
                         </ul></td>
                     <td>
                         <p> While I am flattered that so many logorrheic Linux fanboys are sufficiently interested in my opinions and experiences to share their deeply heartfelt views with me, you can all rest assured that: </p>
-
+                        
                         <ul><ul type="A"><li> I've heard it before; and </li>
                                 <li> I didn't care the first time. </li>
                             </ul></ul><p> So please. Don't bother sending me any more mail about this. It's a near certainty that I will just delete it unread, so you might as well not waste your time. Feel free to call me names on your own web page if you feel the need to get it out of your system. But kindly stay out of my inbox.
-
-
+                            
+                            
                         </p>
                     </td>
                 </tr></tbody></table></div>
-
+    
     <p>
         <span size="+3"><b>that said...</b></span>
     </p>
     <p> I understand that one can play videos on one's computer. I understand these videos come in many different formats. Every now and then I try to figure out what the Done Thing is, as far as playing movies on one's Linux machine. </p>
-
+    
     <ul> (Really my eventual goal is to be able to <i>create</i> video on Linux, but I figured I'd start small, and see if I could just get <i>playback</i> working before trying something that is undoubtedly ten thousand times harder.) </ul><p> I finally found <a href="http://mirrors.sctpc.com/dominik/linux/pkgs/mplayer/">RPMs</a> of <a href="http://www.mplayerhq.hu/">mplayer</a> that would consent to install themselves on a Red Hat 7.2 machine, and actually got it to play some videos. Amazing. But it's a total pain in the ass to use due to rampant "themeing." <i>Why do people do this?</i> They map this stupid shaped window with no titlebar (oh, sorry, your choice of a dozen stupidly-shaped windows without titlebars) all of which use fonts that are way too small to read. But, here's the best part, there's no way to raise the window to the top. So if another window ever gets on top of it, well, sorry, you're out of luck. And half of the themes always map the window at the very bottom of the
         <nobr>screen --</nobr> conveniently <i>under</i> my panel where I can't reach it. </p>
     <p> Resizing the window changes the aspect ratio of the video! Yeah, I'm sure someone has <i>ever</i> wanted that. </p>
@@ -64,9 +64,9 @@ RPMs</a>, and it sucks about the same as mplayer, and in about the same ways, th
     <p> Then I checked out <a href="http://www.dtek.chalmers.se/groups/dvd/">Ogle</a> again, and it hasn't been updated since the last time I tried, six months ago. It's a pretty decent DVD player, if you have the physical DVD. It does on-screen menus, and you can click on them with the mouse. But I don't need a DVD player (I have a hardware DVD player that works just fine.) It can't, as far as I can tell, play anything but actual discs. </p>
     <p> Oh, and even though I have libdvdcss installed (as evidenced by the fact that Ogle actually works) Xine won't play the same disc that Ogle will play. It seems to be claiming that the CSS stuff isn't installed, which it clearly is. </p>
     <p> An idiocy that all of these programs have in common is that, in addition to opening a window for the movie, and a window for the control panel, they <i>also</i> spray a constant spatter of curses crud on the terminal they were started from. I imagine at some point, there was some user who said, ``this program is pretty nice, but you know what it's missing? It's missing a lot of pointless chatter about what plugins and fonts have been loaded!'' </p>
-
+    
     <hr></hr><b>And here's the Random Commentary section:</b>
-
+    
     <blockquote> <b><a href="http://www.lazycat.org/">Makali</a> wrote:</b>
         <ul><i>
       Whenever a programmer thinks, "Hey, skins, what a cool idea", their
@@ -88,7 +88,7 @@ RPMs</a>, and it sucks about the same as mplayer, and in about the same ways, th
         <p> Really the only thing that's stopping me is that I fear the <a href="http://www.xemacs.org/">Emacs situation</a>. </p>
         <p> (By which I mean, ``Lack of a usable version thereof.'' No, running RMSmacs inside a terminal window doesn't qualify. Nor does running an X server on the Mac: if I were going to switch, why in the world would I continue inflicting the X Windows Disaster on myself? Wouldn't getting away from that be the <i>whole
     point?</i>) </p>
-
+        
         <ul><span size="-1"> (I understand there is an almost-functional Aqua version of <a href="http://fakehost/test/../hacks/why-cooperation-with-rms-is-impossible.mp3">
         RMSmacs</a> now. I'll probably check it out at some point, but the problem with <i><a href="http://fakehost/test/lemacs.html">me</a></i> switching from XEmacs to RMSmacs is that it would probably result in another <a href="http://slashdot.org/article.pl?sid=03/01/24/1440207">
         Slashdork</a> post, meaning I'd wake up to another 150+ poorly spelled flames in my inbox... I'm hoping for a Aquafied XEmacs, but I know that's not likely to happen any time soon.)</span>
@@ -96,7 +96,7 @@ RPMs</a>, and it sucks about the same as mplayer, and in about the same ways, th
             <nobr>question --</nobr> no matter how
             <nobr>simple --</nobr> results in someone suggesting that you either A) patch your kernel or B) change distros. It's inevitable and inescapable, like Hitler. </p>
     </blockquote>
-
+    
     <hr></hr>
     <p> <a href="http://fakehost/test/../"><img alt="[ up ]" onmouseout="this.src=&quot;../compass1.gif&quot;" onmouseover="this.src=&quot;../compass2.gif&quot;" src="http://fakehost/test/../compass1.gif"></img></a> </p>
 </div>
\ No newline at end of file