mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-02 12:02:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2723 from wallabag/fix-export-tag-space

Browse source 
Fixed export by tags with a tag which contains space
This commit is contained in:
Nicolas Lœuillet 2016-12-28 09:10:14 +01:00 committed by GitHub
commit 92ba3b5c0d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/TagController.php
View file

@ -143,7 +143,7 @@ class TagController extends Controller
'form' => null,
'entries' => $entries,
'currentPage' => $page,
'tag' => $tag->getLabel(),
'tag' => $tag->getSlug(),
]);
}
}

2
src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
View file

@ -15,7 +15,7 @@ class LoadTagData extends AbstractFixture implements OrderedFixtureInterface
public function load(ObjectManager $manager)
{
$tag1 = new Tag();
$tag1->setLabel('foo');
$tag1->setLabel('foo bar');
$manager->persist($tag1);

4
tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
View file

@ -119,7 +119,7 @@ class ExportControllerTest extends WallabagCoreTestCase
$this->assertEquals('binary', $headers->get('content-transfer-encoding'));
ob_start();
$crawler = $client->request('GET', '/export/tag_entries.pdf?tag=foo');
$crawler = $client->request('GET', '/export/tag_entries.pdf?tag=foo-bar');
ob_end_clean();
$this->assertEquals(200, $client->getResponse()->getStatusCode());
@ -241,7 +241,7 @@ class ExportControllerTest extends WallabagCoreTestCase
$this->assertEquals($contentInDB->getLanguage(), $content[0]['language']);
$this->assertEquals($contentInDB->getReadingtime(), $content[0]['reading_time']);
$this->assertEquals($contentInDB->getDomainname(), $content[0]['domain_name']);
$this->assertEquals(['foo', 'baz'], $content[0]['tags']);
$this->assertEquals(['foo bar', 'baz'], $content[0]['tags']);
}
public function testXmlExport()

2
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View file

@ -61,7 +61,7 @@ class TagControllerTest extends WallabagCoreTestCase
// tag already exists but still not assigned to this entry
$data = [
'tag[label]' => 'foo',
'tag[label]' => 'foo bar',
];
$client->submit($form, $data);