mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-14 05:07:22 +01:00
Merge branch 'release' into develop
This commit is contained in:
@@ -370,10 +370,6 @@ describe('payments/index', () => {
|
||||
});
|
||||
|
||||
context('Purchasing a subscription for self', () => {
|
||||
beforeEach(() => {
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
});
|
||||
|
||||
it('creates a subscription', async () => {
|
||||
expect(user.purchased.plan.planId).to.not.exist;
|
||||
|
||||
@@ -400,7 +396,6 @@ describe('payments/index', () => {
|
||||
user.purchased.plan = plan;
|
||||
user.purchased.plan.dateTerminated = moment(new Date()).add(2, 'months');
|
||||
expect(user.purchased.plan.extraMonths).to.eql(0);
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
|
||||
await api.createSubscription(data);
|
||||
|
||||
@@ -411,7 +406,6 @@ describe('payments/index', () => {
|
||||
user.purchased.plan = plan;
|
||||
user.purchased.plan.dateTerminated = moment(new Date()).subtract(2, 'months');
|
||||
expect(user.purchased.plan.extraMonths).to.eql(0);
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
|
||||
await api.createSubscription(data);
|
||||
|
||||
@@ -421,7 +415,6 @@ describe('payments/index', () => {
|
||||
it('does not reset Gold-to-Gems cap on additional subscription', async () => {
|
||||
user.purchased.plan = plan;
|
||||
user.purchased.plan.gemsBought = 10;
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
|
||||
await api.createSubscription(data);
|
||||
|
||||
@@ -558,10 +551,6 @@ describe('payments/index', () => {
|
||||
});
|
||||
|
||||
context('Block subscription perks', () => {
|
||||
beforeEach(() => {
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
});
|
||||
|
||||
it('adds block months to plan.consecutive.offset', async () => {
|
||||
await api.createSubscription(data);
|
||||
|
||||
@@ -598,7 +587,6 @@ describe('payments/index', () => {
|
||||
data.sub.key = 'basic_12mo';
|
||||
|
||||
await api.createSubscription(data);
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
await api.createSubscription(data);
|
||||
|
||||
expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(25);
|
||||
@@ -765,7 +753,6 @@ describe('payments/index', () => {
|
||||
now: mayMysteryItemTimeframe,
|
||||
toFake: ['Date'],
|
||||
});
|
||||
data.user.purchased.plan.dateUpdated = moment().subtract(1, 'hours').toDate();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
||||
Reference in New Issue
Block a user