summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2015-07-02 13:42:55 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2015-07-02 13:42:55 +0200
commitc061497eca961e9f98492c148a27feb6b2ab5476 (patch)
tree703d199b912aa92cb8c48f94e89926db537ca415 /tests
parent61a60ffd4783de4e55d9a8a0c6604c857004a2e6 (diff)
downloadnextcloud-server-c061497eca961e9f98492c148a27feb6b2ab5476.tar.gz
nextcloud-server-c061497eca961e9f98492c148a27feb6b2ab5476.zip
Only run some preview unit tets if imagemagick is available
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/preview.php4
-rw-r--r--tests/lib/preview/provider.php1
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index ca7fa6987d6..82ee8e2eca2 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -287,6 +287,7 @@ class Preview extends TestCase {
/**
* Tests if a preview of max dimensions gets created
*
+ * @requires extension imagick
* @dataProvider dimensionsDataProvider
*
* @param int $sampleId
@@ -358,6 +359,7 @@ class Preview extends TestCase {
/**
* Tests if the second preview will be based off the cached max preview
*
+ * @requires extension imagick
* @dataProvider dimensionsDataProvider
*
* @param int $sampleId
@@ -443,6 +445,7 @@ class Preview extends TestCase {
* so we should be getting either the max preview or a preview the size
* of the dimensions set in the config
*
+ * @requires extension imagick
* @dataProvider aspectDataProvider
*
* @param int $sampleId
@@ -499,6 +502,7 @@ class Preview extends TestCase {
* 200-200 ✓
* 300-188-with-aspect
*
+ * @requires extension imagick
* @dataProvider aspectDataProvider
*
* @param int $sampleId
diff --git a/tests/lib/preview/provider.php b/tests/lib/preview/provider.php
index 62b5dde5ec6..02459b83bb3 100644
--- a/tests/lib/preview/provider.php
+++ b/tests/lib/preview/provider.php
@@ -85,6 +85,7 @@ abstract class Provider extends \Test\TestCase {
* Launches all the tests we have
*
* @dataProvider dimensionsDataProvider
+ * @requires extension imagick
*
* @param int $widthAdjustment
* @param int $heightAdjustment