#15 Fixed tests

pkp · Mar 13, 2022 · c1f7269 · c1f7269
1 parent 445208e
commit c1f7269
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CustomLocalePlugin.php b/CustomLocalePlugin.php
@@ -225,8 +225,9 @@ public function upgradeLocaleFiles(): void
         }
 
         $success = false;
-        $lockFile = new SplFileObject($lockFilePath, 'x');
+        $lockFile = null;
         try {
+            $lockFile = new SplFileObject($lockFilePath, 'x');
             if (!$lockFile->flock(LOCK_EX)) {
                 throw new Exception('Failed to lock file');
             }
@@ -294,10 +295,12 @@ public function upgradeLocaleFiles(): void
         } catch (Exception $e) {
             error_log("An exception happened while upgrading the customLocale plugin.\n" . $e);
         } finally {
-            $lockFile->flock(LOCK_UN);
-            $lockFile = null;
-            if (!$success) {
-                unlink($lockFilePath);
+            if ($lockFile) {
+                $lockFile->flock(LOCK_UN);
+                $lockFile = null;
+                if (!$success) {
+                    unlink($lockFilePath);
+                }
             }
         }
     }

diff --git a/cypress/tests/functional/CustomLocale.spec.js b/cypress/tests/functional/CustomLocale.spec.js
@@ -23,7 +23,7 @@ describe('Custom Locale plugin tests', function() {
 
 		// FIXME: The new settings tab handler doesn't jump right to the correct tab.
 		cy.get('button#customLocale-button').click();
-		cy.get('span.label:contains("lib/pkp/locale/en_US/user.po")').parent().parent().parent().contains('Edit').click();
+		cy.get('span.label:contains("en_US")').parent().parent().parent().contains('Edit').click();
 		cy.wait(1000); // Form init
 		cy.get('input.pkpSearch__input').type('user.affiliation');
 		cy.get('button.pkpButton:contains("Search")').click();