Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MINOR: Fixed test

  • Loading branch information...
commit 07c486003123d7fd3c95ef3370525dc44c74152b 1 parent fb48ec5
@sminnee sminnee authored
Showing with 8 additions and 6 deletions.
  1. +7 −5 tests/bootstrap.php
  2. +1 −1  tests/i18n/i18nTest.php
View
12 tests/bootstrap.php
@@ -1,13 +1,15 @@
<?php
-// Simulate an execution from framework/cli-script.php, Core.php has too many
-// hardcoded assumptions about folder depth of the executing script.
+
+/**
+ * This bootstraps the SilverStripe system so that phpunit can be run directly on SilverStripe tests.
+ */
// Make sure display_errors is on
ini_set('display_errors', 1);
-// Check we're using at least PHPUnit 3.6
-if(version_compare(PHPUnit_Runner_Version::id(), '3.6', '<')) {
- echo 'PHPUnit 3.6 required to run tests using bootstrap.php';
+// Check we're using at least PHPUnit 3.5
+if(version_compare(PHPUnit_Runner_Version::id(), '3.5', '<')) {
+ echo 'PHPUnit 3.5 required to run tests using bootstrap.php';
die();
}
View
2  tests/i18n/i18nTest.php
@@ -515,7 +515,7 @@ function testMultipleTranslators() {
$this->assertEquals(
i18n::_t('i18nTestModule.ENTITY'),
- 'i18nTestModule.ENTITY OtherCustomAdapter (en)',
+ 'i18nTestModule.ENTITY OtherCustomAdapter (en_US)',
'Adapter with higher priority wins'
);
Please sign in to comment.
Something went wrong with that request. Please try again.