oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Merge pull request #3080 from wallabag/use-username-to-import

Browse source 
Use username to import
This commit is contained in:
Nicolas Lœuillet 2017-05-04 15:19:16 +02:00 • committed by GitHub
commit cebed9c01f
3 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
View file

@ -10,7 +10,7 @@ use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
class ImportCommandTest extends WallabagCoreTestCase
{
/**
* @expectedException Symfony\Component\Console\Exception\RuntimeException
* @expectedException \Symfony\Component\Console\Exception\RuntimeException
* @expectedExceptionMessage Not enough arguments
*/
public function testRunImportCommandWithoutArguments()
@ -27,7 +27,7 @@ class ImportCommandTest extends WallabagCoreTestCase
}
/**
* @expectedException Symfony\Component\Config\Definition\Exception\Exception
* @expectedException \Symfony\Component\Config\Definition\Exception\Exception
* @expectedExceptionMessage not found
*/
public function testRunImportCommandWithoutFilepath()
@ -40,16 +40,15 @@ class ImportCommandTest extends WallabagCoreTestCase
$tester = new CommandTester($command);
$tester->execute([
'command' => $command->getName(),
'userId' => 1,
'username' => 'admin',
'filepath' => 1,
]);
}
/**
* @expectedException Symfony\Component\Config\Definition\Exception\Exception
* @expectedExceptionMessage User with id
* @expectedException \Doctrine\ORM\NoResultException
*/
public function testRunImportCommandWithoutUserId()
public function testRunImportCommandWithWrongUsername()
{
$application = new Application($this->getClient()->getKernel());
$application->add(new ImportCommand());
@ -59,7 +58,7 @@ class ImportCommandTest extends WallabagCoreTestCase
$tester = new CommandTester($command);
$tester->execute([
'command' => $command->getName(),
'userId' => 0,
'username' => 'random',
'filepath' => './',
]);
}
@ -74,7 +73,7 @@ class ImportCommandTest extends WallabagCoreTestCase
$tester = new CommandTester($command);
$tester->execute([
'command' => $command->getName(),
'userId' => 1,
'username' => 'admin',
'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.root_dir').'/../tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
'--importer' => 'v2',
]);
@ -82,4 +81,20 @@ class ImportCommandTest extends WallabagCoreTestCase
$this->assertContains('imported', $tester->getDisplay());
$this->assertContains('already saved', $tester->getDisplay());
}
public function testRunImportCommandWithUserId()
{
$application = new Application($this->getClient()->getKernel());
$application->add(new ImportCommand());
$command = $application->find('wallabag:import');
$tester = new CommandTester($command);
$tester->execute([
'command' => $command->getName(),
'username' => 1,
'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.root_dir').'/../tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
'--useUserId' => true,
]);
}
}