pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.6.0

Browse Source
This commit is contained in:
Jeremy Benoist
2022-10-18 11:11:02 +02:00
parent e422921fab 3340262707
commit c372d68cc1
32 changed files with 691 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
View File

@ -118,7 +118,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
->get(EntityManagerInterface::class)
->getRepository(Entry::class)
->findByUrlAndUserId(
'https://lexpansion.lexpress.fr/high-tech/orange-offre-un-meilleur-reseau-mobile-que-bouygues-et-sfr-free-derriere_1811554.html',
'https://www.20minutes.fr/sport/4002755-20220928-tarn-lapins-ravagent-terrain-match-rugby-doit-etre-annule',
$this->getLoggedInUserId()
);

4
tests/Wallabag/ImportBundle/fixtures/firefox-bookmarks.json
View File

@ -28,14 +28,14 @@
"children": [
{
"guid": "tard77lzbC5H",
"title": "Orange offre un meilleur réseau mobile que Bouygues et SFR, Free derrière - L'Express L'Expansion",
"title": "Tarn : Des lapins ravagent le terrain, le match de rugby doit être annulé",
"index": 1,
"dateAdded": 1388166091644000,
"lastModified": 1388166091644000,
"tags": "test,tag",
"id": 4,
"type": "text/x-moz-place",
"uri": "http://lexpansion.lexpress.fr/high-tech/orange-offre-un-meilleur-reseau-mobile-que-bouygues-et-sfr-free-derriere_1811554.html"
"uri": "https://www.20minutes.fr/sport/4002755-20220928-tarn-lapins-ravagent-terrain-match-rugby-doit-etre-annule"
},
{
"guid": "E385l9vZ_LVn",