Merge branch 'master' into feature/add-workdays-selector

Author: ykopstein

.github/workflows/run-unit-tests.yml

@@ -0,0 +1,25 @@
+name: Run Unit Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run unit tests
+        run: npm test
+        

src/App.vue

@@ -93,9 +93,4 @@ onMounted(() => {
 h1, h2 {
   font-weight: normal;
 }
-
-ul {
-  list-style-type: none;
-  padding: 0;
-}
 </style>

src/App.vue.test.ts

@@ -21,6 +21,7 @@ describe('App.vue', () => {
   afterEach(() => {
     wrapper.unmount();
     vi.clearAllMocks();
+    selectedYearSpy.mockClear();
   });
 
   it('renders the title and year selector', async () => {

src/components/MonthCard.vue

@@ -9,7 +9,7 @@
     </h5>
     <div class="card-body">
       <p v-if="holidays.length == 0">No chagim in {{ month }}!</p>
-      <ul class="days">
+      <ul class="days list-unstyled">
         <li v-for="holiday in holidays" :key="holiday.date" :class="{yt: holiday.yomtov}">
           <label>
             <input type="checkbox" :checked="selectedHolidays[holiday.date]" @change="(e) => selectedHolidays[holiday.date] = e.target.checked" />

src/useHmcState.test.ts

@@ -52,7 +52,7 @@ describe('createHmcState', () => {
 
     it('loads holidays and sets selectedHolidays when selectedYear changes', async () => {
         const state = createHmcState();
-        
+
         state.selectedYear.value = 1900;
         await nextTick();
 
@@ -76,7 +76,7 @@ describe('createHmcState', () => {
         expect(state.totalWeekends.value).toBe(1); // Sunday
 
         // Change workdays to Sun-Thu (0-4)
-        state.workdays.value = [0,1,2,3,4];
+        state.workdays.value = [0, 1, 2, 3, 4];
         await nextTick();
         expect(state.totalWeekdays.value).toBe(3); // Sunday, Monday, Tuesday
         expect(state.totalWeekends.value).toBe(0);
@@ -87,4 +87,24 @@ describe('createHmcState', () => {
         expect(state.totalWeekdays.value).toBe(0);
         expect(state.totalWeekends.value).toBe(3);
     });
-});
+
+    it('does not double count different holidays with the same date', async () => {
+        const state = createHmcState();
+        const weekendHoliday = createMockHmcHoliday({ subcat: 'major', date: new Date(2025, 3, 13), title: 'Weekend Holiday', isWeekend: true, isYomTov: true });
+        const weekendDupe = { ...weekendHoliday, title: 'Weekend Holiday - Duplicate' };
+        const weekdayHoliday = createMockHmcHoliday({ subcat: 'major', date: new Date(2025, 3, 14), title: 'Weekday', isWeekend: false, isYomTov: true });
+        const weekdayDupe = { ...weekdayHoliday, title: 'Weekday - Duplicate' };
+        state.holidays.value.all.push(weekendHoliday, weekendDupe, weekdayHoliday, weekdayDupe);
+        state.holidays.value.holidaysByMonth.April = [weekendHoliday, weekendDupe, weekdayHoliday, weekdayDupe];
+        await nextTick();
+
+        state.selectedHolidays.value[weekendHoliday.date] = true;
+        state.selectedHolidays.value[weekendDupe.date] = true;
+        state.selectedHolidays.value[weekdayHoliday.date] = true;
+        state.selectedHolidays.value[weekdayDupe.date] = true;
+        await nextTick();
+        
+        expect(state.totalWeekdays.value).toBe(1);
+        expect(state.totalWeekends.value).toBe(1);
+    });
+});