Merge 2dfa90e into 7405503

nextcloud · Oct 4, 2016 · e9bcbe0 · e9bcbe0
2 parents 7405503 + 2dfa90e
commit e9bcbe0
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 104 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit bootstrap="tests/bootstrap.php">
 	<filter>
-		<blacklist>
-			<directory suffix=".php">appinfo</directory>
-		</blacklist>
+		<whitelist>
+			<directory suffix=".php">controller</directory>
+			<directory suffix=".php">http</directory>
+			<exclude>
+				<directory suffix=".php">appinfo</directory>
+				<directory suffix=".php">templates</directory>
+			</exclude>
+		</whitelist>
 	</filter>
 	<testsuite name='unit'>
 		<directory suffix='.php'>tests/unit</directory>
 	</testsuite>
-</phpunit>
+</phpunit>
diff --git a/tests/travis/php.ini b/tests/travis/php.ini
diff --git a/tests/travis/travis-ci-apache-hhvm.conf b/tests/travis/travis-ci-apache-hhvm.conf
diff --git a/tests/travis/travis-ci-apache.conf b/tests/travis/travis-ci-apache.conf
diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh
diff --git a/tests/unit/data/EUROPE-BERLIN.ics b/tests/unit/data/EUROPE-BERLIN.ics
diff --git a/tests/unit/data/EUROPE-LONDON.ics b/tests/unit/data/EUROPE-LONDON.ics
diff --git a/tests/unit/data/vevent.ics b/tests/unit/data/vevent.ics
diff --git a/tests/unit/data/vfreebusy.ics b/tests/unit/data/vfreebusy.ics
diff --git a/tests/unit/data/vjournal.ics b/tests/unit/data/vjournal.ics
diff --git a/tests/unit/data/vtodo.ics b/tests/unit/data/vtodo.ics