Skip to content
Browse files

Try again - still had errors

Signed-off-by: dchill42 <dchill42@gmail.com>
  • Loading branch information...
1 parent 4cfcdd3 commit 155020bee85117a5dc9cb446969ab8524abc2ce6 @dchill42 committed Sep 21, 2012
Showing with 5 additions and 5 deletions.
  1. +1 −1 tests/codeigniter/core/CodeIgniter_test.php
  2. +4 −4 tests/codeigniter/libraries/Upload_test.php
View
2 tests/codeigniter/core/CodeIgniter_test.php
@@ -439,7 +439,7 @@ public function test_load_support()
// and are called in routing
$classes = array(
'Benchmark' => array('methods' => array('mark($a)' => '$this->'.$marks.'[] = $a;')),
- 'Loader' => array('obj' => 'load', 'methods' => array('ci_autoloader()' =>
+ 'Loader' => array('obj' => 'load', 'methods' => array('_ci_autoloader()' =>
'$this->'.$auto.' = (isset(CodeIgniter::instance()->lang));')),
'Security' => array(),
'Input' => array(),
View
8 tests/codeigniter/libraries/Upload_test.php
@@ -108,7 +108,7 @@ function test_set_allowed_types()
function test_set_image_properties()
{
$this->upload->file_type = 'image/gif';
- $this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'mocks/uploads/ci_logo.gif';
$props = array(
'image_width' => 170,
@@ -157,7 +157,7 @@ function test_is_allowed_filetype()
$this->assertTrue($this->upload->is_allowed_filetype(FALSE));
$this->assertTrue($this->upload->is_allowed_filetype(TRUE));
- $this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'mocks/uploads/ci_logo.gif';
$this->upload->file_ext = '.gif';
$this->upload->file_type = 'image/gif';
$this->assertTrue($this->upload->is_allowed_filetype());
@@ -180,7 +180,7 @@ function test_is_allowed_dimensions()
$this->assertTrue($this->upload->is_allowed_dimensions());
$this->upload->file_type = 'image/gif';
- $this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'mocks/uploads/ci_logo.gif';
$this->upload->max_width = 10;
$this->assertFalse($this->upload->is_allowed_dimensions());
@@ -236,7 +236,7 @@ function test_do_xss_clean()
$this->upload->file_temp = vfsStream::url('file3.txt');
$this->assertFalse($this->upload->do_xss_clean());
- $this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'mocks/uploads/ci_logo.gif';
$this->assertTrue($this->upload->do_xss_clean());
}

0 comments on commit 155020b

Please sign in to comment.
Something went wrong with that request. Please try again.