Merge pull request #3480 from Schlaefer/fix-testDecimalLocaleSet-OSX

fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X
This commit is contained in:
Mark Story 2014-05-13 10:02:33 -04:00
commit 590e552d31

View file

@ -1662,7 +1662,7 @@ class ValidationTest extends CakeTestCase {
public function testDecimalLocaleSet() {
$this->skipIf(DS === '\\', 'The locale is not supported in Windows and affects other tests.');
$restore = setlocale(LC_NUMERIC, 0);
$this->skipIf(setlocale(LC_NUMERIC, 'de_DE') === false, "The German locale isn't available.");
$this->skipIf(setlocale(LC_NUMERIC, 'da_DK') === false, "The Danish locale isn't available.");
$this->assertTrue(Validation::decimal(1.54), '1.54 should be considered a valid float');
$this->assertTrue(Validation::decimal('1.54'), '"1.54" should be considered a valid float');