aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--phpunit.xml.dist33
-rw-r--r--tests/Wallabag/Wallabag/Tests/EntryTest.php19
-rw-r--r--web/app_dev.php14
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:
18 18
19 # A secret key that's used to generate certain security-related tokens 19 # A secret key that's used to generate certain security-related tokens
20 secret: ThisTokenIsNotSoSecretChangeIt 20 secret: ThisTokenIsNotSoSecretChangeIt
21
22 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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2 2
3 <phpunit backupGlobals="false" 3<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
4 backupStaticAttributes="false" 4
5 colors="true" 5<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6 convertErrorsToExceptions="true" 6 xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
7 convertNoticesToExceptions="true" 7 backupGlobals="false"
8 convertWarningsToExceptions="true" 8 colors="true"
9 processIsolation="false" 9 bootstrap="bootstrap.php.cache"
10 stopOnFailure="false"
11 syntaxCheck="false"
12 bootstrap="vendor/autoload.php"
13 > 10 >
14 11
15 <testsuites> 12 <testsuites>
16 <testsuite name="wallabag Test Suite"> 13 <testsuite name="wallabag Test Suite">
17 <directory>tests</directory> 14 <directory>../src/*/*Bundle/Tests</directory>
15 <directory>../src/*/Bundle/*Bundle/Tests</directory>
16 <directory>../src/*Bundle/Tests</directory>
18 </testsuite> 17 </testsuite>
19 </testsuites> 18 </testsuites>
20 19
21 <filter> 20 <filter>
22 <whitelist> 21 <whitelist>
23 <directory>inc</directory> 22 <directory>../src</directory>
23 <exclude>
24 <directory>../src/*Bundle/Resources</directory>
25 <directory>../src/*Bundle/Tests</directory>
26 <directory>../src/*/*Bundle/Resources</directory>
27 <directory>../src/*/*Bundle/Tests</directory>
28 <directory>../src/*/Bundle/*Bundle/Resources</directory>
29 <directory>../src/*/Bundle/*Bundle/Tests</directory>
30 </exclude>
24 </whitelist> 31 </whitelist>
25 </filter> 32 </filter>
26 33
27</phpunit> 34</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 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas LÅ“uillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11namespace wallabag\wallabag\Tests;
12
13class EntryTest extends \PHPUnit_Framework_TestCase
14{
15 public function testCreateUser()
16 {
17 $this->assertTrue(true);
18 }
19}
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;
9 9
10// This check prevents access to debug front controllers that are deployed by accident to production servers. 10// This check prevents access to debug front controllers that are deployed by accident to production servers.
11// Feel free to remove this, extend it, or make something more sophisticated. 11// Feel free to remove this, extend it, or make something more sophisticated.
12if (isset($_SERVER['HTTP_CLIENT_IP']) 12//if (isset($_SERVER['HTTP_CLIENT_IP'])
13 || isset($_SERVER['HTTP_X_FORWARDED_FOR']) 13// || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
14 || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server') 14// || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
15) { 15//) {
16 header('HTTP/1.0 403 Forbidden'); 16// header('HTTP/1.0 403 Forbidden');
17 exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); 17// exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
18} 18//}
19 19
20$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; 20$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
21Debug::enable(); 21Debug::enable();