PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/travis-skip' into develop

Browse source
This commit is contained in:
Pierre Rudloff 2017-11-11 23:08:51 +01:00
commit 5f7b56e437
3 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/FrontControllerTest.php
View file

@ -260,17 +260,6 @@ class FrontControllerTest extends TestCase
$this->assertRequestIsOk('video', ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU']); $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. * Test the video() function with audio conversion.
* *

11
tests/LocaleManagerTest.php
View file

@ -86,4 +86,15 @@ class LocaleManagerTest extends TestCase
$this->localeManager->unsetLocale(); $this->localeManager->unsetLocale();
$this->assertNull($this->localeManager->getLocale()); $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'));
}
} }

18
tests/LocaleMiddlewareTest.php
View file

@ -50,15 +50,15 @@ class LocaleMiddlewareTest extends TestCase
* Test the testLocale() function. * Test the testLocale() function.
* *
* @return void * @return void
* @requires OS Linux
*/ */
public function testTestLocale() public function testTestLocale()
{ {
$this->markTestSkipped('For some reason, this test fails on Travis even if the fr_FR locale is installed.');
$locale = [ $locale = [
'language' => 'fr', 'language' => 'en',
'region' => 'FR', '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'] [$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');
}
} }