summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-08-03 09:05:29 +0200
committerAndrey Andreev <narf@devilix.net>2015-08-03 09:05:29 +0200
commit10fb7d17b2025de4963da8b0108fda4da36ade11 (patch)
treee408495939d1bd6f9e693cebb9dd54e767fedb49 /tests
parent3da611e5b4c9cda8d70975d638f6f05066e46bc4 (diff)
[ci skip] Normalize tabs/spaces
Partial changes from PR #4016
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/core/Security_test.php2
-rw-r--r--tests/codeigniter/libraries/Driver_test.php11
-rw-r--r--tests/mocks/database/schema/skeleton.php2
3 files changed, 8 insertions, 7 deletions
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index 3acd2a598..bab76dffb 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -71,7 +71,7 @@ class Security_test extends CI_TestCase {
$this->assertEquals("Hello, i try to [removed]alert&#40;'Hack'&#41;;[removed] your site", $harmless_string);
}
- // --------------------------------------------------------------------
+ // --------------------------------------------------------------------
public function test_xss_clean_string_array()
{
diff --git a/tests/codeigniter/libraries/Driver_test.php b/tests/codeigniter/libraries/Driver_test.php
index d98e8ab98..c62cbee45 100644
--- a/tests/codeigniter/libraries/Driver_test.php
+++ b/tests/codeigniter/libraries/Driver_test.php
@@ -4,6 +4,7 @@
* Driver library base class unit test
*/
class Driver_test extends CI_TestCase {
+
/**
* Set up test framework
*/
@@ -13,11 +14,11 @@ class Driver_test extends CI_TestCase {
$this->subclass = 'Mock_Libraries_';
$this->ci_set_config('subclass_prefix', $this->subclass);
- // Mock Loader->get_package_paths
- $paths = 'get_package_paths';
- $ldr = $this->getMock('CI_Loader', array($paths));
- $ldr->expects($this->any())->method($paths)->will($this->returnValue(array(APPPATH, BASEPATH)));
- $this->ci_instance_var('load', $ldr);
+ // Mock Loader->get_package_paths
+ $paths = 'get_package_paths';
+ $ldr = $this->getMock('CI_Loader', array($paths));
+ $ldr->expects($this->any())->method($paths)->will($this->returnValue(array(APPPATH, BASEPATH)));
+ $this->ci_instance_var('load', $ldr);
// Create mock driver library
$this->name = 'Driver';
diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index 5fe5b0f30..888236ff3 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -131,7 +131,7 @@ class Mock_Database_Schema_Skeleton {
'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(