diff --git a/tests/FrontControllerTest.php b/tests/FrontControllerTest.php index 40e8d2e..4962c7f 100644 --- a/tests/FrontControllerTest.php +++ b/tests/FrontControllerTest.php @@ -260,17 +260,6 @@ class FrontControllerTest extends TestCase $this->assertRequestIsOk('video', ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU']); } - /** - * Test the video() function with a video that does not have a title. - * - * @return void - */ - public function testVideoWithoutTitle() - { - $this->markTestSkipped('This URL triggers a curl SSL error on Travis'); - $this->assertRequestIsOk('video', ['url' => 'http://html5demos.com/video']); - } - /** * Test the video() function with audio conversion. * diff --git a/tests/LocaleManagerTest.php b/tests/LocaleManagerTest.php index 2808362..0e88239 100644 --- a/tests/LocaleManagerTest.php +++ b/tests/LocaleManagerTest.php @@ -86,4 +86,15 @@ class LocaleManagerTest extends TestCase $this->localeManager->unsetLocale(); $this->assertNull($this->localeManager->getLocale()); } + + /** + * Test that the environment is correctly set up. + * + * @return void + */ + public function testEnv() + { + $this->localeManager->setLocale(new Locale('foo_BAR')); + $this->assertEquals('foo_BAR', getenv('LANG')); + } } diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index 35c30e2..0db9f9f 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -50,15 +50,15 @@ class LocaleMiddlewareTest extends TestCase * Test the testLocale() function. * * @return void + * @requires OS Linux */ public function testTestLocale() { - $this->markTestSkipped('For some reason, this test fails on Travis even if the fr_FR locale is installed.'); $locale = [ - 'language' => 'fr', - 'region' => 'FR', + 'language' => 'en', + 'region' => 'US', ]; - $this->assertEquals('fr_FR', $this->middleware->testLocale($locale)); + $this->assertEquals('en_US', $this->middleware->testLocale($locale)); } /** @@ -131,14 +131,4 @@ class LocaleMiddlewareTest extends TestCase [$this, 'assertNoHeader'] ); } - - /** - * Test that the environment is correctly set up. - * - * @return void - */ - public function testEnv() - { - $this->markTestIncomplete('We need to find a way to reliably test LC_ALL and LANG values'); - } }