Skip to content

Commit

Permalink
Merge branches 'unit_tests' and 'unit_tests' of https://github.com/Or…
Browse files Browse the repository at this point in the history
…ifInformatique/stock into unit_tests
  • Loading branch information
DidierViret committed Jul 5, 2024
2 parents 9442f75 + 87d7d2b commit 7e22af9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion orif/stock/Controllers/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ public function save_user($user_id = 0)
'cb_not_null_user' => lang('user_lang.msg_err_user_not_exist')
],
'user_name' => [
'cb_unique_user' => lang('user_lang.msg_err_user_not_unique')
'cb_unique_user' => lang('user_lang.msg_err_username_not_unique')
],
'user_usertype' => [
'cb_not_null_user_type' => lang('user_lang.msg_err_user_type_not_exist')
Expand Down
2 changes: 1 addition & 1 deletion tests/database/ExampleDatabaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ final class ExampleDatabaseTest extends CIUnitTestCase
{
use DatabaseTestTrait;

// Execute migrations from all available namespaces
// Execute migrations from Tests\Support namespaces
protected $namespace = 'Tests\Support';

protected $seed = ExampleSeeder::class;
Expand Down
1 change: 1 addition & 0 deletions tests/orif/common/Views/AdminMenuTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class AdminMenuTest extends CIUnitTestCase
protected $migrateOnce = false;
protected $refresh = true;
protected $namespace = 'User';

protected function setUp(): void
{
parent::setUp();
Expand Down

0 comments on commit 7e22af9

Please sign in to comment.