mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-13 12:47:28 +01:00
commit dd0a410fa6c3741dc0d6793283cf4df3c37790a5 Author: Kalista Payne <sabrecat@gmail.com> Date: Mon Nov 4 14:24:30 2024 -0600 fix(subs): center next hourglass message commit 72d92ffd76bb43fee8ba2bbabd211e595afbd664 Author: Kalista Payne <sabrecat@gmail.com> Date: Fri Nov 1 14:17:59 2024 -0500 fix(subs): don't hide HG preview entirely commit ea0ecb0c3d519ed3d5c42266367eaaa7283ac5de Author: Kalista Payne <sabrecat@gmail.com> Date: Fri Nov 1 13:01:06 2024 -0500 fix(subs): Google wording and HG escape commit 2bd2c69e18e37c8c8c7106c62f186c372d25c5d2 Author: Kalista Payne <sabrecat@gmail.com> Date: Fri Nov 1 09:25:30 2024 -0500 fix(layout): tighten cancellation note commiteb2fc40d24Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 24 15:41:43 2024 -0500 fix(g1g1): don't try to find Gems promo during bogo commitd3eea86bd7Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 24 15:00:09 2024 -0500 fix(subs): fix typeError commite3ae9a2d67Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 24 13:57:27 2024 -0500 fix(subs): also redirect to subs after gift sub commit690163a0deAuthor: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 16:42:38 2024 +0200 fix test commit2ad7541fc0Author: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 16:34:52 2024 +0200 fix test commit7e337a9e59Author: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 11:54:15 2024 +0200 remove only commit7462b8a57fAuthor: Phillip Thelen <phillip@habitica.com> Date: Wed Oct 23 11:51:25 2024 +0200 fix bug with incorrectly giving HG bonus commitacd6183e95Author: Kalista Payne <sabrecat@gmail.com> Date: Mon Oct 21 17:22:26 2024 -0500 fix(subs): unhovery and un-12-monthy commit935e9fd6ecAuthor: Kalista Payne <sabrecat@gmail.com> Date: Fri Oct 18 14:50:17 2024 -0500 fix(subs): try again on gifts commit6e1fb7df38Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 18:19:20 2024 -0500 fix(lint): do negate object ig commit71d434b94eAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 18:15:11 2024 -0500 fix(lint): unnecessary ternary commitb90b0bb9c3Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 17:34:24 2024 -0500 fix(subs): gifts DON't renew commit19469304c5Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 17:13:29 2024 -0500 fix(subs): pass autoRenews through Stripe commit6819e7b7e5Author: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 17 16:03:25 2024 -0500 fix(subscriptions): minor visual updates commit74633b5e5eAuthor: Kalista Payne <sabrecat@gmail.com> Date: Wed Oct 16 17:27:09 2024 -0500 fix(subscriptions): more gift layout revisions commita90ccb89deAuthor: Kalista Payne <sabrecat@gmail.com> Date: Wed Oct 16 15:37:50 2024 -0500 fix(subscription): update layout when gifting commitc24b2db8dcAuthor: Phillip Thelen <phillip@habitica.com> Date: Mon Oct 14 16:11:46 2024 +0200 fix issue with promo hourglasses commit7a61c72b47Author: Phillip Thelen <phillip@habitica.com> Date: Mon Oct 14 15:59:40 2024 +0200 don’t give additional HG for new sub if they already got one this month commitf14cb09026Author: Phillip Thelen <phillip@habitica.com> Date: Mon Oct 14 10:38:01 2024 +0200 Admin panel display fixes commitf4cff698cfAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 3 17:58:59 2024 -0500 fix(stripe): correct redirect after success commitc468b58f3fAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Oct 3 17:35:37 2024 -0500 fix(subs): correct border-radius and redirect commit78fb9e31d6Author: Kalista Payne <sabrecat@gmail.com> Date: Wed Oct 2 17:41:49 2024 -0500 fix(css): correct and refactor heights and selection states commite2babe8053Author: Kalista Payne <sabrecat@gmail.com> Date: Mon Sep 30 16:45:29 2024 -0500 feat(subscription): max Gems progress readout commit61af8302a3Author: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 15:11:22 2024 +0200 fix test commitef8ff0ea9eAuthor: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 14:14:44 2024 +0200 show date for hourglass bonus if it was received commit4bafafdc8dAuthor: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 14:12:52 2024 +0200 add new field for cumulative subscription count commit30096247b7Author: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 13:39:49 2024 +0200 fix missing transaction type commit70872651b0Author: Phillip Thelen <phillip@habitica.com> Date: Fri Sep 27 13:31:40 2024 +0200 fix admin panel strings commitf3398db65fAuthor: Kalista Payne <sabrecat@gmail.com> Date: Thu Sep 26 23:11:16 2024 -0500 WIP(subs): extant Stripe state commitc6b2020109Author: Phillip Thelen <phillip@habitica.com> Date: Thu Sep 26 11:41:55 2024 +0200 fix admin panel display commitd9afc96d2dAuthor: Phillip Thelen <phillip@habitica.com> Date: Thu Sep 26 11:40:16 2024 +0200 Fix hourglass logic for upgrades commit6e2c8eeb64Author: Phillip Thelen <phillip@habitica.com> Date: Wed Sep 25 17:48:54 2024 +0200 fix hourglass count commitcd752fbdceAuthor: Kalista Payne <sabrecat@gmail.com> Date: Fri Sep 20 12:24:21 2024 -0500 WIP(frontend): draft of main subs page view commit0102b29d59Author: Kalista Payne <sabe@habitica.com> Date: Wed Sep 18 15:29:08 2024 -0500 fix(admin): correct logic and style for shrimple subs commit5469a5c5c3Author: Kalista Payne <sabe@habitica.com> Date: Wed Sep 18 15:07:36 2024 -0500 fix(test): short circuit this. commit526193ee6cAuthor: Phillip Thelen <phillip@habitica.com> Date: Wed Sep 18 14:42:06 2024 +0200 fix gem limit commit19cf1636aaAuthor: Phillip Thelen <phillip@habitica.com> Date: Tue Aug 13 17:00:40 2024 +0200 return nextHourglassDate again commiteea36e3ed5Author: Phillip Thelen <phillip@habitica.com> Date: Tue Aug 13 13:11:22 2024 +0200 subscription test improvements commitca78e74330Author: Phillip Thelen <phillip@habitica.com> Date: Mon Aug 12 15:46:15 2024 +0200 add more subscription tests commitf4c4f93a08Author: Phillip Thelen <phillip@habitica.com> Date: Fri Aug 9 13:35:22 2024 +0200 finish basic implementation of new logic commite036742048Author: Phillip Thelen <phillip@habitica.com> Date: Fri Aug 9 11:37:44 2024 +0200 cleanup commit6431865688Author: Phillip Thelen <phillip@habitica.com> Date: Wed Aug 7 05:41:18 2024 -0400 update cron tests commit930d875ae9Author: Phillip Thelen <phillip@habitica.com> Date: Thu Aug 8 10:36:50 2024 +0200 begin refactoring commit96623608d0Author: Phillip Thelen <phillip@habitica.com> Date: Tue Aug 6 16:28:16 2024 +0200 begin removing obsolete tests
230 lines
6.6 KiB
JavaScript
230 lines
6.6 KiB
JavaScript
import moment from 'moment';
|
|
|
|
import { startOfDay, daysSince, getPlanContext } from '../../../website/common/script/cron';
|
|
|
|
function localMoment (timeString, utcOffset) {
|
|
return moment(timeString).utcOffset(utcOffset, true);
|
|
}
|
|
|
|
describe('cron utility functions', () => {
|
|
describe('startOfDay', () => {
|
|
it('is zero when no daystart configured', () => {
|
|
const options = { now: moment('2020-02-02 09:30:00Z'), timezoneOffset: 0 };
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-02 00:00:00Z');
|
|
});
|
|
|
|
it('is zero when negative daystart configured', () => {
|
|
const options = {
|
|
now: moment('2020-02-02 09:30:00Z'),
|
|
timezoneOffset: 0,
|
|
daystart: -5,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-02 00:00:00Z');
|
|
});
|
|
|
|
it('is zero when daystart over 24 is configured', () => {
|
|
const options = {
|
|
now: moment('2020-02-02 09:30:00Z'),
|
|
timezoneOffset: 0,
|
|
daystart: 25,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-02 00:00:00Z');
|
|
});
|
|
|
|
it('is equal to daystart o\'clock when daystart configured', () => {
|
|
const options = {
|
|
now: moment('2020-02-02 09:30:00Z'),
|
|
timezoneOffset: 0,
|
|
dayStart: 5,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-02 05:00:00Z');
|
|
});
|
|
|
|
it('is previous day daystart o\'clock when daystart is after current time', () => {
|
|
const options = {
|
|
now: moment('2020-02-02 04:30:00Z'),
|
|
timezoneOffset: 0,
|
|
dayStart: 5,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-01 05:00:00Z');
|
|
});
|
|
|
|
it('is daystart o\'clock when daystart is after current time due to timezone', () => {
|
|
const options = {
|
|
now: moment('2020-02-02 04:30:00Z'),
|
|
timezoneOffset: -120,
|
|
dayStart: 5,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-02 05:00:00+02:00');
|
|
});
|
|
|
|
it('returns in default timezone if no timezone defined', () => {
|
|
const utcOffset = moment().utcOffset();
|
|
const now = localMoment('2020-02-02 04:30:00', utcOffset).utc();
|
|
|
|
const result = startOfDay({ now });
|
|
|
|
expect(result).to.be.sameMoment(localMoment('2020-02-02', utcOffset));
|
|
});
|
|
|
|
it('returns in default timezone if timezone lower than -12:00', () => {
|
|
const utcOffset = moment().utcOffset();
|
|
const options = {
|
|
now: localMoment('2020-02-02 17:30:00', utcOffset).utc(),
|
|
timezoneOffset: 721,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment(localMoment('2020-02-02', utcOffset));
|
|
});
|
|
|
|
it('returns in default timezone if timezone higher than +14:00', () => {
|
|
const utcOffset = moment().utcOffset();
|
|
const options = {
|
|
now: localMoment('2020-02-02 07:32:25.376', utcOffset).utc(),
|
|
timezoneOffset: -841,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment(localMoment('2020-02-02', utcOffset));
|
|
});
|
|
|
|
it('returns in overridden timezone if override present', () => {
|
|
const options = {
|
|
now: moment('2020-02-02 13:30:27Z'),
|
|
timezoneOffset: 0,
|
|
timezoneUtcOffsetOverride: -240,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment('2020-02-02 00:00:00-04:00');
|
|
});
|
|
|
|
it('returns start of yesterday if timezone difference carries it over datelines', () => {
|
|
const offset = 300;
|
|
const options = {
|
|
now: moment('2020-02-02 04:30:00Z'),
|
|
timezoneOffset: offset,
|
|
};
|
|
|
|
const result = startOfDay(options);
|
|
|
|
expect(result).to.be.sameMoment(localMoment('2020-02-01', -offset));
|
|
});
|
|
});
|
|
|
|
describe('daysSince', () => {
|
|
it('correctly calculates days between two dates', () => {
|
|
const now = moment();
|
|
const dayBeforeYesterday = moment(now).subtract({ days: 2 });
|
|
|
|
expect(daysSince(dayBeforeYesterday, { now })).to.equal(2);
|
|
});
|
|
|
|
it('is one lower if current time is before dayStart', () => {
|
|
const oneWeekAgoAtOnePm = moment().hour(13).subtract({ days: 7 });
|
|
const thisMorningThreeAm = moment().hour(3);
|
|
const options = {
|
|
now: thisMorningThreeAm,
|
|
dayStart: 6,
|
|
};
|
|
|
|
const result = daysSince(oneWeekAgoAtOnePm, options);
|
|
|
|
expect(result).to.equal(6);
|
|
});
|
|
|
|
it('is one higher if reference time is before dayStart and current time after dayStart', () => {
|
|
const oneWeekAgoAtEightAm = moment().hour(8).subtract({ days: 7 });
|
|
const todayAtFivePm = moment().hour(17);
|
|
const options = {
|
|
now: todayAtFivePm,
|
|
dayStart: 11,
|
|
};
|
|
|
|
const result = daysSince(oneWeekAgoAtEightAm, options);
|
|
|
|
expect(result).to.equal(8);
|
|
});
|
|
|
|
// Variations in timezone configuration options are already covered by startOfDay tests.
|
|
it('uses now in user timezone as configured in options', () => {
|
|
const timezoneOffset = 120;
|
|
const options = {
|
|
now: moment('1989-11-09 02:53:00+01:00'),
|
|
timezoneOffset,
|
|
};
|
|
|
|
const result = daysSince(localMoment('1989-11-08', -timezoneOffset), options);
|
|
|
|
expect(result).to.equal(0);
|
|
});
|
|
});
|
|
|
|
describe('getPlanContext', () => {
|
|
function baseUserData (count, offset, planId) {
|
|
return {
|
|
purchased: {
|
|
plan: {
|
|
consecutive: {
|
|
count,
|
|
offset,
|
|
gemCapExtra: 26,
|
|
trinkets: 19,
|
|
},
|
|
quantity: 1,
|
|
extraMonths: 0,
|
|
gemsBought: 0,
|
|
owner: '116b4133-8fb7-43f2-b0de-706621a8c9d8',
|
|
nextBillingDate: null,
|
|
nextPaymentProcessing: null,
|
|
planId,
|
|
customerId: 'group-plan',
|
|
dateUpdated: '2022-05-10T03:00:00.144+01:00',
|
|
paymentMethod: 'Group Plan',
|
|
dateTerminated: null,
|
|
lastBillingDate: null,
|
|
dateCreated: '2017-02-10T19:00:00.355+01:00',
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
it('elapsedMonths is 0 if its the same month', () => {
|
|
const user = baseUserData(60, 0, 'group_plan_auto');
|
|
|
|
const planContext = getPlanContext(user, new Date(2022, 4, 20));
|
|
expect(planContext.elapsedMonths).to.equal(0);
|
|
});
|
|
|
|
it('elapsedMonths is 1 after one month', () => {
|
|
const user = baseUserData(60, 0, 'group_plan_auto');
|
|
|
|
const planContext = getPlanContext(user, new Date(2022, 5, 11));
|
|
|
|
expect(planContext.elapsedMonths).to.equal(1);
|
|
});
|
|
});
|
|
});
|