tmp

ArthurHoaro · Sep 29, 2020 · 35354bc · 35354bc
1 parent 6e8d981
commit 35354bc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-        colors="true"
-        bootstrap="./tests/bootstrap.php">
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/WebThumbnailer/</directory>
-            <directory suffix=".php">tests/WebThumbnailer/</directory>
-        </whitelist>
-    </filter>
-    <testsuites>
-        <testsuite name="AllTests">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <log type="coverage-html" target="coverage" lowUpperBound="30" highLowerBound="80"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-        <log type="coverage-clover" target="coverage/logs/clover.xml"/>
-    </logging>
-    <php>
-        <const name="WEB_SERVER_HOST" value="localhost" />
-        <const name="WEB_SERVER_PORT" value="8081" />
-        <const name="WEB_SERVER_DOCROOT" value="./tests/public" />
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true" bootstrap="./tests/bootstrap.php">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src/WebThumbnailer/</directory>
+      <directory suffix=".php">tests/WebThumbnailer/</directory>
+    </include>
+    <report>
+      <clover outputFile="coverage/logs/clover.xml"/>
+      <html outputDirectory="coverage" lowUpperBound="30" highLowerBound="80"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="AllTests">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <php>
+    <const name="WEB_SERVER_HOST" value="localhost"/>
+    <const name="WEB_SERVER_PORT" value="8081"/>
+    <const name="WEB_SERVER_DOCROOT" value="./tests/public"/>
+  </php>
 </phpunit>
diff --git a/tests/WebThumbnailer/WebThumbnailerTest.php b/tests/WebThumbnailer/WebThumbnailerTest.php
@@ -94,9 +94,8 @@ public function testDirectImageWithoutExtension()
      */
     public function testOpenGraphImage()
     {
-        $image = 'default/le-monde.png';
-        $this->regenerate($image);
-        $expected = self::$regenerated . $image;
+        $image = 'default/le-monde.jpg';
+        $expected = self::$expected . $image;
         $url = self::LOCAL_SERVER . 'default/le-monde.html';
         $wt = new WebThumbnailer();
         $thumb = $wt->thumbnail($url);

diff --git a/tests/WebThumbnailer/resources/expected-thumbs/default/le-monde.jpg b/tests/WebThumbnailer/resources/expected-thumbs/default/le-monde.jpg