[Tests] Rely on the new library cache system (#212)

egeloen · May 27, 2017 · 7bf61dd · 7bf61dd
1 parent de44267
commit 7bf61dd
Show file tree

Hide file tree

Showing 29 changed files with 21 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,8 @@ php:
     - 7.1
     - hhvm
 
+dist: trusty
+
 branches:
     only: master
 

diff --git a/Tests/.cache/-/6/eOVICXPxdutNXHow1GQW b/Tests/.cache/-/6/eOVICXPxdutNXHow1GQW
diff --git a/Tests/.cache/4/L/4l5x4IBHGaCTaz-pOxbI b/Tests/.cache/4/L/4l5x4IBHGaCTaz-pOxbI
diff --git a/Tests/.cache/6/Y/HvUKmUNJ-sn--mK-kiwb b/Tests/.cache/6/Y/HvUKmUNJ-sn--mK-kiwb
diff --git a/Tests/.cache/8/F/q6vDVpHMAKQKudk5AVvf b/Tests/.cache/8/F/q6vDVpHMAKQKudk5AVvf
diff --git a/Tests/.cache/8/N/l+Beu6bTdNtstpNhrShe b/Tests/.cache/8/N/l+Beu6bTdNtstpNhrShe
diff --git a/Tests/.cache/9/3/T0UhcBzXT5-mc4rTMHtg b/Tests/.cache/9/3/T0UhcBzXT5-mc4rTMHtg
diff --git a/Tests/.cache/D/B/P26siEGrVmmP6uJN7CNT b/Tests/.cache/D/B/P26siEGrVmmP6uJN7CNT
diff --git a/Tests/.cache/E/O/EEKLfKV5f6P3Tw36oLwW b/Tests/.cache/E/O/EEKLfKV5f6P3Tw36oLwW
diff --git a/Tests/.cache/F/Y/zG+eEMTpmmNSiZqU6VY9 b/Tests/.cache/F/Y/zG+eEMTpmmNSiZqU6VY9
diff --git a/Tests/.cache/H/V/tJcDMEEcxETAJbcaor0v b/Tests/.cache/H/V/tJcDMEEcxETAJbcaor0v
diff --git a/Tests/.cache/I/B/OhN+C1MSYhT54DiipGEU b/Tests/.cache/I/B/OhN+C1MSYhT54DiipGEU
diff --git a/Tests/.cache/J/-/WSf9XX1PnKs4k4B87DL- b/Tests/.cache/J/-/WSf9XX1PnKs4k4B87DL-
diff --git a/Tests/.cache/K/6/3JZNgY9EsG41HesW4Dd+ b/Tests/.cache/K/6/3JZNgY9EsG41HesW4Dd+
diff --git a/Tests/.cache/K/T/LuEKSXutvU2RAjClXdGp b/Tests/.cache/K/T/LuEKSXutvU2RAjClXdGp
diff --git a/Tests/.cache/M/X/m-qdXisCX3tSXC0YBMq0 b/Tests/.cache/M/X/m-qdXisCX3tSXC0YBMq0
diff --git a/Tests/.cache/N/S/mSFWdEGYV7vtkTKJ7AJp b/Tests/.cache/N/S/mSFWdEGYV7vtkTKJ7AJp
diff --git a/Tests/.cache/O/K/YKVYFYS0F9tUgEHl+866 b/Tests/.cache/O/K/YKVYFYS0F9tUgEHl+866
diff --git a/Tests/.cache/Q/S/BODtMci3fW4rCnvwuFh2 b/Tests/.cache/Q/S/BODtMci3fW4rCnvwuFh2
diff --git a/Tests/.cache/V/L/p0HNdxtsXRWaANlim5vX b/Tests/.cache/V/L/p0HNdxtsXRWaANlim5vX
diff --git a/Tests/.cache/W/T/dYsDwPULlx1WrIut8Z5R b/Tests/.cache/W/T/dYsDwPULlx1WrIut8Z5R
diff --git a/Tests/.cache/W/T/rW2QoPXYECnybWoOQnn9 b/Tests/.cache/W/T/rW2QoPXYECnybWoOQnn9
diff --git a/Tests/.cache/X/-/lth79u5gGduZBIba8F3L b/Tests/.cache/X/-/lth79u5gGduZBIba8F3L
diff --git a/Tests/.cache/Z/-/XKSIw6zElLM5zUKQbuaJ b/Tests/.cache/Z/-/XKSIw6zElLM5zUKQbuaJ
diff --git a/Tests/autoload.php b/Tests/autoload.php
@@ -9,6 +9,14 @@
  * file that was distributed with this source code.
  */
 
+if (isset($_SERVER['CACHE_PATH'])) {
+    $_SERVER['CACHE_PATH'] = __DIR__.'/../'.$_SERVER['CACHE_PATH'];
+
+    if (isset($_SERVER['CACHE_RESET']) && $_SERVER['CACHE_RESET']) {
+        exec('rm -rf '.$_SERVER['CACHE_PATH'].'/*');
+    }
+}
+
 require_once __DIR__.'/../vendor/autoload.php';
 
 \PHPUnit_Extensions_Selenium2TestCase::shareSession(true);
diff --git a/composer.json b/composer.json
@@ -13,12 +13,12 @@
     "require": {
         "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.7|^3.0",
-        "egeloen/google-map": "^2.0"
+        "egeloen/google-map": "^2.0.2"
     },
     "require-dev": {
         "egeloen/serializer-bundle": "^1.0",
         "friendsofphp/php-cs-fixer": "^2.0",
-        "php-http/cache-plugin": "^1.2",
+        "php-http/cache-plugin": "^1.4",
         "php-http/guzzle6-adapter": "^1.0",
         "phpunit/phpunit": "^5.4",
         "phpunit/phpunit-selenium": "dev-master",

diff --git a/phpunit.ci.xml b/phpunit.ci.xml
@@ -7,9 +7,10 @@
         </testsuite>
     </testsuites>
     <php>
-        <server name="API_KEY" value="AIzaSyDKaDeZ6PvKb3RqgIaFeKSSdVRtLc9jM1I" />
-        <server name="API_SECRET" value="zKAvb7nwW1TnJZtfXWC9Y_uUDU4" />
+        <server name="API_KEY" value="AIzaSyAbfXoOk_L4Ryk6aFvdqeAJvbg1ShYiqAE" />
+        <server name="API_SECRET" value="78BBhyDNOeFG_PWqHi6XUJ3woJE=" />
         <server name="BROWSER_NAME" value="chrome" />
+        <server name="CACHE_PATH" value="Tests/.cache" />
     </php>
     <filter>
         <whitelist>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,10 +7,12 @@
         </testsuite>
     </testsuites>
     <php>
-        <server name="API_KEY" value="AIzaSyDKaDeZ6PvKb3RqgIaFeKSSdVRtLc9jM1I" />
-        <server name="API_SECRET" value="zKAvb7nwW1TnJZtfXWC9Y_uUDU4" />
+        <server name="API_KEY" value="AIzaSyAbfXoOk_L4Ryk6aFvdqeAJvbg1ShYiqAE" />
+        <server name="API_SECRET" value="78BBhyDNOeFG_PWqHi6XUJ3woJE=" />
         <server name="BROWSER_NAME" value="chrome" />
         <server name="SELENIUM_HOST" value="selenium" />
+        <server name="CACHE_PATH" value="Tests/.cache" />
+        <server name="CACHE_RESET" value="false" />
     </php>
     <filter>
         <whitelist>

diff --git a/travis/install.sh b/travis/install.sh
@@ -18,8 +18,8 @@ fi
 export DISPLAY=:99
 /sbin/start-stop-daemon -Sbmq -p /tmp/xvfb_99.pid -x /usr/bin/Xvfb -- ${DISPLAY} -ac -screen 0, 1600x1200x24
 
-curl http://selenium-release.storage.googleapis.com/2.48/selenium-server-standalone-2.48.0.jar > selenium.jar
-curl http://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip > chromedriver.zip
+curl https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar > selenium.jar
+curl https://chromedriver.storage.googleapis.com/2.25/chromedriver_linux64.zip > chromedriver.zip
 unzip chromedriver.zip
 
 java -jar selenium.jar -Dwebdriver.chrome.driver=./chromedriver > /dev/null 2>&1 &