Add drag and drop to change swimlane positions

2 files changed, 103 insertions, 128 deletions

diff --git a/tests/integration/ApiTest.php b/tests/integration/ApiTest.php
index 679238a2..5fed0368 100644
--- a/tests/integration/ApiTest.php
+++ b/tests/integration/ApiTest.php
@@ -170,122 +170,6 @@ class Api extends PHPUnit_Framework_TestCase
         $this->assertCount(0, $activities);
     }
 
-    public function testGetDefaultSwimlane()
-    {
-        $swimlane = $this->client->getDefaultSwimlane(1);
-        $this->assertNotEmpty($swimlane);
-        $this->assertEquals('Default swimlane', $swimlane['default_swimlane']);
-    }
-
-    public function testAddSwimlane()
-    {
-        $swimlane_id = $this->client->addSwimlane(1, 'Swimlane 1');
-        $this->assertNotFalse($swimlane_id);
-        $this->assertInternalType('int', $swimlane_id);
-
-        $swimlane = $this->client->getSwimlaneById($swimlane_id);
-        $this->assertNotEmpty($swimlane);
-        $this->assertInternalType('array', $swimlane);
-        $this->assertEquals('Swimlane 1', $swimlane['name']);
-    }
-
-    public function testGetSwimlane()
-    {
-        $swimlane = $this->client->getSwimlane(1);
-        $this->assertNotEmpty($swimlane);
-        $this->assertInternalType('array', $swimlane);
-        $this->assertEquals('Swimlane 1', $swimlane['name']);
-    }
-
-    public function testUpdateSwimlane()
-    {
-        $swimlane = $this->client->getSwimlaneByName(1, 'Swimlane 1');
-        $this->assertNotEmpty($swimlane);
-        $this->assertInternalType('array', $swimlane);
-        $this->assertEquals(1, $swimlane['id']);
-        $this->assertEquals('Swimlane 1', $swimlane['name']);
-
-        $this->assertTrue($this->client->updateSwimlane($swimlane['id'], 'Another swimlane'));
-
-        $swimlane = $this->client->getSwimlaneById($swimlane['id']);
-        $this->assertNotEmpty($swimlane);
-        $this->assertEquals('Another swimlane', $swimlane['name']);
-    }
-
-    public function testDisableSwimlane()
-    {
-        $this->assertTrue($this->client->disableSwimlane(1, 1));
-
-        $swimlane = $this->client->getSwimlaneById(1);
-        $this->assertNotEmpty($swimlane);
-        $this->assertEquals(0, $swimlane['is_active']);
-    }
-
-    public function testEnableSwimlane()
-    {
-        $this->assertTrue($this->client->enableSwimlane(1, 1));
-
-        $swimlane = $this->client->getSwimlaneById(1);
-        $this->assertNotEmpty($swimlane);
-        $this->assertEquals(1, $swimlane['is_active']);
-    }
-
-    public function testGetAllSwimlanes()
-    {
-        $this->assertNotFalse($this->client->addSwimlane(1, 'Swimlane A'));
-
-        $swimlanes = $this->client->getAllSwimlanes(1);
-        $this->assertNotEmpty($swimlanes);
-        $this->assertCount(2, $swimlanes);
-        $this->assertEquals('Another swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
-    }
-
-    public function testGetActiveSwimlane()
-    {
-        $this->assertTrue($this->client->disableSwimlane(1, 1));
-
-        $swimlanes = $this->client->getActiveSwimlanes(1);
-        $this->assertNotEmpty($swimlanes);
-        $this->assertCount(2, $swimlanes);
-        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
-    }
-
-    public function testMoveSwimlaneUp()
-    {
-        $this->assertTrue($this->client->enableSwimlane(1, 1));
-        $this->assertTrue($this->client->moveSwimlaneUp(1, 1));
-
-        $swimlanes = $this->client->getActiveSwimlanes(1);
-        $this->assertNotEmpty($swimlanes);
-        $this->assertCount(3, $swimlanes);
-        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Another swimlane', $swimlanes[1]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[2]['name']);
-
-        $this->assertTrue($this->client->moveSwimlaneUp(1, 2));
-
-        $swimlanes = $this->client->getActiveSwimlanes(1);
-        $this->assertNotEmpty($swimlanes);
-        $this->assertCount(3, $swimlanes);
-        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
-        $this->assertEquals('Another swimlane', $swimlanes[2]['name']);
-    }
-
-    public function testMoveSwimlaneDown()
-    {
-        $this->assertTrue($this->client->moveSwimlaneDown(1, 2));
-
-        $swimlanes = $this->client->getActiveSwimlanes(1);
-        $this->assertNotEmpty($swimlanes);
-        $this->assertCount(3, $swimlanes);
-        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Another swimlane', $swimlanes[1]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[2]['name']);
-    }
-
     public function testCreateTaskWithWrongMember()
     {
         $task = array(
@@ -394,18 +278,6 @@ class Api extends PHPUnit_Framework_TestCase
         $this->assertNotEquals($moved_timestamp, $task['date_moved']);
     }
 
-    public function testRemoveSwimlane()
-    {
-        $this->assertTrue($this->client->removeSwimlane(1, 2));
-
-        $task = $this->client->getTask($this->getTaskId());
-        $this->assertNotFalse($task);
-        $this->assertTrue(is_array($task));
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(4, $task['column_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-    }
-
     public function testUpdateTask()
     {
         $task = $this->client->getTask(1);
diff --git a/tests/integration/SwimlaneTest.php b/tests/integration/SwimlaneTest.php
new file mode 100644
index 00000000..88747204
--- /dev/null
+++ b/tests/integration/SwimlaneTest.php
@@ -0,0 +1,103 @@
+<?php
+
+require_once __DIR__.'/Base.php';
+
+class SwimlaneTest extends Base
+{
+    public function testCreateProject()
+    {
+        $this->assertEquals(1, $this->app->createProject('A project'));
+    }
+
+    public function testGetDefaultSwimlane()
+    {
+        $swimlane = $this->app->getDefaultSwimlane(1);
+        $this->assertNotEmpty($swimlane);
+        $this->assertEquals('Default swimlane', $swimlane['default_swimlane']);
+    }
+
+    public function testAddSwimlane()
+    {
+        $swimlane_id = $this->app->addSwimlane(1, 'Swimlane 1');
+        $this->assertNotFalse($swimlane_id);
+        $this->assertInternalType('int', $swimlane_id);
+
+        $swimlane = $this->app->getSwimlaneById($swimlane_id);
+        $this->assertNotEmpty($swimlane);
+        $this->assertInternalType('array', $swimlane);
+        $this->assertEquals('Swimlane 1', $swimlane['name']);
+    }
+
+    public function testGetSwimlane()
+    {
+        $swimlane = $this->app->getSwimlane(1);
+        $this->assertInternalType('array', $swimlane);
+        $this->assertEquals('Swimlane 1', $swimlane['name']);
+    }
+
+    public function testUpdateSwimlane()
+    {
+        $swimlane = $this->app->getSwimlaneByName(1, 'Swimlane 1');
+        $this->assertInternalType('array', $swimlane);
+        $this->assertEquals(1, $swimlane['id']);
+        $this->assertEquals('Swimlane 1', $swimlane['name']);
+
+        $this->assertTrue($this->app->updateSwimlane($swimlane['id'], 'Another swimlane'));
+
+        $swimlane = $this->app->getSwimlaneById($swimlane['id']);
+        $this->assertEquals('Another swimlane', $swimlane['name']);
+    }
+
+    public function testDisableSwimlane()
+    {
+        $this->assertTrue($this->app->disableSwimlane(1, 1));
+
+        $swimlane = $this->app->getSwimlaneById(1);
+        $this->assertEquals(0, $swimlane['is_active']);
+    }
+
+    public function testEnableSwimlane()
+    {
+        $this->assertTrue($this->app->enableSwimlane(1, 1));
+
+        $swimlane = $this->app->getSwimlaneById(1);
+        $this->assertEquals(1, $swimlane['is_active']);
+    }
+
+    public function testGetAllSwimlanes()
+    {
+        $this->assertNotFalse($this->app->addSwimlane(1, 'Swimlane A'));
+
+        $swimlanes = $this->app->getAllSwimlanes(1);
+        $this->assertCount(2, $swimlanes);
+        $this->assertEquals('Another swimlane', $swimlanes[0]['name']);
+        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
+    }
+
+    public function testGetActiveSwimlane()
+    {
+        $this->assertTrue($this->app->disableSwimlane(1, 1));
+
+        $swimlanes = $this->app->getActiveSwimlanes(1);
+        $this->assertCount(2, $swimlanes);
+        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
+        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
+    }
+
+    public function testRemoveSwimlane()
+    {
+        $this->assertTrue($this->app->removeSwimlane(1, 2));
+    }
+
+    public function testChangePosition()
+    {
+        $this->assertNotFalse($this->app->addSwimlane(1, 'Swimlane 1'));
+        $this->assertNotFalse($this->app->addSwimlane(1, 'Swimlane 2'));
+
+        $swimlanes = $this->app->getAllSwimlanes(1);
+        $this->assertCount(3, $swimlanes);
+
+        $this->assertTrue($this->app->changeSwimlanePosition(1, 1, 3));
+        $this->assertFalse($this->app->changeSwimlanePosition(1, 1, 6));
+    }
+}