After review 1

Author: tatevikg1

assets/vue/components/subscribers/SubscriberDirectory.spec.js

@@ -50,30 +50,31 @@ const ListSubscribersExportPanelStub = {
 }
 
 describe('SubscriberDirectory', () => {
-    const subscribers = [
+    const createSubscribers = () => ([
         {
             id: 1,
             email: 'john@example.com',
             confirmed: true,
             blacklisted: false,
             listCount: 2,
         },
-    ]
+    ])
 
-    const pagination = {
+    const createPagination = () => ({
         total: 1,
         isFirstPage: true,
         hasMore: false,
         afterId: null,
         prevId: null,
-    }
+    })
+
 
     const createWrapper = () =>
         mount(SubscriberDirectory, {
             global: {
                 provide: {
-                    subscribers,
-                    pagination,
+                    subscribers: createSubscribers(),
+                    pagination: createPagination(),
                 },
                 stubs: {
                     BaseIcon: BaseIconStub,
@@ -114,7 +115,7 @@ describe('SubscriberDirectory', () => {
         const table = wrapper.findComponent(SubscriberTableStub)
 
         expect(table.props('subscribers')).toEqual(
-            subscribers
+            createSubscribers()
         )
     })
 
@@ -192,9 +193,9 @@ describe('SubscriberDirectory', () => {
         backendFetch.mockResolvedValue({
             json: () =>
                 Promise.resolve({
-                    items: subscribers,
+                    items: createSubscribers(),
                     pagination: {
-                        ...pagination,
+                        ...createPagination(),
                         hasMore: true,
                         afterId: 10,
                     },

assets/vue/components/subscribers/SubscriberFilters.spec.js

@@ -1,5 +1,4 @@
 // SubscriberFilters.spec.js
-
 import { describe, it, expect } from 'vitest'
 import { mount } from '@vue/test-utils'
 import SubscriberFilters from './SubscriberFilters.vue'
@@ -121,7 +120,7 @@ describe('SubscriberFilters', () => {
 
         const buttons = wrapper.findAll('button')
 
-        if (buttons.length < 2) return
+        expect(buttons.length).toBeGreaterThan(2)
 
         await buttons[1].trigger('click')
         await buttons[2].trigger('click')
@@ -143,7 +142,7 @@ describe('SubscriberFilters', () => {
 
         const buttons = wrapper.findAll('button')
 
-        if (buttons.length < 2) return
+        expect(buttons.length).toBeGreaterThan(2)
 
         await buttons[1].trigger('click')
 

assets/vue/components/subscribers/SubscriberTable.spec.js

@@ -11,7 +11,7 @@ const BaseIconStub = {
 }
 
 describe('SubscriberTable', () => {
-    const subscribers = [
+    const createSubscribers = () => ([
         {
             id: 1,
             email: 'john@example.com',
@@ -28,12 +28,12 @@ describe('SubscriberTable', () => {
             listCount: 1,
             createdAt: '2025-01-02',
         },
-    ]
+    ])
 
     const createWrapper = (props = {}) =>
         mount(SubscriberTable, {
             props: {
-                subscribers,
+                subscribers: createSubscribers(),
                 ...props,
             },
             global: {

assets/vue/components/templates/TemplateLibrary.spec.js

@@ -1,6 +1,6 @@
 // TemplateLibrary.spec.js
 
-import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
 import { mount, flushPromises } from '@vue/test-utils'
 import TemplateLibrary from './TemplateLibrary.vue'
 import { templateClient } from '../../api'
@@ -28,6 +28,7 @@ const BaseIconStub = {
 }
 
 describe('TemplateLibrary', () => {
+    const originalConfirm = window.confirm
     beforeEach(() => {
         vi.clearAllMocks()
         window.confirm = vi.fn()
@@ -37,6 +38,10 @@ describe('TemplateLibrary', () => {
         })
     })
 
+    afterEach(() => {
+        window.confirm = originalConfirm
+    })
+
     const createWrapper = () =>
         mount(TemplateLibrary, {
             global: {

src/Service/PhpListTranslationLoader.php

@@ -71,9 +71,9 @@ private function mapLocaleToPhpListFile(string $locale): string
         $baseLocale = strtok($normalized, '_') ?: 'en';
 
         $map = [
-            'en' => 'english.php',
-            'es' => 'spanish.php',
-            'fr' => 'french.php',
+            'en' => 'english.inc',
+            'es' => 'spanish.inc',
+            'fr' => 'french.inc',
         ];
 
         return $map[$baseLocale] ?? 'english.php';

tests/Integration/Controller/PublicSubscribeControllerPantherTest.php

@@ -72,16 +72,17 @@ public function testSubscribePageDisplaysEmailFieldAndSubmitButton(): void
         ]);
         $client->request('GET', '/index.php/subscribe/1');
 
+        $client->takeScreenshot('var/screenshots/public-subscribe-0.png');
         $client->waitFor('form.legacy-form', 10);
-        $client->takeScreenshot('var/screenshots/public-subscribe.png');
+        $client->takeScreenshot('var/screenshots/public-subscribe-1.png');
 
         $currentPath = (string) parse_url($client->getCurrentURL(), PHP_URL_PATH);
 
         $this->assertSame('/index.php/subscribe/1', $currentPath);
         $this->assertNotSame('/login', $currentPath);
-        $this->assertSelectorExists('form.legacy-form');
-        $this->assertSelectorExists('input#email[name="email"][type="email"]');
-        $this->assertSelectorExists('button[type="submit"].legacy-button');
+        $this->assertSelectorExists('form');
+        $this->assertSelectorExists('input[name="email"][type="email"]');
+        $this->assertSelectorExists('button[type="submit"]');
     }
 
     /**