Merge branch 'master' into 2.1

1 files changed, 0 insertions, 29 deletions

diff --git a/src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php b/src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php
deleted file mode 100644
index 9f38fa82..00000000
--- a/src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Wallabag\ImportBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class ImportControllerTest extends WallabagCoreTestCase
-{
-    public function testLogin()
-    {
-        $client = $this->getClient();
-
-        $client->request('GET', '/import/');
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('login', $client->getResponse()->headers->get('location'));
-    }
-
-    public function testImportList()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/import/');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertEquals(3, $crawler->filter('blockquote')->count());
-    }
-}