Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 2025-08-content-build

Browse Source
This commit is contained in:
CuriousMagpie
2025-06-20 12:47:37 -04:00
parent b2efb8286b 9a072e3e76
commit b957d2a3b0
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/content/schedule.test.js
+6 -6
View File
@@ -133,21 +133,21 @@ describe('Content Schedule', () => {
});
it('sets the end date for a gala', () => {
const date = new Date('2024-05-20');
const date = new Date('2024-05-31');
const matchers = getAllScheduleMatchingGroups(date);
expect(matchers.seasonalGear.end).to.eql(moment.utc(`2024-06-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
expect(matchers.seasonalGear.end).to.eql(moment.utc(`2024-06-01T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
});
it('sets the end date for a winter gala', () => {
const date = new Date('2024-12-22');
const date = new Date('2025-02-28');
const matchers = getAllScheduleMatchingGroups(date);
expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-01T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
});
it('sets the end date in new year for a winter gala', () => {
const date = new Date('2025-01-04');
const date = new Date('2025-02-28');
const matchers = getAllScheduleMatchingGroups(date);
expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-01T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
});
it('uses correct date for first hours of the month', () => {
website/common/script/content/constants/events.js
+4 -4
View File
@@ -83,8 +83,8 @@ export const REPEATING_EVENTS = {
foodSeason: 'Cake',
},
fallGemSale: {
start: new Date('1970-09-17T04:00-04:00'),
end: new Date('1970-09-24T23:59-04:00'),
start: new Date('1970-08-27T04:00-04:00'),
end: new Date('1970-09-03T23:59-04:00'),
event: 'fall_extra_gems',
gemsPromo,
},
@@ -109,8 +109,8 @@ export const REPEATING_EVENTS = {
foodSeason: 'Pie',
},
giftOneGetOne: {
start: new Date('1970-12-17T04:00-05:00'),
end: new Date('1970-01-09T23:59-05:00'),
start: new Date('1970-12-18T04:00-05:00'),
end: new Date('1970-01-05T23:59-05:00'),
promo: 'g1g1',
},
};
website/common/script/content/constants/schedule.js
+1 -1
View File
@@ -664,7 +664,7 @@ export const MONTHLY_SCHEDULE = {
},
};
export const GALA_SWITCHOVER_DAY = 21;
export const GALA_SWITCHOVER_DAY = 1;
export const GALA_KEYS = [
'winter',
'spring',