Merge pull request #417 from ArthurHoaro/wallabag-improve

Wallabag plugin improvement

3 files changed, 74 insertions, 1 deletions

diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index e498d79e..af6daaa4 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -145,4 +145,15 @@ class UrlTest extends PHPUnit_Framework_TestCase
         $url = new Url('git://domain.tld/push?pull=clone#checkout');
         $this->assertEquals('git', $url->getScheme());
     }
+
+    /**
+     * Test add trailing slash.
+     */
+    function testAddTrailingSlash()
+    {
+        $strOn = 'http://randomstr.com/test/';
+        $strOff = 'http://randomstr.com/test';
+        $this->assertEquals($strOn, add_trailing_slash($strOn));
+        $this->assertEquals($strOn, add_trailing_slash($strOff));
+    }
 }
diff --git a/tests/plugins/PluginWallabagTest.php b/tests/plugins/PluginWallabagTest.php
index 7cc83f4f..5d3a60e0 100644
--- a/tests/plugins/PluginWallabagTest.php
+++ b/tests/plugins/PluginWallabagTest.php
@@ -44,6 +44,8 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase
 
         // plugin data
         $this->assertEquals(1, count($link['link_plugin']));
-        $this->assertNotFalse(strpos($link['link_plugin'][0], $str));
+        $this->assertNotFalse(strpos($link['link_plugin'][0], urlencode($str)));
+        $this->assertNotFalse(strpos($link['link_plugin'][0], $GLOBALS['plugins']['WALLABAG_URL']));
     }
 }
+
diff --git a/tests/plugins/WallabagInstanceTest.php b/tests/plugins/WallabagInstanceTest.php
new file mode 100644
index 00000000..7c14c1df
--- /dev/null
+++ b/tests/plugins/WallabagInstanceTest.php
@@ -0,0 +1,60 @@
+<?php
+
+require_once 'plugins/wallabag/WallabagInstance.php';
+
+/**
+ * Class WallabagInstanceTest
+ */
+class WallabagInstanceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var string wallabag url.
+     */
+    private $instance;
+
+    /**
+     * Reset plugin path
+     */
+    function setUp()
+    {
+        $this->instance = 'http://some.url';
+    }
+
+    /**
+     * Test WallabagInstance with API V1.
+     */
+    function testWallabagInstanceV1()
+    {
+        $instance = new WallabagInstance($this->instance, 1);
+        $expected = $this->instance . '/?plainurl=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test WallabagInstance with API V2.
+     */
+    function testWallabagInstanceV2()
+    {
+        $instance = new WallabagInstance($this->instance, 2);
+        $expected = $this->instance . '/bookmarklet?url=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test WallabagInstance with an invalid API version.
+     */
+    function testWallabagInstanceInvalidVersion()
+    {
+        $instance = new WallabagInstance($this->instance, false);
+        $expected = $this->instance . '/?plainurl=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+
+        $instance = new WallabagInstance($this->instance, 3);
+        $expected = $this->instance . '/?plainurl=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+    }
+}