diff --git a/app/build.xml b/app/build.xml
index 700a31b51..6427867c4 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -24,6 +24,11 @@
+
+
+
+
+
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
index 6593a2f06..b8f38ff89 100644
--- a/app/phpunit.xml.dist
+++ b/app/phpunit.xml.dist
@@ -23,8 +23,9 @@
../src
../vendor
- ../src/Acme
- ../src/AppBundle
+ ../src/Wallabag/CoreBundle/Resources
+ ../src/Wallabag/CoreBundle/Tests
+ ../src/Wallabag/CoreBundle/DataFixtures
diff --git a/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js b/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js
new file mode 100644
index 000000000..2afdfc3cb
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js
@@ -0,0 +1,2 @@
+
+top["bookmarklet-url@wallabag.org"]=""+""+""+""+"bag it!"+''+""+""+"
diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
index f123183b8..726b4163a 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
@@ -37,3 +37,4 @@
+
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index f062672c8..e9ccc58c5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -12,7 +12,6 @@
{% block title %}{% endblock %} - wallabag
{% include "WallabagCoreBundle::_head.html.twig" %}
- {% include "WallabagCoreBundle::_bookmarklet.html.twig" %}
{% include "WallabagCoreBundle::_top.html.twig" %}
diff --git a/src/Wallabag/CoreBundle/Service/Extractor.php b/src/Wallabag/CoreBundle/Service/Extractor.php
index d38b0d769..e4ec96f6d 100644
--- a/src/Wallabag/CoreBundle/Service/Extractor.php
+++ b/src/Wallabag/CoreBundle/Service/Extractor.php
@@ -10,7 +10,7 @@ final class Extractor
public static function extract($url)
{
$pageContent = Extractor::getPageContent(new Url(base64_encode($url)));
- $title = ($pageContent['rss']['channel']['item']['title'] != '') ? $pageContent['rss']['channel']['item']['title'] : _('Untitled');
+ $title = $pageContent['rss']['channel']['item']['title'] ?: 'Untitled';
$body = $pageContent['rss']['channel']['item']['description'];
$content = new Content();
@@ -19,6 +19,7 @@ final class Extractor
return $content;
}
+
/**
* Get the content for a given URL (by a call to FullTextFeed)
*
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
index 786ff8117..fde210c99 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
@@ -6,12 +6,89 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
class EntryControllerTest extends WebTestCase
{
- public function testIndex()
+ public function testGetNew()
{
$client = static::createClient();
$crawler = $client->request('GET', '/new');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+ $this->assertCount(1, $crawler->filter('input[type=url]'));
+ $this->assertCount(1, $crawler->filter('button[type=submit]'));
+ }
+
+ public function testPostNewEmpty()
+ {
+ $client = static::createClient();
+
+ $crawler = $client->request('GET', '/new');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+ $form = $crawler->filter('button[type=submit]')->form();
+
+ $crawler = $client->submit($form);
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertCount(1, $alert = $crawler->filter('form ul li')->extract(array('_text')));
+ $this->assertEquals('This value should not be blank.', $alert[0]);
+ }
+
+ public function testPostNewOk()
+ {
+ $client = static::createClient();
+
+ $crawler = $client->request('GET', '/new');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+ $form = $crawler->filter('button[type=submit]')->form();
+
+ $data = array(
+ 'form[url]' => 'https://www.mailjet.com/blog/mailjet-zapier-integrations-made-easy/',
+ );
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertCount(1, $alert = $crawler->filter('h2 a')->extract(array('_text')));
+ $this->assertContains('Mailjet', $alert[0]);
+ }
+
+ public function testArchive()
+ {
+ $client = static::createClient();
+
+ $crawler = $client->request('GET', '/archive');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ }
+
+ public function testStarred()
+ {
+ $client = static::createClient();
+
+ $crawler = $client->request('GET', '/starred');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ }
+
+ public function testView()
+ {
+ $client = static::createClient();
+
+ $content = $client->getContainer()
+ ->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findOneByIsArchived(false);
+
+ $crawler = $client->request('GET', '/view/'.$content->getId());
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertContains($content->getTitle(), $client->getResponse()->getContent());
}
}