feat(Events): use provided timezone when constructing repeating.exclu…

…de (#210) * use provided timezone when constructing repeating.exclude * tests for issue #210 * fix indentation
sebbo2002 · Aug 18, 2020 · bd84230 · bd84230
1 parent 10327ac
commit bd84230
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/event.js b/src/event.js
@@ -504,7 +504,12 @@ class ICalEvent {
             c._data.repeating.exclude = [];
             exclude.forEach(function (excludedDate, i) {
                 if (typeof excludedDate === 'string') {
-                    excludedDate = moment(excludedDate);
+                    let timezone = repeating.excludeTimezone || c._calendar._data.timezone;
+                    if (timezone) {
+                        excludedDate = moment.tz(excludedDate, timezone);
+                    } else {
+                        excludedDate = moment(excludedDate);
+                    }
                 }
                 else if (excludedDate instanceof Date) {
                     excludedDate = moment(excludedDate);

diff --git a/test/test_issues.js b/test/test_issues.js
@@ -106,4 +106,47 @@ describe('Issues', function () {
             });
         });
     });
+
+    describe('Issue #210', function () {
+        it('should repeat/exclude with Europe/Berlin', function () {
+            const calendar = ical({
+                domain: 'sebbo.net',
+                prodId: '//superman-industries.com//ical-generator//EN',
+                timezone: 'Europe/Berlin',
+                events: [{
+                    start: '2020-08-13T00:00:00',
+                    summary: 'Example Event',
+                    repeating: {
+                        freq: 'MONTHLY',
+                        count: 12,
+                        exclude: '2020-12-13T00:00:00',
+                        excludeTimezone: 'Europe/Berlin'
+                    }
+                }]
+            });
+
+            const str = calendar.toString();
+            assert.ok(str.indexOf('EXDATE;TZID=Europe/Berlin:20201213T000000') > -1);
+        });
+        it('should repeat/exclude with America/New_York', function () {
+            const calendar = ical({
+                domain: 'sebbo.net',
+                prodId: '//superman-industries.com//ical-generator//EN',
+                timezone: 'America/New_York',
+                events: [{
+                    start: '2020-08-13T00:00:00',
+                    summary: 'Example Event',
+                    repeating: {
+                        freq: 'MONTHLY',
+                        count: 12,
+                        exclude: '2020-12-13T00:00:00',
+                        excludeTimezone: 'America/New_York',
+                    }
+                }]
+            });
+
+            const str = calendar.toString();
+            assert.ok(str.indexOf('EXDATE;TZID=America/New_York:20201213T000000') > -1);
+        });
+    });
 });