Merge remote-tracking branch 'origin/2.1' into 2.2

2017-06-01 14:21:37 +12:00 · 2017-06-01 14:21:37 +12:00 · e105bc50f8
parent c906156c93 61afbab8b7
commit e105bc50f8
1 changed files with 3 additions and 0 deletions
--- a/tests/unit/TranslatableSiteConfigTest.php
+++ b/tests/unit/TranslatableSiteConfigTest.php
@ -22,6 +22,9 @@ class TranslatableSiteConfigTest extends SapphireTest {
 				
 		$this->origLocale = Translatable::default_locale();
 		Translatable::set_default_locale("en_US");
+
+		// Delete any default records created outside of fixtures
+		SiteConfig::get()->exclude('ID', $this->allFixtureIDs('SiteConfig'))->removeAll();
 	}
 	
 	function tearDown() {