diff options
| author | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:43:34 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:43:34 +0100 |
| commit | 5e79f1b0dda522efcd1a0cb379d6e7fb1f5cc557 (patch) | |
| tree | feb0cfe39511d0c0b47455345c3df001564d91f0 | |
| parent | 2fa66ba7c6840ac851ae7da2889e7fb654dcda07 (diff) | |
Fix broken tests in develop
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | tests/codeigniter/core/Input_test.php | 8 | ||||
| -rw-r--r-- | tests/codeigniter/core/Utf8_test.php | 2 | ||||
| -rwxr-xr-x | tests/mocks/database/ci_test.sqlite | bin | 19456 -> 19456 bytes |
4 files changed, 2 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 483156678..f5b4e8db4 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,6 @@ }, "require-dev": { "mikey179/vfsstream": "1.6.*", - "phpunit/phpunit": "5.* || 9.*" + "phpunit/phpunit": "4.* || 5.* || 9.*" } } diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php index 72198b905..93d1b7118 100644 --- a/tests/codeigniter/core/Input_test.php +++ b/tests/codeigniter/core/Input_test.php @@ -26,14 +26,6 @@ class Input_test extends CI_TestCase { // -------------------------------------------------------------------- - public function tear_down() - { - $_POST = []; - $_GET = []; - } - - // -------------------------------------------------------------------- - public function test_get_not_exists() { $this->assertSame(array(), $this->input->get()); diff --git a/tests/codeigniter/core/Utf8_test.php b/tests/codeigniter/core/Utf8_test.php index 776213204..8ae51b8af 100644 --- a/tests/codeigniter/core/Utf8_test.php +++ b/tests/codeigniter/core/Utf8_test.php @@ -59,7 +59,7 @@ class Utf8_test extends CI_TestCase { elseif (ICONV_ENABLED) { // This is a known issue, iconv doesn't always work with //IGNORE - $this->assertContains($this->utf8->clean_string($illegal_utf8), array('тест', '')); + $this->assertContains($utf8->clean_string($illegal_utf8), array('тест', '')); } else { diff --git a/tests/mocks/database/ci_test.sqlite b/tests/mocks/database/ci_test.sqlite Binary files differindex cc76bd681..721fbd525 100755 --- a/tests/mocks/database/ci_test.sqlite +++ b/tests/mocks/database/ci_test.sqlite |