Merge branch 'master' of github.com:tinify/wordpress-plugin

Author: Frank Evers

config/Dockerfile-phantomjs

@@ -1,17 +1,5 @@
-FROM ubuntu:14.04
+FROM servebox/phantomjs:latest
 
 EXPOSE 8910
 
-ENV PHANTOM_JS_VERSION 1.9.7-linux-x86_64
-
-RUN apt-get update
-RUN apt-get install -yqq curl libfreetype6 libfontconfig
-  # make ruby python git g++ flex bison gperf perl \
-  # libfontconfig1-dev libicu-dev libfreetype6 \
-  # libssl-dev libpng-dev libjpeg-dev
-# RUN git clone git://github.com/ariya/phantomjs.git && cd phantomjs && ./build.sh && send "y\n"
-
-RUN curl -sSL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$PHANTOM_JS_VERSION.tar.bz2 | tar xjC /
-RUN ln -s phantomjs-$PHANTOM_JS_VERSION /phantomjs
-
-CMD ["/phantomjs/bin/phantomjs", "--webdriver=8910"]
+CMD ["phantomjs", "--webdriver=8910"]

test/unit/TinyPluginTest.php

@@ -115,7 +115,7 @@ public function testCompressShouldUpdateMetadata() {
 
         $metadata = $this->wp->getMetadata(1, 'tiny_compress_images', true);
         foreach ($metadata as $key => $values) {
-            $this->assertEquals(time(), $values['end'], 2);
+            $this->assertBetween(-1, +1, $values['end'] - time());
             unset($metadata[$key]['end']);
             unset($metadata[$key]['start']);
         }

test/unit/TinyTestCase.php

@@ -27,4 +27,9 @@ protected function setUp() {
 
     protected function tearDown() {
     }
+
+    protected function assertBetween($lower_bound, $upper_bound, $actual, $message='') {
+        $this->assertGreaterThanOrEqual($lower_bound, $actual, $message);
+        $this->assertLessThanOrEqual($upper_bound, $actual, $message);
+    }
 }