tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get some more tests working 

Updating config and i18n calls
This commit is contained in:
Werner M. Krauß 2017-05-30 17:35:02 +02:00
parent 492f437589
commit 997459caf3
12 changed files with 152 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_config/extensions.yml
View File

@ -36,10 +36,6 @@ SilverStripe\SiteConfig\SiteConfig:
extensions:
- SilverStripe\Subsites\Extensions\SiteConfigSubsites
SilverStripe\Reports\Report:
extensions:
- SilverStripe\Subsites\SubsiteReportWrapper
SilverStripe\AssetAdmin\Controller\AssetAdmin:
extensions:
- SilverStripe\Subsites\Extensions\SubsiteMenuExtension

5
code/extensions/GroupSubsites.php
View File

@ -42,8 +42,11 @@ class GroupSubsites extends DataExtension implements PermissionProvider
*/
public function requireDefaultRecords()
{
if (!$this->owner) {
return;
}
// Migration for Group.SubsiteID data from when Groups only had a single subsite
$schema = $this->owner->getSchema();
$schema = $this->owner::getSchema();
$groupFields = DB::field_list($schema->tableName(Group::class));
// Detection of SubsiteID field is the trigger for old-style-subsiteID migration

4
code/model/Subsite.php
View File

@ -186,8 +186,8 @@ class Subsite extends DataObject
Session::set('SubsiteID', (int)$subsiteID);
// Set locale
if (is_object($subsite) && $subsite->Language != '') {
$locale = i18n::get_locale_from_lang($subsite->Language);
if (is_object($subsite) && $subsite->Language !== '') {
$locale = (new IntlLocales())->localeFromLang($subsite->Language);
if ($locale) {
i18n::set_locale($locale);
}

6
code/pages/SubsitesVirtualPage.php
View File

@ -100,7 +100,7 @@ class SubsitesVirtualPage extends VirtualPage
TextareaField::create(
'CustomMetaKeywords',
$this->fieldLabel('CustomMetaTitle')
)->setDescription(_t('SubsitesVirtualPage.OverrideNote')),
)->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
'MetaKeywords'
);
$fields->addFieldToTab(
@ -108,7 +108,7 @@ class SubsitesVirtualPage extends VirtualPage
TextareaField::create(
'CustomMetaDescription',
$this->fieldLabel('CustomMetaTitle')
)->setDescription(_t('SubsitesVirtualPage.OverrideNote')),
)->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
'MetaDescription'
);
$fields->addFieldToTab(
@ -116,7 +116,7 @@ class SubsitesVirtualPage extends VirtualPage
TextField::create(
'CustomExtraMeta',
$this->fieldLabel('CustomMetaTitle')
)->setDescription(_t('SubsitesVirtualPage.OverrideNote')),
)->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
'ExtraMeta'
);

4
tests/php/GroupSubsitesTest.php
View File

@ -14,8 +14,8 @@ class GroupSubsitesTest extends BaseSubsiteTest
protected $requireDefaultRecordsFrom = [GroupSubsites::class];
public function testTrivialFeatures()
{
$this->assertTrue(is_array(singleton('GroupSubsites')->extraStatics()));
$this->assertTrue(is_array(singleton('GroupSubsites')->providePermissions()));
$this->assertTrue(is_array(singleton(GroupSubsites::class)->extraStatics()));
$this->assertTrue(is_array(singleton(GroupSubsites::class)->providePermissions()));
$this->assertTrue(singleton(Group::class)->getCMSFields() instanceof FieldList);
}

4
tests/php/LeftAndMainSubsitesTest.php
View File

@ -82,7 +82,7 @@ class LeftAndMainSubsitesTest extends FunctionalTest
public function testShouldChangeSubsite()
{
$l = new LeftAndMain();
Config::inst()->nest();
Config::nest();
Config::modify()->set(CMSPageEditController::class, 'treats_subsite_0_as_global', false);
$this->assertTrue($l->shouldChangeSubsite(CMSPageEditController::class, 0, 5));
@ -96,6 +96,6 @@ class LeftAndMainSubsitesTest extends FunctionalTest
$this->assertTrue($l->shouldChangeSubsite(CMSPageEditController::class, 1, 5));
$this->assertFalse($l->shouldChangeSubsite(CMSPageEditController::class, 1, 1));
Config::inst()->unnest();
Config::unnest();
}
}

1
tests/php/SiteConfigSubsitesTest.php
View File

@ -6,7 +6,6 @@ use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Subsites\Extensions\SiteConfigSubsites;
use SilverStripe\Subsites\Model\Subsite;
class SiteConfigSubsitesTest extends BaseSubsiteTest
{
public static $fixture_file = 'subsites/tests/php/SubsiteTest.yml';

66
tests/php/SiteTreeSubsitesTest.php
View File

@ -2,22 +2,22 @@
namespace SilverStripe\Subsites\Tests;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Forms\FieldList;
use SilverStripe\CMS\Model\ErrorPage;
use SilverStripe\Core\Config\Config;
use SilverStripe\Security\Member;
use SilverStripe\Control\Session;
use SilverStripe\Control\Director;
use Page;
use SilverStripe\CMS\Controllers\CMSMain;
use SilverStripe\CMS\Model\ErrorPage;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Director;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Convert;
use SilverStripe\Versioned\Versioned;
use SilverStripe\Dev\TestOnly;
use SilverStripe\Forms\FieldList;
use SilverStripe\Security\Member;
use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
use SilverStripe\Subsites\Model\Subsite;
use SilverStripe\Subsites\Pages\SubsitesVirtualPage;
use SilverStripe\Versioned\Versioned;
class SiteTreeSubsitesTest extends BaseSubsiteTest
{
@ -34,7 +34,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
SiteTree::class => ['Translatable']
];
public function testPagesInDifferentSubsitesCanShareURLSegment() {
public function testPagesInDifferentSubsitesCanShareURLSegment()
{
$subsiteMain = $this->objFromFixture(Subsite::class, 'main');
$subsite1 = $this->objFromFixture(Subsite::class, 'subsite1');
@ -64,7 +65,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
);
}
public function testBasicSanity() {
public function testBasicSanity()
{
$this->assertTrue(singleton(SiteTree::class)->getSiteConfig() instanceof SiteConfig);
// The following assert is breaking in Translatable.
$this->assertTrue(singleton(SiteTree::class)->getCMSFields() instanceof FieldList);
@ -72,7 +74,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$this->assertTrue(is_array(singleton(SiteTreeSubsites::class)->extraStatics()));
}
public function testErrorPageLocations() {
public function testErrorPageLocations()
{
$subsite1 = $this->objFromFixture(Subsite::class, 'domaintest1');
Subsite::changeSubsite($subsite1->ID);
@ -127,7 +130,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
/**
* Similar to {@link SubsitesVirtualPageTest->testSubsiteVirtualPageCanHaveSameUrlsegmentAsOtherSubsite()}.
*/
public function testTwoPagesWithSameURLOnDifferentSubsites() {
public function testTwoPagesWithSameURLOnDifferentSubsites()
{
// Set up a couple of pages with the same URL on different subsites
$s1 = $this->objFromFixture(Subsite::class, 'domaintest1');
$s2 = $this->objFromFixture(Subsite::class, 'domaintest2');
@ -154,13 +158,14 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$this->assertEquals($p2->ID, SiteTree::get_by_link('test-page')->ID);
}
public function testPageTypesBlacklistInClassDropdown() {
public function testPageTypesBlacklistInClassDropdown()
{
$editor = $this->objFromFixture(Member::class, 'editor');
Session::set("loggedInAs", $editor->ID);
$s1 = $this->objFromFixture(Subsite::class, 'domaintest1');
$s2 = $this->objFromFixture(Subsite::class, 'domaintest2');
$page = singleton('SiteTree');
$page = singleton(SiteTree::class);
$s1->PageTypeBlacklist = 'SiteTreeSubsitesTest_ClassA,ErrorPage';
$s1->write();
@ -191,7 +196,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
);
}
public function testCopyToSubsite() {
public function testCopyToSubsite()
{
// Remove baseurl if testing in subdir
Config::modify()->set(Director::class, 'alternate_base_url', '/');
@ -218,7 +224,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$this->assertEquals('http://' . $domain . '/contact-us-2/', $contactPage2->AbsoluteLink());
}
public function testPageTypesBlacklistInCMSMain() {
public function testPageTypesBlacklistInCMSMain()
{
$editor = $this->objFromFixture(Member::class, 'editor');
Session::set("loggedInAs", $editor->ID);
@ -244,10 +251,12 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$this->assertNotContains('SiteTreeSubsitesTest_ClassA', $classes);
$this->assertNotContains('SiteTreeSubsitesTest_ClassB', $classes);
}
/**
* Tests that url segments between subsites don't conflict, but do conflict within them
*/
public function testValidateURLSegment() {
public function testValidateURLSegment()
{
$this->logInWithPermission('ADMIN');
// Saving existing page in the same subsite doesn't change urls
$mainHome = $this->objFromFixture('Page', 'home');
@ -267,7 +276,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$subsite1Home->write();
$this->assertEquals('home', $subsite1Home->URLSegment);
$subsite1Home->doPublish();
$subsite1HomeLive = Versioned::get_one_by_stage('Page', 'Live', sprintf('"SiteTree"."ID" = \'%d\'', $subsite1Home->ID));
$subsite1HomeLive = Versioned::get_one_by_stage('Page', 'Live',
sprintf('"SiteTree"."ID" = \'%d\'', $subsite1Home->ID));
$this->assertEquals('home', $subsite1HomeLive->URLSegment);
// Creating a new page in a subsite doesn't conflict with urls in other subsites
@ -280,7 +290,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$subsite1NewPage->write();
$this->assertEquals('important-page', $subsite1NewPage->URLSegment);
$subsite1NewPage->doPublish();
$subsite1NewPageLive = Versioned::get_one_by_stage('Page', 'Live', sprintf('"SiteTree"."ID" = \'%d\'', $subsite1NewPage->ID));
$subsite1NewPageLive = Versioned::get_one_by_stage('Page', 'Live',
sprintf('"SiteTree"."ID" = \'%d\'', $subsite1NewPage->ID));
$this->assertEquals('important-page', $subsite1NewPageLive->URLSegment);
// Creating a new page in a subsite DOES conflict with urls in the same subsite
@ -291,7 +302,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$subsite1NewPage2->write();
$this->assertEquals('important-page-2', $subsite1NewPage2->URLSegment);
$subsite1NewPage2->doPublish();
$subsite1NewPage2Live = Versioned::get_one_by_stage('Page', 'Live', sprintf('"SiteTree"."ID" = \'%d\'', $subsite1NewPage2->ID));
$subsite1NewPage2Live = Versioned::get_one_by_stage('Page', 'Live',
sprintf('"SiteTree"."ID" = \'%d\'', $subsite1NewPage2->ID));
$this->assertEquals('important-page-2', $subsite1NewPage2Live->URLSegment);
// Original page is left un-modified
@ -303,16 +315,19 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$this->assertEquals('important-page', $mainSubsiteImportantPage->URLSegment);
}
public function testCopySubsiteWithChildren() {
public function testCopySubsiteWithChildren()
{
$page = $this->objFromFixture('Page', 'about');
$newSubsite = $this->objFromFixture(Subsite::class, 'subsite1');
$moved = $page->duplicateToSubsite($newSubsite->ID, true);
$this->assertEquals($moved->SubsiteID, $newSubsite->ID, 'Ensure returned records are on new subsite');
$this->assertEquals($moved->AllChildren()->count(), $page->AllChildren()->count(), 'All pages are copied across');
$this->assertEquals($moved->AllChildren()->count(), $page->AllChildren()->count(),
'All pages are copied across');
}
public function testCopySubsiteWithoutChildren() {
public function testCopySubsiteWithoutChildren()
{
$page = $this->objFromFixture('Page', 'about');
$newSubsite = $this->objFromFixture(Subsite::class, 'subsite2');
@ -326,6 +341,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
class SiteTreeSubsitesTest_ClassA extends SiteTree implements TestOnly
{
}
class SiteTreeSubsitesTest_ClassB extends SiteTree implements TestOnly
{
}

4
tests/php/SubsiteAdminFunctionalTest.php
View File

@ -78,7 +78,7 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
$mainSubsitePage = $this->objFromFixture('Page', 'mainSubsitePage');
$subsite1Home = $this->objFromFixture('Page', 'subsite1_home');
Config::inst()->nest();
Config::nest();
Config::modify()->set(CMSPageEditController::class, 'treats_subsite_0_as_global', false);
Subsite::changeSubsite(0);
@ -96,7 +96,7 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
$this->assertNotEquals(Subsite::currentSubsiteID(), $mainSubsitePage->SubsiteID, 'Loading a main-site object does not change the subsite if configured with treats_subsite_0_as_global');
$this->assertRegExp("#^admin/pages.*#", $this->mainSession->lastUrl(), 'Lands on the correct section');
Config::inst()->unnest();
Config::unnest();
}
/**

1
tests/php/SubsiteTest.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Subsites\Tests;
use Page;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Director;
use SilverStripe\Core\Config\Config;

3
tests/php/SubsitesVirtualPageTest.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Subsites\Tests;
use Page;
use SilverStripe\Assets\Filesystem;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
use SilverStripe\Control\Director;
@ -17,7 +18,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
{
public static $fixture_file = array(
'subsites/tests/php/SubsiteTest.yml',
'subsites/tests/SubsitesVirtualPageTest.yml',
'subsites/tests/php/SubsitesVirtualPageTest.yml',
);
protected $illegalExtensions = array(

0
tests/testscript-test-file.pdf → tests/php/testscript-test-file.pdf
View File