Merge branch 'master' into fix/video-export

diff --cc app/Entities/ExportService.php
Simple merge

diff --cc tests/Entity/ExportTest.php
index 5f60c6671730b11bf88543bac3afa0b17f03f65f,fdcd833665d267f380631110fc2fc51a7a6b6f27..9228c3bad0655e2549ebaf8596642421ea1b4552
--- 1/tests/Entity/ExportTest.php
--- 2/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@@ -109,30 -109,29 +109,52 @@@ class ExportTest extends TestCas
          $resp->assertStatus(200);
          $resp->assertSee($chapter->name);
          $resp->assertSee($page->name);
-         $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html');
+         $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
+     }
+ 
+     public function test_page_html_export_contains_custom_head_if_set()
+     {
+         $page = Page::first();
+ 
+         $customHeadContent = "<style>p{color: red;}</style>";
+         $this->setSettings(['app-custom-head' => $customHeadContent]);
+ 
+         $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+         $resp->assertSee($customHeadContent);
+     }
+ 
+     public function test_page_html_export_use_absolute_dates()
+     {
+         $page = Page::first();
+ 
+         $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+         $resp->assertSee($page->created_at->toDayDateTimeString());
+         $resp->assertDontSee($page->created_at->diffForHumans());
+         $resp->assertSee($page->updated_at->toDayDateTimeString());
+         $resp->assertDontSee($page->updated_at->diffForHumans());
      }
  
 +    public function test_html_export_media_protocol_updated()
 +    {
 +        $page = Page::first();
 +        $page->html = '<p id="bkmrk-%C2%A0-0">&nbsp;</p><p id="bkmrk-%C2%A0-1"><iframe src="//www.youtube.com/embed/LkFt_fp7FmE" width="560" height="314" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk-"><iframe src="//player.vimeo.com/video/276396369?title=0&amp;amp;byline=0" width="425" height="350" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk--0"><iframe style="border: 0;" src="//maps.google.com/embed?testquery=true" width="600" height="450" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk--1"><iframe src="//www.dailymotion.com/embed/video/x2rqgfm" width="480" height="432" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p><p id="bkmrk-%C2%A0-2">&nbsp;</p>';
 +        $page->save();
 +
 +        $this->asEditor();
 +        $resp = $this->get($page->getUrl('/export/html'));
 +        $resp->assertStatus(200);
 +
 +        $checks = [
 +            'https://www.youtube.com/embed/LkFt_fp7FmE',
 +            'https://player.vimeo.com/video/276396369?title=0&amp;amp;byline=0',
 +            'https://maps.google.com/embed?testquery=true',
 +            'https://www.dailymotion.com/embed/video/x2rqgfm',
 +        ];
 +
 +        foreach ($checks as $check) {
 +            $resp->assertSee($check);
 +        }
 +
 +    }
 +
  }