mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-28 05:37:34 +03:00
Fixed mockLabs disabling all other flags (#14621)
refs TryGhost/Team#1566 - Mocking a labs flag (regardless of enabled/disabled) currently has a side effect of setting any other flag to undefined. - This meant in a test where we set a flag e.g. members-importer where we set multipleProducts, multipleNewsletters is always disabled - This fix preserves the default state of all labs flags that are not mocked so that labs behaves how we expect - Removed usage of GA flags in tests - Removed tests that had GA flags disabled Co-authored-by: Simon Backx <simon@ghost.org>
This commit is contained in:
parent
efdc42c257
commit
a703185497
@ -26,11 +26,6 @@ describe('Members Importer API', function () {
|
|||||||
newsletters = await getNewsletters();
|
newsletters = await getNewsletters();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
mockManager.mockLabsEnabled('multipleProducts');
|
|
||||||
mockManager.mockLabsEnabled('multipleNewsletters');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(function () {
|
afterEach(function () {
|
||||||
mockManager.restore();
|
mockManager.restore();
|
||||||
});
|
});
|
||||||
|
@ -1,50 +1,6 @@
|
|||||||
const {agentProvider, mockManager, fixtureManager, matchers} = require('../../utils/e2e-framework');
|
const {agentProvider, mockManager, fixtureManager, matchers} = require('../../utils/e2e-framework');
|
||||||
const {anyEtag, anyObjectId, anyUuid, anyISODateTime, anyISODate, anyString, anyArray, anyLocationFor, anyErrorId} = matchers;
|
const {anyEtag, anyObjectId, anyUuid, anyISODateTime, anyISODate, anyString, anyArray, anyLocationFor, anyErrorId} = matchers;
|
||||||
|
|
||||||
const assert = require('assert');
|
|
||||||
const nock = require('nock');
|
|
||||||
const should = require('should');
|
|
||||||
const sinon = require('sinon');
|
|
||||||
const testUtils = require('../../utils');
|
|
||||||
const Papa = require('papaparse');
|
|
||||||
|
|
||||||
const models = require('../../../core/server/models');
|
|
||||||
const {Product} = require('../../../core/server/models/product');
|
|
||||||
|
|
||||||
async function assertMemberEvents({eventType, memberId, asserts}) {
|
|
||||||
const events = await models[eventType].where('member_id', memberId).fetchAll();
|
|
||||||
events.map(e => e.toJSON()).should.match(asserts);
|
|
||||||
assert.equal(events.length, asserts.length, `Only ${asserts.length} ${eventType} should have been added.`);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function assertSubscription(subscriptionId, asserts) {
|
|
||||||
// eslint-disable-next-line dot-notation
|
|
||||||
const subscription = await models['StripeCustomerSubscription'].where('subscription_id', subscriptionId).fetch({require: true});
|
|
||||||
|
|
||||||
// We use the native toJSON to prevent calling the overriden serialize method
|
|
||||||
models.Base.Model.prototype.serialize.call(subscription).should.match(asserts);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getPaidProduct() {
|
|
||||||
return await Product.findOne({type: 'paid'});
|
|
||||||
}
|
|
||||||
|
|
||||||
const memberMatcherNoIncludes = {
|
|
||||||
id: anyObjectId,
|
|
||||||
uuid: anyUuid,
|
|
||||||
created_at: anyISODateTime,
|
|
||||||
updated_at: anyISODateTime
|
|
||||||
};
|
|
||||||
|
|
||||||
const memberMatcherShallowIncludes = {
|
|
||||||
id: anyObjectId,
|
|
||||||
uuid: anyUuid,
|
|
||||||
created_at: anyISODateTime,
|
|
||||||
updated_at: anyISODateTime,
|
|
||||||
subscriptions: anyArray,
|
|
||||||
labels: anyArray
|
|
||||||
};
|
|
||||||
|
|
||||||
const memberMatcherShallowIncludesForNewsletters = {
|
const memberMatcherShallowIncludesForNewsletters = {
|
||||||
id: anyObjectId,
|
id: anyObjectId,
|
||||||
uuid: anyUuid,
|
uuid: anyUuid,
|
||||||
@ -57,48 +13,6 @@ const memberMatcherShallowIncludesForNewsletters = {
|
|||||||
|
|
||||||
let agent;
|
let agent;
|
||||||
|
|
||||||
describe('Members API - No Newsletters', function () {
|
|
||||||
before(async function () {
|
|
||||||
agent = await agentProvider.getAdminAPIAgent();
|
|
||||||
await fixtureManager.init('members');
|
|
||||||
await agent.loginAsOwner();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
mockManager.mockLabsDisabled('multipleNewsletters');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(function () {
|
|
||||||
mockManager.restore();
|
|
||||||
});
|
|
||||||
|
|
||||||
// List Members
|
|
||||||
|
|
||||||
it('Can fetch members who are subscribed', async function () {
|
|
||||||
await agent
|
|
||||||
.get('/members/?filter=subscribed:true')
|
|
||||||
.expectStatus(200)
|
|
||||||
.matchBodySnapshot({
|
|
||||||
members: new Array(6).fill(memberMatcherShallowIncludes)
|
|
||||||
})
|
|
||||||
.matchHeaderSnapshot({
|
|
||||||
etag: anyEtag
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Can fetch members who are NOT subscribed', async function () {
|
|
||||||
await agent
|
|
||||||
.get('/members/?filter=subscribed:false')
|
|
||||||
.expectStatus(200)
|
|
||||||
.matchBodySnapshot({
|
|
||||||
members: new Array(2).fill(memberMatcherShallowIncludes)
|
|
||||||
})
|
|
||||||
.matchHeaderSnapshot({
|
|
||||||
etag: anyEtag
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Members API - With Newsletters', function () {
|
describe('Members API - With Newsletters', function () {
|
||||||
before(async function () {
|
before(async function () {
|
||||||
agent = await agentProvider.getAdminAPIAgent();
|
agent = await agentProvider.getAdminAPIAgent();
|
||||||
@ -106,10 +20,6 @@ describe('Members API - With Newsletters', function () {
|
|||||||
await agent.loginAsOwner();
|
await agent.loginAsOwner();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
mockManager.mockLabsEnabled('multipleNewsletters');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(function () {
|
afterEach(function () {
|
||||||
mockManager.restore();
|
mockManager.restore();
|
||||||
});
|
});
|
||||||
@ -148,10 +58,6 @@ describe('Members API - With Newsletters - compat mode', function () {
|
|||||||
await agent.loginAsOwner();
|
await agent.loginAsOwner();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
mockManager.mockLabsEnabled('multipleNewsletters');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(function () {
|
afterEach(function () {
|
||||||
mockManager.restore();
|
mockManager.restore();
|
||||||
});
|
});
|
||||||
|
@ -132,9 +132,6 @@ describe('Members API', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
mockManager.mockLabsEnabled('multipleProducts');
|
|
||||||
mockManager.mockLabsEnabled('multipleNewsletters');
|
|
||||||
mockManager.mockLabsEnabled('membersActivityFeed');
|
|
||||||
mockManager.mockStripe();
|
mockManager.mockStripe();
|
||||||
mockManager.mockMail();
|
mockManager.mockMail();
|
||||||
});
|
});
|
||||||
|
@ -15,10 +15,6 @@ describe('Tiers API', function () {
|
|||||||
await agent.loginAsOwner();
|
await agent.loginAsOwner();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
mockManager.mockLabsEnabled('multipleProducts');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(function () {
|
afterEach(function () {
|
||||||
mockManager.restore();
|
mockManager.restore();
|
||||||
});
|
});
|
||||||
|
@ -13,8 +13,6 @@ describe('Members Signin', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
mockManager.mockLabsEnabled('multipleProducts');
|
|
||||||
mockManager.mockLabsEnabled('tierWelcomePages');
|
|
||||||
mockManager.mockStripe();
|
mockManager.mockStripe();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -44,8 +44,7 @@ describe('Members API', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
mockManager.mockLabsEnabled('multipleProducts');
|
mockManager.mockLabsDisabled('dashboardV5');
|
||||||
mockManager.mockLabsEnabled('multipleNewsletters');
|
|
||||||
mockManager.mockMail();
|
mockManager.mockMail();
|
||||||
mockManager.mockStripe();
|
mockManager.mockStripe();
|
||||||
});
|
});
|
||||||
|
@ -3,10 +3,6 @@ const tiersHelper = require('../../../../core/frontend/helpers/tiers');
|
|||||||
const {mockManager} = require('../../../utils/e2e-framework');
|
const {mockManager} = require('../../../utils/e2e-framework');
|
||||||
|
|
||||||
describe('{{tiers}} helper', function () {
|
describe('{{tiers}} helper', function () {
|
||||||
beforeEach(function () {
|
|
||||||
mockManager.mockLabsEnabled('multipleProducts');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('can return string with tiers', function () {
|
it('can return string with tiers', function () {
|
||||||
const tiers = [
|
const tiers = [
|
||||||
{name: 'tier 1'},
|
{name: 'tier 1'},
|
||||||
|
@ -14,6 +14,9 @@ const mailService = require('../../core/server/services/mail/index');
|
|||||||
const labs = require('../../core/shared/labs');
|
const labs = require('../../core/shared/labs');
|
||||||
const events = require('../../core/server/lib/common/events');
|
const events = require('../../core/server/lib/common/events');
|
||||||
|
|
||||||
|
let fakedLabsFlags = {};
|
||||||
|
const originalLabsIsSet = labs.isSet;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stripe Mocks
|
* Stripe Mocks
|
||||||
*/
|
*/
|
||||||
@ -93,6 +96,15 @@ const emittedEvent = (name) => {
|
|||||||
/**
|
/**
|
||||||
* Labs Mocks
|
* Labs Mocks
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
const fakeLabsIsSet = (flag) => {
|
||||||
|
if (fakedLabsFlags.hasOwnProperty(flag)) {
|
||||||
|
return fakedLabsFlags[flag];
|
||||||
|
}
|
||||||
|
|
||||||
|
return originalLabsIsSet(flag);
|
||||||
|
};
|
||||||
|
|
||||||
const mockLabsEnabled = (flag, alpha = true) => {
|
const mockLabsEnabled = (flag, alpha = true) => {
|
||||||
// We assume we should enable alpha experiments unless explicitly told not to!
|
// We assume we should enable alpha experiments unless explicitly told not to!
|
||||||
if (!alpha) {
|
if (!alpha) {
|
||||||
@ -100,10 +112,10 @@ const mockLabsEnabled = (flag, alpha = true) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!mocks.labs) {
|
if (!mocks.labs) {
|
||||||
mocks.labs = sinon.stub(labs, 'isSet');
|
mocks.labs = sinon.stub(labs, 'isSet').callsFake(fakeLabsIsSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
mocks.labs.withArgs(flag).returns(true);
|
fakedLabsFlags[flag] = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockLabsDisabled = (flag, alpha = true) => {
|
const mockLabsDisabled = (flag, alpha = true) => {
|
||||||
@ -113,16 +125,17 @@ const mockLabsDisabled = (flag, alpha = true) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!mocks.labs) {
|
if (!mocks.labs) {
|
||||||
mocks.labs = sinon.stub(labs, 'isSet');
|
mocks.labs = sinon.stub(labs, 'isSet').callsFake(fakeLabsIsSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
mocks.labs.withArgs(flag).returns(false);
|
fakedLabsFlags[flag] = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
const restore = () => {
|
const restore = () => {
|
||||||
configUtils.restore();
|
configUtils.restore();
|
||||||
sinon.restore();
|
sinon.restore();
|
||||||
mocks = {};
|
mocks = {};
|
||||||
|
fakedLabsFlags = {};
|
||||||
emailCount = 0;
|
emailCount = 0;
|
||||||
nock.cleanAll();
|
nock.cleanAll();
|
||||||
nock.enableNetConnect();
|
nock.enableNetConnect();
|
||||||
|
Loading…
Reference in New Issue
Block a user