diff options
-rw-r--r-- | app/Model/Board.php | 8 | ||||
-rw-r--r-- | docs/api-json-rpc.markdown | 4 | ||||
-rw-r--r-- | tests/functionals/ApiTest.php | 6 | ||||
-rw-r--r-- | tests/units/BoardTest.php | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/app/Model/Board.php b/app/Model/Board.php index 4c78b0f6..667bbdbe 100644 --- a/app/Model/Board.php +++ b/app/Model/Board.php @@ -109,16 +109,18 @@ class Board extends Base * @param integer $project_id Project id * @param string $title Column title * @param integer $task_limit Task limit - * @return boolean + * @return boolean|integer */ public function addColumn($project_id, $title, $task_limit = 0) { - return $this->db->table(self::TABLE)->save(array( + $values = array( 'project_id' => $project_id, 'title' => $title, 'task_limit' => $task_limit, 'position' => $this->getLastColumnPosition($project_id) + 1, - )); + ); + + return $this->persist(self::TABLE, $values); } /** diff --git a/docs/api-json-rpc.markdown b/docs/api-json-rpc.markdown index f2db3ea2..d30ac362 100644 --- a/docs/api-json-rpc.markdown +++ b/docs/api-json-rpc.markdown @@ -869,7 +869,7 @@ Response example: - **project_id** (integer, required) - **title** (string, required) - **task_limit** (integer, optional) -- Result on success: **true** +- Result on success: **column_id** - Result on failure: **false** Request example: @@ -892,7 +892,7 @@ Response example: { "jsonrpc": "2.0", "id": 638544704, - "result": true + "result": 5 } ``` diff --git a/tests/functionals/ApiTest.php b/tests/functionals/ApiTest.php index 3b1c5241..ece7b46d 100644 --- a/tests/functionals/ApiTest.php +++ b/tests/functionals/ApiTest.php @@ -135,7 +135,11 @@ class Api extends PHPUnit_Framework_TestCase public function testAddColumn() { - $this->assertTrue($this->client->addColumn(1, 'New column')); + $column_id = $this->client->addColumn(1, 'New column'); + + $this->assertNotFalse($column_id); + $this->assertInternalType('int', $column_id); + $this->assertTrue($column_id > 0); $columns = $this->client->getColumns(1); $this->assertTrue(is_array($columns)); diff --git a/tests/units/BoardTest.php b/tests/units/BoardTest.php index b83fee85..a7de34bd 100644 --- a/tests/units/BoardTest.php +++ b/tests/units/BoardTest.php @@ -111,8 +111,8 @@ class BoardTest extends Base $b = new Board($this->container); $this->assertEquals(1, $p->create(array('name' => 'UnitTest1'))); - $this->assertTrue($b->addColumn(1, 'another column')); - $this->assertTrue($b->addColumn(1, 'one more', 3)); + $this->assertNotFalse($b->addColumn(1, 'another column')); + $this->assertNotFalse($b->addColumn(1, 'one more', 3)); $columns = $b->getColumns(1); $this->assertTrue(is_array($columns)); |