diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
| commit | 44043ebe82a22470e2514d05efac324035ee809a (patch) | |
| tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 /tests/Wallabag/ImportBundle | |
| parent | 11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff) | |
| parent | e586d65b64089fc1cc230a18c470aae3f45f91a6 (diff) | |
| download | wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'tests/Wallabag/ImportBundle')
| -rw-r--r-- | tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php | 2 | ||||
| -rw-r--r-- | tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php index 9b887cbb..dacdf488 100644 --- a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php +++ b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php | |||
| @@ -129,7 +129,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase | |||
| 129 | ->get('doctrine.orm.entity_manager') | 129 | ->get('doctrine.orm.entity_manager') |
| 130 | ->getRepository('WallabagCoreBundle:Entry') | 130 | ->getRepository('WallabagCoreBundle:Entry') |
| 131 | ->findByUrlAndUserId( | 131 | ->findByUrlAndUserId( |
| 132 | 'https://www.20minutes.fr/high-tech/2077615-20170531-dis-donc-donald-trump-quoi-exactement-covfefe', | 132 | 'https://www.20minutes.fr/high-tech/2077615-20170531-quoi-exactement-tweet-covfefe-donald-trump-persiste-signe', |
| 133 | $this->getLoggedInUserId() | 133 | $this->getLoggedInUserId() |
| 134 | ); | 134 | ); |
| 135 | 135 | ||
diff --git a/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv b/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv index 06d018e0..7b692d00 100644 --- a/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv +++ b/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv | |||
| @@ -2,4 +2,4 @@ URL,Title,Selection,Folder | |||
| 2 | http://www.liberation.fr/societe/2012/12/06/baumettes-un-tour-en-cellule_865551,Baumettes : un tour en cellule,,Unread | 2 | http://www.liberation.fr/societe/2012/12/06/baumettes-un-tour-en-cellule_865551,Baumettes : un tour en cellule,,Unread |
| 3 | https://redditblog.com/2016/09/20/amp-and-reactredux/,AMP and React+Redux: Why Not?,,Archive | 3 | https://redditblog.com/2016/09/20/amp-and-reactredux/,AMP and React+Redux: Why Not?,,Archive |
| 4 | https://medium.com/@the_minh/why-foursquare-swarm-is-still-my-favourite-social-network-e38228493e6c,Why Foursquare / Swarm is still my favourite social network,,Starred | 4 | https://medium.com/@the_minh/why-foursquare-swarm-is-still-my-favourite-social-network-e38228493e6c,Why Foursquare / Swarm is still my favourite social network,,Starred |
| 5 | https://www.20minutes.fr/high-tech/2077615-20170531-dis-donc-donald-trump-quoi-exactement-covfefe,"Dis donc Donald Trump, c'est quoi exactement «covfefe»?",,test_tag | 5 | https://www.20minutes.fr/high-tech/2077615-20170531-quoi-exactement-tweet-covfefe-donald-trump-persiste-signe,"Dis donc Donald Trump, c'est quoi exactement «covfefe»?",,test_tag |