Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115 from ericbarnes/fix/str_tests 

Fix/str tests
This commit is contained in:
Taylor Otwell 2011-10-11 13:38:36 -07:00
parent d9512221dc aa607c9962
commit e979cf14a2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/str.php
View File

@ -118,7 +118,7 @@ public static function limit($value, $length = 100, $end = '...')
if (function_exists('mb_substr'))
{
return mb_substr($value, 0, $length).$end;
return mb_substr($value, 0, $length, Config::get('application.encoding')).$end;
}
return substr($value, 0, $length).$end;

13
tests/Cases/StrTest.php
View File

@ -35,4 +35,17 @@ public function test_random()
{
$this->assertEquals(5, strlen(Laravel\Str::random(5)));
}
public function test_limit()
{
$this->assertEquals('Thi...', Laravel\Str::limit('This is a string of text', 3, '...'));
$this->assertEquals('This is ', Laravel\Str::limit('This is a string of text', 7, ' '));
$this->assertEquals('τάχ', Laravel\Str::limit('τάχιστη', 3, ''));
}
public function test_limit_words()
{
$this->assertEquals('This is a...', Laravel\Str::limit_words('This is a string of text', 3, '...'));
$this->assertEquals('This is a string ', Laravel\Str::limit_words('This is a string of text', 4, ' '));
}
}