diff options
| author | Andrey Andreev <narf@devilix.net> | 2021-09-14 12:47:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 12:47:31 +0200 |
| commit | 4fa09ccaa80770ed11a2fdf6f1e28c5e14914be4 (patch) | |
| tree | 69cae04c446204d3500f117048e4092120787b04 /tests/codeigniter/helpers | |
| parent | 83a4588893dc1cde7d890a2461ac8af6efbf8ad7 (diff) | |
| parent | c7e171e0d83d7092d459c2754a1ee3aba33e43ef (diff) | |
Merge pull request #6045 from gxgpet/develop_fixtravis
Fixes Travis pipeline. Adding PHPUnit 8.
Diffstat (limited to 'tests/codeigniter/helpers')
| -rw-r--r-- | tests/codeigniter/helpers/file_helper_test.php | 5 | ||||
| -rw-r--r-- | tests/codeigniter/helpers/text_helper_test.php | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tests/codeigniter/helpers/file_helper_test.php b/tests/codeigniter/helpers/file_helper_test.php index dd74ee46b..8d7f8e1eb 100644 --- a/tests/codeigniter/helpers/file_helper_test.php +++ b/tests/codeigniter/helpers/file_helper_test.php @@ -6,10 +6,7 @@ class File_helper_Test extends CI_TestCase { { $this->helper('file'); - vfsStreamWrapper::register(); - vfsStreamWrapper::setRoot(new vfsStreamDirectory('testDir')); - - $this->_test_dir = vfsStreamWrapper::getRoot(); + $this->_test_dir = vfsStream::setup(''); } // -------------------------------------------------------------------- diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php index e51d96a29..36465f203 100644 --- a/tests/codeigniter/helpers/text_helper_test.php +++ b/tests/codeigniter/helpers/text_helper_test.php @@ -64,12 +64,7 @@ class Text_helper_test extends CI_TestCase { public function test_convert_accented_characters() { - $path = 'application/config/foreign_chars.php'; - $this->ci_vfs_clone($path); - if (is_php('7.4')) - { - copy(PROJECT_BASE.$path, APPPATH.'../'.$path); - } + $this->ci_vfs_clone('application/config/foreign_chars.php'); $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ')); $this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü')); } |