Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable9] Add theming information to capabilities for the client #1281

Merged
merged 5 commits into from
Sep 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/theming/appinfo/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@
]
);

$app = new \OCP\AppFramework\App('theming');
$app->getContainer()->registerCapability('OCA\Theming\Capabilities');
60 changes: 60 additions & 0 deletions apps/theming/lib/capabilities.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?php
/**
* @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\Theming;

use OCP\Capabilities\ICapability;

/**
* Class Capabilities
*
* @package OCA\Theming
*/
class Capabilities implements ICapability {

/** @var Template */
protected $theming;

/**
* @param Template $theming
*/
public function __construct(Template $theming) {
$this->theming = $theming;
}

/**
* Return this classes capabilities
*
* @return array
*/
public function getCapabilities() {
return [
'theming' => [
'name' => $this->theming->getName(),
'url' => $this->theming->getBaseUrl(),
'slogan' => $this->theming->getSlogan(),
'color' => $this->theming->getMailHeaderColor(),
],
];
}
}
92 changes: 92 additions & 0 deletions apps/theming/tests/CapabilitiesTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?php
/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\Theming\Tests;

use OCA\Theming\Capabilities;
use OCA\Theming\Template;
use Test\TestCase;

/**
* Class CapabilitiesTest
*
* @group DB
* @package OCA\Theming\Tests
*/
class CapabilitiesTest extends TestCase {
/** @var Template|\PHPUnit_Framework_MockObject_MockObject */
protected $theming;

/** @var Capabilities */
protected $capabilities;

protected function setUp() {
parent::setUp();

$this->theming = $this->getMockBuilder('OCA\Theming\Template')
->disableOriginalConstructor()
->getMock();

$this->capabilities = new Capabilities($this->theming);
}

public function dataGetCapabilities() {
return [
['name', 'url', 'slogan', 'color', [
'name' => 'name',
'url' => 'url',
'slogan' => 'slogan',
'color' => 'color',
]],
['name1', 'url2', 'slogan3', 'color4', [
'name' => 'name1',
'url' => 'url2',
'slogan' => 'slogan3',
'color' => 'color4',
]],
];
}

/**
* @dataProvider dataGetCapabilities
* @param string $name
* @param string $url
* @param string $slogan
* @param string $color
* @param string[] $expected
*/
public function testGetCapabilities($name, $url, $slogan, $color, array $expected) {
$this->theming->expects($this->once())
->method('getName')
->willReturn($name);
$this->theming->expects($this->once())
->method('getBaseUrl')
->willReturn($url);
$this->theming->expects($this->once())
->method('getSlogan')
->willReturn($slogan);
$this->theming->expects($this->once())
->method('getMailHeaderColor')
->willReturn($color);

$this->assertEquals(['theming' => $expected], $this->capabilities->getCapabilities());
}
}
72 changes: 72 additions & 0 deletions apps/theming/tests/ServicesTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php
/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\Theming\Tests;

use OCP\AppFramework\App;
use Test\TestCase;

/**
* Class ServicesTest
*
* @group DB
* @package OCA\Theming\Tests
*/
class ServicesTest extends TestCase {
/** @var \OCA\Activity\AppInfo\Application */
protected $app;

/** @var \OCP\AppFramework\IAppContainer */
protected $container;

protected function setUp() {
parent::setUp();
$this->app = new App('theming');
$this->container = $this->app->getContainer();
}

public function queryData() {
return [
['OCP\IL10N'],

// lib/
['OCA\Theming\Capabilities'],
['OCA\Theming\Capabilities', 'OCP\Capabilities\ICapability'],
['OCA\Theming\Template'],
['OCA\Theming\Template', 'OC_Defaults'],

// controller/
['OCA\Theming\Controller\ThemingController'],
];
}

/**
* @dataProvider queryData
* @param string $service
* @param string $expected
*/
public function testContainerQuery($service, $expected = null) {
if ($expected === null) {
$expected = $service;
}
$this->assertTrue($this->container->query($service) instanceof $expected);
}
}