From 20d9b0a9c03955da0010a3df91adcd9b8e6e7d58 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 20 Dec 2017 19:57:39 +0200 Subject: Merge pull request #5354 from carusogabriel/refactoring-tests Refactoring tests Conflicts resolved: tests/codeigniter/core/Utf8_test.php tests/codeigniter/database/query_builder/group_test.php tests/codeigniter/libraries/Form_validation_test.php --- tests/codeigniter/core/Security_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/codeigniter/core/Security_test.php') diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php index 4c54ec9fa..c3113adba 100644 --- a/tests/codeigniter/core/Security_test.php +++ b/tests/codeigniter/core/Security_test.php @@ -252,7 +252,7 @@ class Security_test extends CI_TestCase { // Perform hash $this->security->xss_hash(); - $this->assertTrue(preg_match('#^[0-9a-f]{32}$#iS', $this->security->xss_hash) === 1); + $this->assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b