summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/units/Formatter/BoardFormatterTest.php3
-rw-r--r--tests/units/Formatter/TaskListFormatterTest.php5
-rw-r--r--tests/units/Model/TagModelTest.php3
-rw-r--r--tests/units/Model/TaskTagModelTest.php10
4 files changed, 16 insertions, 5 deletions
diff --git a/tests/units/Formatter/BoardFormatterTest.php b/tests/units/Formatter/BoardFormatterTest.php
index 1b0ace1d..7b90eb00 100644
--- a/tests/units/Formatter/BoardFormatterTest.php
+++ b/tests/units/Formatter/BoardFormatterTest.php
@@ -375,11 +375,13 @@ class BoardFormatterTest extends Base
'id' => 1,
'name' => 'My tag 1',
'task_id' => 1,
+ 'color_id' => null,
),
array(
'id' => 2,
'name' => 'My tag 2',
'task_id' => 1,
+ 'color_id' => null,
),
);
@@ -391,6 +393,7 @@ class BoardFormatterTest extends Base
'id' => 3,
'name' => 'My tag 3',
'task_id' => 2,
+ 'color_id' => null,
),
);
diff --git a/tests/units/Formatter/TaskListFormatterTest.php b/tests/units/Formatter/TaskListFormatterTest.php
index a6e44d38..d079ed7e 100644
--- a/tests/units/Formatter/TaskListFormatterTest.php
+++ b/tests/units/Formatter/TaskListFormatterTest.php
@@ -37,11 +37,13 @@ class TaskListFormatterTest extends Base
'id' => 1,
'name' => 'My tag 1',
'task_id' => 1,
+ 'color_id' => null,
),
array(
'id' => 2,
'name' => 'My tag 2',
'task_id' => 1,
+ 'color_id' => null,
),
);
@@ -52,10 +54,11 @@ class TaskListFormatterTest extends Base
'id' => 3,
'name' => 'My tag 3',
'task_id' => 2,
+ 'color_id' => null,
),
);
$this->assertEquals($expected, $listing[1]['tags']);
$this->assertEquals(array(), $listing[2]['tags']);
}
-} \ No newline at end of file
+}
diff --git a/tests/units/Model/TagModelTest.php b/tests/units/Model/TagModelTest.php
index f090ab4a..46151a8c 100644
--- a/tests/units/Model/TagModelTest.php
+++ b/tests/units/Model/TagModelTest.php
@@ -111,10 +111,11 @@ class TagModelTest extends Base
{
$tagModel = new TagModel($this->container);
$this->assertEquals(1, $tagModel->create(0, 'Tag 1'));
- $this->assertTrue($tagModel->update(1, 'Tag Updated'));
+ $this->assertTrue($tagModel->update(1, 'Tag Updated', 'purple'));
$tag = $tagModel->getById(1);
$this->assertEquals(0, $tag['project_id']);
$this->assertEquals('Tag Updated', $tag['name']);
+ $this->assertEquals('purple', $tag['color_id']);
}
}
diff --git a/tests/units/Model/TaskTagModelTest.php b/tests/units/Model/TaskTagModelTest.php
index 32158952..f83bb05a 100644
--- a/tests/units/Model/TaskTagModelTest.php
+++ b/tests/units/Model/TaskTagModelTest.php
@@ -86,17 +86,20 @@ class TaskTagModelTest extends Base
array(
'id' => 1,
'name' => 'My tag 1',
- 'task_id' => 1
+ 'task_id' => 1,
+ 'color_id' => null,
),
array(
'id' => 2,
'name' => 'My tag 2',
- 'task_id' => 1
+ 'task_id' => 1,
+ 'color_id' => null,
),
array(
'id' => 3,
'name' => 'My tag 3',
- 'task_id' => 1
+ 'task_id' => 1,
+ 'color_id' => null,
),
),
2 => array(
@@ -104,6 +107,7 @@ class TaskTagModelTest extends Base
'id' => 3,
'name' => 'My tag 3',
'task_id' => 2,
+ 'color_id' => null,
)
)
);