Fixed tests

OpenBuildings · Mar 21, 2014 · 2a9787c · 2a9787c
1 parent 08aa737
commit 2a9787c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/classes/Kohana/Tart/Column.php b/classes/Kohana/Tart/Column.php
@@ -141,7 +141,7 @@ public function sort_anchor()
 
 		return
 			HTML::anchor(Tart::uri($this->controller()).URL::query(array('sort' => $this->name().':'.$direction)),
-			$this->label().' '.HTML::tag('i', array('class' => $class)));
+			$this->label().' '.'<i class="'.$class.'"><i>');
 	}
 
 	protected static function render_association(Jam_Model $item, Jam_Association $association)

diff --git a/classes/Kohana/Tart/Table.php b/classes/Kohana/Tart/Table.php
@@ -67,7 +67,14 @@ public function render()
 					}
 					foreach ($self->columns() as $column)
 					{
-						$h('th', array('width' => $column->width(), 'nowrap'), $column->sort() ? $column->sort_anchor() : $column->label());
+						$attributes = array('width' => $column->width());
+
+						if ($column->sort())
+						{
+							$attributes['nowrap'] = 'nowrap';
+						}
+
+						$h('th', $attributes, $column->sort() ? $column->sort_anchor() : $column->label());
 					}
 				});
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 require_once __DIR__.'/../vendor/autoload.php';
 
@@ -58,3 +58,5 @@ function test_autoload($class)
 HTML::$windowed_urls = TRUE;
 
 Kohana::$environment = Kohana::TESTING;
+
+Request::factory();
diff --git a/tests/tests/tableTest.php b/tests/tests/tableTest.php
@@ -1,11 +1,11 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
 /**
- * Jamtart_TableTest 
+ * Jamtart_TableTest
  *
  * @group jam-tart
  * @group jam-tart.table
- * 
+ *
  * @package Jam tart
  * @author Ivan Kerin
  * @copyright  (c) 2011-2013 Despark Ltd.
@@ -55,7 +55,11 @@ public function test_render()
 			array('id' => 1, 'name' => 'London', 'population' => 10),
 			array('id' => 2, 'name' => 'New York', 'population' => 15),
 		));
-		$columns = array('name' => new Tart_Column(), 'population' => new Tart_Column());
+		$name = new Tart_Column();
+		$name->sort(FALSE);
+		$population = new Tart_Column();
+		$population->sort(FALSE);
+		$columns = array('name' => $name, 'population' => $population);
 		$table = new Tart_Table($collection, $columns);
 		$table->selected(FALSE);