pkp#10306 update context dao determining based on application name

touhidurabir · Sep 15, 2024 · 2cad824 · 2cad824
1 parent 25261f6
commit 2cad824
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/classes/core/PKPContainer.php b/classes/core/PKPContainer.php
@@ -593,7 +593,7 @@ public function environment(string ...$environments): string|bool
      */
     public function runningUnitTests(): bool
     {
-        return false;
+        return $this->isRunningUnitTest;
     }
 
     /**

diff --git a/tests/PKPTestCase.php b/tests/PKPTestCase.php
@@ -256,7 +256,7 @@ protected function localeToRegExp(string $translation): string
 
     /**
      * Mock the mail facade
-     * @see https://laravel.com/docs/10.x/mocking
+     * @see https://laravel.com/docs/11.x/mocking
      */
     protected function mockMail(): void
     {

diff --git a/tests/jobs/doi/DepositContextTest.php b/tests/jobs/doi/DepositContextTest.php
@@ -68,7 +68,14 @@ public function testRunSerializedJob(): void
             ->andReturn($contextMock)
             ->getMock();
 
-        DAORegistry::registerDAO(substr(strrchr($contextDaoClass, '\\'), 1), $contextDaoMock);
+        DAORegistry::registerDAO(
+            match (Application::get()->getName()) {
+                'ojs2' => 'JournalDAO',
+                'omp' => 'PressDAO',
+                'ops' => 'ServerDAO',
+            },
+            $contextDaoMock
+        );
 
         $doiRepoMock = Mockery::mock(app(DoiRepository::class))
             ->makePartial()

diff --git a/tests/jobs/notifications/NewAnnouncementNotifyUsersTest.php b/tests/jobs/notifications/NewAnnouncementNotifyUsersTest.php
@@ -91,8 +91,15 @@ public function testRunSerializedJob(): void
             ->withAnyArgs()
             ->andReturn($contextMock)
             ->getMock();
-
-        DAORegistry::registerDAO(substr(strrchr($contextDaoClass, '\\'), 1), $contextDaoMock);
+
+        DAORegistry::registerDAO(
+            match (Application::get()->getName()) {
+                'ojs2' => 'JournalDAO',
+                'omp' => 'PressDAO',
+                'ops' => 'ServerDAO',
+            },
+            $contextDaoMock
+        );
 
         $emailTemplateMock = Mockery::mock(\PKP\emailTemplate\EmailTemplate::class)
             ->makePartial()

diff --git a/tests/jobs/notifications/StatisticsReportMailTest.php b/tests/jobs/notifications/StatisticsReportMailTest.php
@@ -76,7 +76,14 @@ public function testRunSerializedJob(): void
             ->andReturn($contextMock)
             ->getMock();
 
-        DAORegistry::registerDAO(substr(strrchr($contextDaoClass, '\\'), 1), $contextDaoMock);
+        DAORegistry::registerDAO(
+            match (Application::get()->getName()) {
+                'ojs2' => 'JournalDAO',
+                'omp' => 'PressDAO',
+                'ops' => 'ServerDAO',
+            },
+            $contextDaoMock
+        );
 
         $emailTemplateMock = Mockery::mock(\PKP\emailTemplate\EmailTemplate::class)
             ->makePartial()