diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/LanguageTest.php b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/LanguageTest.php index 4e6bb14f9..6d2bf9bd8 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/LanguageTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/LanguageTest.php @@ -62,9 +62,11 @@ class LanguageTest extends TestCase public function testGetLanguageList() { $list = $this->object->getLanguageList(); - $this->assertCount(1, $list); - $this->assertEquals('en', $list[0]['LANG_ID']); - $this->assertEquals('English', $list[0]['LANG_NAME']); + $expected = [ + 'LANG_ID' => 'en', + 'LANG_NAME' => 'English', + ]; + $this->assertContains($expected, $list); } /** @@ -77,14 +79,21 @@ class LanguageTest extends TestCase { $this->installLanguage('es', __DIR__ . '/processmaker.es.po'); $list = $this->object->getLanguageList(); - $this->assertCount(2, $list); - $this->assertEquals('en', $list[0]['LANG_ID']); - $this->assertEquals('English', $list[0]['LANG_NAME']); - $this->assertEquals('es-ES', $list[1]['LANG_ID']); - $this->assertEquals('Spanish (Spain)', $list[1]['LANG_NAME']); + $english = [ + 'LANG_ID' => 'en', + 'LANG_NAME' => 'English', + ]; + $this->assertContains($english, $list); + + $spanish = [ + 'LANG_ID' => 'es-ES', + 'LANG_NAME' => 'Spanish (Spain)', + ]; + $this->assertContains($spanish, $list); + $this->uninstallLanguage('es', __DIR__ . '/processmaker.es.po'); $list2 = $this->object->getLanguageList(); - $this->assertCount(1, $list2); + $this->assertContains($english, $list2); } /** diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Model/DelegationTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Model/DelegationTest.php index 3f56c0379..d2e21d8a6 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/Model/DelegationTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/Model/DelegationTest.php @@ -220,10 +220,10 @@ class DelegationTest extends TestCase // Create a new delegation, but for this specific user factory(Delegation::class)->create([ 'USR_UID' => $user->USR_UID, - 'USR_ID' => $user->id + 'USR_ID' => $user->USR_ID ]); // Now fetch results, and assume delegation count is 1 and the user points to our user - $results = Delegation::search($user->id); + $results = Delegation::search($user->USR_ID); $this->assertCount(1, $results['data']); $this->assertEquals('testcaseuser', $results['data'][0]['USRCR_USR_USERNAME']); } @@ -644,7 +644,7 @@ class DelegationTest extends TestCase // Create a new delegation, but for this specific user factory(Delegation::class)->create([ 'USR_UID' => $user->USR_UID, - 'USR_ID' => $user->id + 'USR_ID' => $user->USR_ID ]); $user = factory(User::class)->create([ 'USR_USERNAME' => 'paul', @@ -654,7 +654,7 @@ class DelegationTest extends TestCase // Create a new delegation, but for this specific user factory(Delegation::class)->create([ 'USR_UID' => $user->USR_UID, - 'USR_ID' => $user->id + 'USR_ID' => $user->USR_ID ]); // Now fetch results, and assume delegation count is 2 and the ordering ascending return Gary $results = Delegation::search(null, 0, 25, null, null, null, 'ASC', 'APP_CURRENT_USER');