diff options
author | Olivier Paroz <github@oparoz.com> | 2015-09-21 21:12:06 +0300 |
---|---|---|
committer | Olivier Paroz <github@oparoz.com> | 2015-09-21 21:12:06 +0300 |
commit | 9a5d68490b702cd2027d5d59a5f2a8117b81f912 (patch) | |
tree | 2d38d068ef701d009bd0ef3b95b9e4cf6d34b20d /tests | |
parent | 4da30c0367b443c418b81e298252e8a744b5a49c (diff) |
Move background colour to design section
Fixes the bug where it was impossible to get the parent folder's description
Diffstat (limited to 'tests')
-rw-r--r-- | tests/_data/bom-gallery.cnf | 9 | ||||
-rw-r--r-- | tests/_data/broken-gallery.cnf | 6 | ||||
-rw-r--r-- | tests/_data/design-gallery.cnf | 5 | ||||
-rw-r--r-- | tests/_data/sharer-gallery.cnf | 9 | ||||
-rw-r--r-- | tests/_data/tester-gallery.cnf | 9 | ||||
-rw-r--r-- | tests/unit/service/ConfigServiceTest.php | 3 |
6 files changed, 28 insertions, 13 deletions
diff --git a/tests/_data/bom-gallery.cnf b/tests/_data/bom-gallery.cnf index e45202e4..61af5fde 100644 --- a/tests/_data/bom-gallery.cnf +++ b/tests/_data/bom-gallery.cnf @@ -1,5 +1,11 @@ --- # Gallery configuration file +features: + external_shares: yes + native_svg: no +design: + background: "#ff9f00" + inherit: yes information: description: | # This is the official **Gallery** sample folder Contribute to this project [on Github](https://github.com/owncloud/gallery) @@ -9,6 +15,3 @@ sorting: type: date order: des inherit: yes -features: - external_shares: yes - native_svg: no
\ No newline at end of file diff --git a/tests/_data/broken-gallery.cnf b/tests/_data/broken-gallery.cnf index 62be49dc..e013570c 100644 --- a/tests/_data/broken-gallery.cnf +++ b/tests/_data/broken-gallery.cnf @@ -1,5 +1,8 @@ --- # Gallery configuration file +features: + external_shares yes + native_svg: no information: description: This is the official **Gallery** sample folder Contribute to this project [on Github](https://github.com/owncloud/gallery) @@ -9,6 +12,3 @@ sorting: type: date order: des inherit: yes -features: - external_shares: yes - native_svg: no
\ No newline at end of file diff --git a/tests/_data/design-gallery.cnf b/tests/_data/design-gallery.cnf new file mode 100644 index 00000000..6ecad29e --- /dev/null +++ b/tests/_data/design-gallery.cnf @@ -0,0 +1,5 @@ +--- +# Gallery configuration file +design: + background: "f3088d" + inherit: yes diff --git a/tests/_data/sharer-gallery.cnf b/tests/_data/sharer-gallery.cnf index 9fdf2c69..ccaf7701 100644 --- a/tests/_data/sharer-gallery.cnf +++ b/tests/_data/sharer-gallery.cnf @@ -1,5 +1,11 @@ --- # Gallery configuration file +features: + external_shares: yes + native_svg: yes +design: + background: "#000000" + inherit: yes information: description: This is the sharer collection copyright: Copyright 2015 [Acme](http://www.ubersecretsharer.ninja) @@ -8,6 +14,3 @@ sorting: type: name order: asc inherit: yes -features: - external_shares: yes - native_svg: yes
\ No newline at end of file diff --git a/tests/_data/tester-gallery.cnf b/tests/_data/tester-gallery.cnf index 5d4a8910..b1448840 100644 --- a/tests/_data/tester-gallery.cnf +++ b/tests/_data/tester-gallery.cnf @@ -1,5 +1,11 @@ --- # Gallery configuration file +features: + external_shares: yes + native_svg: no +design: + background: "#ff9f00" + inherit: yes information: description: | # This is the official **Gallery** sample folder Contribute to this project [on Github](https://github.com/owncloud/gallery) @@ -9,6 +15,3 @@ sorting: type: date order: des inherit: yes -features: - external_shares: yes - native_svg: no
\ No newline at end of file diff --git a/tests/unit/service/ConfigServiceTest.php b/tests/unit/service/ConfigServiceTest.php index a44e275f..1f8d9850 100644 --- a/tests/unit/service/ConfigServiceTest.php +++ b/tests/unit/service/ConfigServiceTest.php @@ -50,7 +50,8 @@ class ConfigServiceTest extends \Test\GalleryUnitTest { $folder = $this->mockFolder('home::user', $nodeId, $files); $configName = 'gallery.cnf'; $config = []; - $configItems = ['information' => false, 'sorting' => false]; // Default in the class + // Default in the class + $configItems = ['design' => false, 'information' => false, 'sorting' => false]; $level = 0; $configPath = 'Some/folder'; $exception = new ConfigException('Boom'); |