Merge branch 'master' of https://github.com/ukko/kanboard into 1245_bug_with_subtask_timer

2 files changed, 20 insertions, 1 deletions

diff --git a/tests/units/Model/ActionTest.php b/tests/units/Model/ActionTest.php
index 9034679b..66b2cfe3 100644
--- a/tests/units/Model/ActionTest.php
+++ b/tests/units/Model/ActionTest.php
@@ -27,6 +27,17 @@ class ActionTest extends Base
         $this->assertEquals('TaskLogMoveAnotherColumn', key($actions));
     }
 
+    public function testExtendActions()
+    {
+        $a = new Action($this->container);
+        $a->extendActions('MyClass', 'Description');
+
+        $actions = $a->getAvailableActions();
+        $this->assertNotEmpty($actions);
+        $this->assertContains('Description', $actions);
+        $this->assertArrayHasKey('MyClass', $actions);
+    }
+
     public function testGetEvents()
     {
         $a = new Action($this->container);
diff --git a/tests/units/Model/FileTest.php b/tests/units/Model/FileTest.php
index e7520c89..d1ad7248 100644
--- a/tests/units/Model/FileTest.php
+++ b/tests/units/Model/FileTest.php
@@ -227,7 +227,7 @@ class FileTest extends Base
             ->expects($this->at(1))
             ->method('remove')
             ->with(
-                $this->equalTo('/tmp/foo1')
+                $this->equalTo('thumbnails//tmp/foo2')
             )
             ->will($this->returnValue(true));
 
@@ -235,6 +235,14 @@ class FileTest extends Base
             ->expects($this->at(2))
             ->method('remove')
             ->with(
+                $this->equalTo('/tmp/foo1')
+            )
+            ->will($this->returnValue(true));
+
+        $this->container['objectStorage']
+            ->expects($this->at(3))
+            ->method('remove')
+            ->with(
                 $this->equalTo('/tmp/foo3')
             )
             ->will($this->returnValue(true));