4 files changed, 29 insertions, 39 deletions

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 1da778f4..26a23f54 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -18,3 +18,5 @@ parameters:
 
     # A secret key that's used to generate certain security-related tokens
     secret:            ThisTokenIsNotSoSecretChangeIt
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cede1cea..19c1ece3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,27 +1,34 @@
 <?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="vendor/autoload.php"
+<!-- 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"
+                 bootstrap="bootstrap.php.cache"
                 >
 
         <testsuites>
                 <testsuite name="wallabag Test Suite">
-                        <directory>tests</directory>
+                        <directory>../src/*/*Bundle/Tests</directory>
+                        <directory>../src/*/Bundle/*Bundle/Tests</directory>
+                        <directory>../src/*Bundle/Tests</directory>
                 </testsuite>
         </testsuites>
 
         <filter>
                 <whitelist>
-                        <directory>inc</directory>
+                        <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>
+</phpunit>
\ No newline at end of file
diff --git a/tests/Wallabag/Wallabag/Tests/EntryTest.php b/tests/Wallabag/Wallabag/Tests/EntryTest.php
deleted file mode 100644
index dfff9fd4..00000000
--- a/tests/Wallabag/Wallabag/Tests/EntryTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * wallabag, self hostable application allowing you to not miss any content anymore
- *
- * @category   wallabag
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
- * @copyright  2013
- * @license    http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace wallabag\wallabag\Tests;
-
-class EntryTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCreateUser()
-    {
-        $this->assertTrue(true);
-    }
-}
diff --git a/web/app_dev.php b/web/app_dev.php
index e0279c2a..d3e3b473 100644
--- a/web/app_dev.php
+++ b/web/app_dev.php
@@ -9,13 +9,13 @@ use Symfony\Component\Debug\Debug;
 
 // This check prevents access to debug front controllers that are deployed by accident to production servers.
 // Feel free to remove this, extend it, or make something more sophisticated.
-if (isset($_SERVER['HTTP_CLIENT_IP'])
-    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
-) {
-    header('HTTP/1.0 403 Forbidden');
-    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
-}
+//if (isset($_SERVER['HTTP_CLIENT_IP'])
+//    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+//    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
+//) {
+//    header('HTTP/1.0 403 Forbidden');
+//    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+//}
 
 $loader = require_once __DIR__.'/../app/bootstrap.php.cache';
 Debug::enable();