Browse files

Make Travis happy

Signed-off-by: dchill42 <dchill42@gmail.com>
  • Loading branch information...
1 parent cd68ce2 commit 4cfcdd3d8c144392003c33cb4628943ef8857fec @dchill42 committed Sep 21, 2012
View
2 system/core/CodeIgniter.php
@@ -682,7 +682,7 @@ protected function _load_support()
$this->load_core_class('Lang');
// Autoload libraries, etc.
- $this->load->ci_autoloader();
+ $this->load->_ci_autoloader();
// Mark end of core loading
$this->benchmark->mark('loading_time:_base_classes_end');
View
2 system/core/Loader.php
@@ -1321,7 +1321,7 @@ protected function _ci_init_class($class, $prefix = '', $config = NULL, $object_
*
* @return void
*/
- public function ci_autoloader()
+ public function _ci_autoloader()
{
$autoload = $this->CI->_autoload;
unset($this->CI->_autoload);
View
6 tests/codeigniter/core/CodeIgniter_test.php
@@ -23,6 +23,10 @@ public function tear_down()
* Test CodeIgniter instance singleton
*
* @covers CodeIgniter::instance
+ * @covers CodeIgniter::__construct
+ * @covers CodeIgniter::resolve_path
+ * @covers CodeIgniter::_get_class
+ * @covers CodeIgniter::_status_exit
*/
public function test_instance()
{
@@ -106,6 +110,7 @@ public function test_auto_package()
* Test $assign_to_config
*
* @covers CodeIgniter::instance
+ * @covers CodeIgniter::log_message
*/
public function test_assign_config()
{
@@ -226,6 +231,7 @@ public function test_load_core()
* Test calling a controller
*
* @covers CodeIgniter::call_controller
+ * @covers CodeIgniter::is_callable
*/
public function test_call_controller()
{
View
8 tests/codeigniter/core/Loader_test.php
@@ -83,6 +83,8 @@ public function test_ctor()
/**
* @covers CI_Loader::library
+ * @covers CI_Loader::_ci_load_class
+ * @covers CI_Loader::_ci_init_class
*/
public function test_library()
{
@@ -317,6 +319,8 @@ public function test_non_existent_model()
/**
* @covers CI_Loader::view
+ * @covers CI_Loader::_ci_load
+ * @covers CI_Loader::_ci_object_to_array
*/
public function test_load_view()
{
@@ -443,7 +447,7 @@ public function test_controller_result()
// --------------------------------------------------------------------
/**
- * @covers CI_Loader::controller
+ * @covers CI_Loader::controller_output
*/
public function test_controller_output()
{
@@ -484,6 +488,7 @@ public function test_controller_output()
/**
* @covers CI_Loader::file
+ * @covers CI_Loader::_ci_load
*/
public function test_file()
{
@@ -521,6 +526,7 @@ public function test_vars()
/**
* @covers CI_Loader::helper
+ * @covers CI_Loader::helpers
*/
public function test_helper()
{
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 = './mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'tests/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 = './mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'tests/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 = './mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'tests/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 = './mocks/uploads/ci_logo.gif';
+ $this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
$this->assertTrue($this->upload->do_xss_clean());
}
View
2 tests/mocks/core/loader.php
@@ -30,7 +30,7 @@ public function __construct()
*/
public function autoload()
{
- $this->ci_autoloader();
+ $this->_ci_autoloader();
}
}
View
12 tests/mocks/database/schema/skeleton.php
@@ -30,9 +30,11 @@ public static function init($driver)
CI_TestCase::instance()->ci_instance_var('db', $db);
- $loader = new Mock_Core_Loader();
- $loader->dbforge();
- $forge = CI_TestCase::instance()->ci_instance_var('dbforge');
+ require_once(BASEPATH.'database/DB_forge.php');
+ require_once(BASEPATH.'database/drivers/'.$driver.'/'.$driver.'_forge.php');
+ $class = 'CI_DB_'.$driver.'_forge';
+ $forge = new $class();
+ CI_TestCase::instance()->ci_instance_var('dbforge', $forge);
static::$db = $db;
static::$forge = $forge;
@@ -124,7 +126,7 @@ public static function create_data()
'job' => array(
array('id' => 1, 'name' => 'Developer', 'description' => 'Awesome job, but sometimes makes you bored'),
array('id' => 2, 'name' => 'Politician', 'description' => 'This is not really a job'),
- array('id' => 3, 'name' => 'Accountant', 'description' => 'Boring job, but you will get free snack at lunch'),
+ array('id' => 3, 'name' => 'Accountant', 'description' => 'Boring job, but you will get free snack at lunch'),
array('id' => 4, 'name' => 'Musician', 'description' => 'Only Coldplay can actually called Musician')
),
'misc' => array(
@@ -144,4 +146,4 @@ public static function create_data()
}
}
-}
+}

0 comments on commit 4cfcdd3

Please sign in to comment.