Merge pull request #3597 from wallabag/fix-tests

Fix tests
author: Jérémy Benoist <j0k3r@users.noreply.github.com> 2018-03-17 13:28:10 +0100
committer: GitHub <noreply@github.com> 2018-03-17 13:28:10 +0100
commit: 727880c950d485293e480b5b835a0490be4f0ce7 (patch)
tree: 0e7359a2bc9c3e2ae8e9eec0ee84e3aacb0ecec2
parent: 2ff26deaf8a71ee428eebc08c387ad4bab764686 (diff)
parent: ad77c3451f2c436484f6de033fe18c844dfc9267 (diff)
download: wallabag-727880c950d485293e480b5b835a0490be4f0ce7.tar.gz
wallabag-727880c950d485293e480b5b835a0490be4f0ce7.tar.zst
wallabag-727880c950d485293e480b5b835a0490be4f0ce7.zip
3 files changed, 3 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index dca274ed..9ed91f20 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,7 @@
        "liip/theme-bundle": "^1.4.6",
        "lexik/form-filter-bundle": "^5.0.4",
        "j0k3r/graby": "^1.0",
-        "friendsofsymfony/user-bundle": "^2.0.1",
+        "friendsofsymfony/user-bundle": "2.0.*",
        "friendsofsymfony/oauth-server-bundle": "^1.5.2",
        "stof/doctrine-extensions-bundle": "^1.2",
        "scheb/two-factor-bundle": "^2.14.0",
diff --git a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
index 067cf3dc..9b887cbb 100644
--- a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
@@ -129,7 +129,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
            ->findByUrlAndUserId(
-                'http://www.20minutes.fr/high-tech/2077615-20170531-dis-donc-donald-trump-quoi-exactement-covfefe',
+                'https://www.20minutes.fr/high-tech/2077615-20170531-dis-donc-donald-trump-quoi-exactement-covfefe',
                $this->getLoggedInUserId()
            );
diff --git a/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv b/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv
index 1a648f8a..06d018e0 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
 http://www.liberation.fr/societe/2012/12/06/baumettes-un-tour-en-cellule_865551,Baumettes : un tour en cellule,,Unread
 https://redditblog.com/2016/09/20/amp-and-reactredux/,AMP and React+Redux: Why Not?,,Archive
 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
-http://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
+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
author	Jérémy Benoist <j0k3r@users.noreply.github.com>	2018-03-17 13:28:10 +0100
committer	GitHub <noreply@github.com>	2018-03-17 13:28:10 +0100
commit	727880c950d485293e480b5b835a0490be4f0ce7 (patch)
tree	0e7359a2bc9c3e2ae8e9eec0ee84e3aacb0ecec2
parent	2ff26deaf8a71ee428eebc08c387ad4bab764686 (diff)
parent	ad77c3451f2c436484f6de033fe18c844dfc9267 (diff)
download	wallabag-727880c950d485293e480b5b835a0490be4f0ce7.tar.gz wallabag-727880c950d485293e480b5b835a0490be4f0ce7.tar.zst wallabag-727880c950d485293e480b5b835a0490be4f0ce7.zip

diff --git a/composer.json b/composer.json index dca274ed..9ed91f20 100644 --- a/composer.json +++ b/composer.json
@@ -64,7 +64,7 @@
64	"liip/theme-bundle": "^1.4.6",	64	"liip/theme-bundle": "^1.4.6",
65	"lexik/form-filter-bundle": "^5.0.4",	65	"lexik/form-filter-bundle": "^5.0.4",
66	"j0k3r/graby": "^1.0",	66	"j0k3r/graby": "^1.0",
67	"friendsofsymfony/user-bundle": "^2.0.1",	67	"friendsofsymfony/user-bundle": "2.0.*",
68	"friendsofsymfony/oauth-server-bundle": "^1.5.2",	68	"friendsofsymfony/oauth-server-bundle": "^1.5.2",
69	"stof/doctrine-extensions-bundle": "^1.2",	69	"stof/doctrine-extensions-bundle": "^1.2",
70	"scheb/two-factor-bundle": "^2.14.0",	70	"scheb/two-factor-bundle": "^2.14.0",


diff --git a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php index 067cf3dc..9b887cbb 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	'http://www.20minutes.fr/high-tech/2077615-20170531-dis-donc-donald-trump-quoi-exactement-covfefe',	132	'https://www.20minutes.fr/high-tech/2077615-20170531-dis-donc-donald-trump-quoi-exactement-covfefe',
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 1a648f8a..06d018e0 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	http://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-dis-donc-donald-trump-quoi-exactement-covfefe,"Dis donc Donald Trump, c'est quoi exactement «covfefe»?",,test_tag