summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-06-05 15:36:22 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-06-05 15:36:22 +0200
commitf4a53ce71feadb867b3ea462cb5a5b3f5052a035 (patch)
treec07356184af4908ceda54b00549280cda1b86d59 /tests/codeigniter
parent8fe766dcd4251070c4b9dc52e882b14189e3df66 (diff)
parentd348cb0fd6f255074bc410f169072e2f613074fe (diff)
Merge pull request #1425 from jjaffeux/develop
Add test when loading language file and not using the language parameter
Diffstat (limited to 'tests/codeigniter')
-rw-r--r--tests/codeigniter/core/Lang_test.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index a414f0ace..874230feb 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -18,13 +18,14 @@ class Lang_test extends CI_TestCase {
public function test_load()
{
$this->assertTrue($this->lang->load('profiler', 'english'));
+ $this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
}
-
- // --------------------------------------------------------------------
- public function test_line()
+ // --------------------------------------------------------------------
+
+ public function test_load_with_unspecified_language()
{
- $this->assertTrue($this->lang->load('profiler', 'english'));
+ $this->assertTrue($this->lang->load('profiler'));
$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
}