Get some more tests working

Updating config and i18n calls
silverstripe · May 30, 2017 · 997459c · 997459c
1 parent 492f437
commit 997459c
Show file tree

Hide file tree

Showing 12 changed files with 161 additions and 145 deletions.
diff --git a/_config/extensions.yml b/_config/extensions.yml
@@ -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

diff --git a/code/extensions/GroupSubsites.php b/code/extensions/GroupSubsites.php
@@ -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

diff --git a/code/model/Subsite.php b/code/model/Subsite.php
@@ -186,8 +186,8 @@ public static function changeSubsite($subsite)
         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);
             }

diff --git a/code/pages/SubsitesVirtualPage.php b/code/pages/SubsitesVirtualPage.php
@@ -100,23 +100,23 @@ public function getCMSFields()
             TextareaField::create(
                 'CustomMetaKeywords',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote')),
+            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
             'MetaKeywords'
         );
         $fields->addFieldToTab(
             'Root.Main',
             TextareaField::create(
                 'CustomMetaDescription',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote')),
+            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
             'MetaDescription'
         );
         $fields->addFieldToTab(
             'Root.Main',
             TextField::create(
                 'CustomExtraMeta',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote')),
+            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
             'ExtraMeta'
         );
 

diff --git a/tests/php/GroupSubsitesTest.php b/tests/php/GroupSubsitesTest.php
@@ -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);
     }
 

diff --git a/tests/php/LeftAndMainSubsitesTest.php b/tests/php/LeftAndMainSubsitesTest.php
@@ -82,7 +82,7 @@ public function testAccessChecksDontChangeCurrentSubsite()
     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 @@ public function testShouldChangeSubsite()
         $this->assertTrue($l->shouldChangeSubsite(CMSPageEditController::class, 1, 5));
         $this->assertFalse($l->shouldChangeSubsite(CMSPageEditController::class, 1, 1));
 
-        Config::inst()->unnest();
+        Config::unnest();
     }
 }
diff --git a/tests/php/SiteConfigSubsitesTest.php b/tests/php/SiteConfigSubsitesTest.php
@@ -6,7 +6,6 @@
 use SilverStripe\Subsites\Extensions\SiteConfigSubsites;
 use SilverStripe\Subsites\Model\Subsite;
 
-
 class SiteConfigSubsitesTest extends BaseSubsiteTest
 {
     public static $fixture_file = 'subsites/tests/php/SubsiteTest.yml';