Skip to content
Permalink
Browse files

Attempt to get tests passing on travis.

Also attempt to get stickler to ignore the 2.x branch.
  • Loading branch information...
markstory committed Jul 1, 2016
1 parent d816ea6 commit 234f732d6dfec0c1ddfc59abb0530a1194241e57
Showing with 3 additions and 0 deletions.
  1. +1 −0 .travis.yml
  2. +2 −0 lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -30,6 +30,7 @@ before_script:
- sh -c "composer global require 'phpunit/phpunit=3.7.33'"
- sh -c "ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit ./vendors/PHPUnit"
- sudo locale-gen de_DE
- sudo locale-gen es_ES
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test2;'; fi"
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test3;'; fi"
@@ -460,9 +460,11 @@ public function testNiceShort() {
* @return void
*/
public function testNiceShortI18n() {
$restore = setlocale(LC_ALL, 0);
setlocale(LC_ALL, 'es_ES');
$time = strtotime('2015-01-07 03:05:00');
$this->assertEquals('ene 7th 2015, 03:05', $this->Time->niceShort($time));
setlocale(LC_ALL, $restore);
}
/**

0 comments on commit 234f732

Please sign in to comment.
You can’t perform that action at this time.