Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #972 from virtualtam/travis/trusty

Browse source 
Travis: switch to Ubuntu Trusty build environment
This commit is contained in:
VirtualTam 2017-09-19 19:22:33 +02:00 committed by GitHub
commit 0cba184cf8
4 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -1,12 +1,6 @@
sudo: false
dist: precise
dist: trusty
language: php
addons:
apt:
packages:
- locales
- language-pack-de
- language-pack-fr
cache:
directories:
- $HOME/.composer/cache
@ -18,6 +12,7 @@ php:
install:
- composer self-update
- composer install --prefer-dist
- locale -a
script:
- make clean
- make check_permissions

12
tests/languages/de/UtilsDeTest.php
View file

@ -81,12 +81,12 @@ class UtilsDeTest extends UtilsTest
}
/**
* Test autoLocale with multiples value, the second one is valid
* Test autoLocale with multiples value, the second one is available
*/
public function testAutoLocaleMultipleSecondValid()
public function testAutoLocaleMultipleSecondAvailable()
{
$current = setlocale(LC_ALL, 0);
$header = 'pt_BR,fr-fr';
$header = 'mag_IN,fr-fr';
autoLocale($header);
$this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0));
@ -106,12 +106,12 @@ class UtilsDeTest extends UtilsTest
}
/**
* Test autoLocale with an invalid value: defaults to en_US.
* Test autoLocale with an unavailable value: defaults to en_US.
*/
public function testAutoLocaleInvalid()
public function testAutoLocaleUnavailable()
{
$current = setlocale(LC_ALL, 0);
autoLocale('pt_BR');
autoLocale('mag_IN');
$this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
setlocale(LC_ALL, $current);

12
tests/languages/en/UtilsEnTest.php
View file

@ -81,12 +81,12 @@ class UtilsEnTest extends UtilsTest
}
/**
* Test autoLocale with multiples value, the second one is valid
* Test autoLocale with multiples value, the second one is available
*/
public function testAutoLocaleMultipleSecondValid()
public function testAutoLocaleMultipleSecondAvailable()
{
$current = setlocale(LC_ALL, 0);
$header = 'pt_BR,fr-fr';
$header = 'mag_IN,fr-fr';
autoLocale($header);
$this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0));
@ -106,12 +106,12 @@ class UtilsEnTest extends UtilsTest
}
/**
* Test autoLocale with an invalid value: defaults to en_US.
* Test autoLocale with an unavailable value: defaults to en_US.
*/
public function testAutoLocaleInvalid()
public function testAutoLocaleUnavailable()
{
$current = setlocale(LC_ALL, 0);
autoLocale('pt_BR');
autoLocale('mag_IN');
$this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
setlocale(LC_ALL, $current);

12
tests/languages/fr/UtilsFrTest.php
View file

@ -81,12 +81,12 @@ class UtilsFrTest extends UtilsTest
}
/**
* Test autoLocale with multiples value, the second one is valid
* Test autoLocale with multiples value, the second one is available
*/
public function testAutoLocaleMultipleSecondValid()
public function testAutoLocaleMultipleSecondAvailable()
{
$current = setlocale(LC_ALL, 0);
$header = 'pt_BR,de-de';
$header = 'mag_IN,de-de';
autoLocale($header);
$this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0));
@ -106,12 +106,12 @@ class UtilsFrTest extends UtilsTest
}
/**
* Test autoLocale with an invalid value: defaults to en_US.
* Test autoLocale with an unavailable value: defaults to en_US.
*/
public function testAutoLocaleInvalid()
public function testAutoLocaleUnavailable()
{
$current = setlocale(LC_ALL, 0);
autoLocale('pt_BR');
autoLocale('mag_IN');
$this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
setlocale(LC_ALL, $current);