diff options
| author | Roeland Douma <rullzer@users.noreply.github.com> | 2015-07-22 09:34:31 +0200 |
|---|---|---|
| committer | Roeland Douma <rullzer@users.noreply.github.com> | 2015-07-22 09:34:31 +0200 |
| commit | d37b8969f462a1c4c626a77584bb43929d659113 (patch) | |
| tree | e1aa4f9a6f43df007bfbd6f9e78d7a262bf9c7a2 | |
| parent | 2d691c2fb4f00558f4bac55fb9c6b23b85b416c5 (diff) | |
| parent | c061497eca961e9f98492c148a27feb6b2ab5476 (diff) | |
| download | nextcloud-server-d37b8969f462a1c4c626a77584bb43929d659113.tar.gz nextcloud-server-d37b8969f462a1c4c626a77584bb43929d659113.zip | |
Merge pull request #17342 from rullzer/test_preview_conditions
Only run some preview unit tets if imagemagick is available
| -rw-r--r-- | tests/lib/preview.php | 4 | ||||
| -rw-r--r-- | tests/lib/preview/provider.php | 1 |
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 |