Merge pull request #1035 from j0k3r/refactor

Tests are working again

diff --git a/.travis.yml b/.travis.yml
index 2971c5b9e8ba4cbf636465375ad2808570df56c2..1d90a7489b738ed7351f5ca2a3a4a58c7b2ece7b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,18 @@
 language: php
+
 php:
+  - 5.4
   - 5.5
+  - 5.6
+
 branches:
   only:
-    - refactor
\ No newline at end of file
+    - refactor
+
+before_script:
+  - composer self-update
+  - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
+script:
+  - ant -f app/build.xml prepare
+  - phpunit -c app  --coverage-text

diff --git a/app/build.xml b/app/build.xml
new file mode 100644 (file)
index 0000000..16ef73e
--- /dev/null
+++ b/app/build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="wallabag" default="build">
+    <target name="build" depends="prepare"/>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/app/cache"/>
+    </target>
+
+    <target name="prepare" depends="clean" description="Prepare for build">
+        <exec executable="composer">
+            <arg value="install"/>
+            <arg value="--dev"/>
+            <arg value="--no-interaction"/>
+            <arg value="--working-dir=.."/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/../app/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+</project>

diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
new file mode 100644 (file)
index 0000000..6593a2f
--- /dev/null
+++ b/app/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="bootstrap.php.cache"
+        >
+
+    <testsuites>
+        <testsuite name="wallabag Test Suite">
+            <directory>../src/Wallabag/CoreBundle/Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>../src</directory>
+            <exclude>
+                <directory>../vendor</directory>
+                <directory>../src/Acme</directory>
+                <directory>../src/AppBundle</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644 (file)
index a26ead3..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="wallabag Test Suite">
-            <directory>src/Wallabag/*Bundle/Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-            <exclude>
-                <directory>src/*Bundle/Resources</directory>
-                <directory>src/*Bundle/Tests</directory>
-                <directory>src/*/*Bundle/Resources</directory>
-                <directory>src/*/*Bundle/Tests</directory>
-                <directory>src/*/Bundle/*Bundle/Resources</directory>
-                <directory>src/*/Bundle/*Bundle/Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
index af20f31f10208ab8c723ba80592c6444289a1371..786ff811795bca28005c8c41ff110f6762d48df0 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
@@ -10,9 +10,8 @@ class EntryControllerTest extends WebTestCase
     {
         $client = static::createClient();
 
-        $crawler = $client->request('GET', '/app/index');
+        $crawler = $client->request('GET', '/new');
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertTrue($crawler->filter('html:contains("Homepage")')->count() > 0);
     }
 }