TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 07:09:48 +03:00
Code Issues Projects Releases Wiki Activity

Fixed isStripeEnabled usage in import validator tests

Browse Source 
refs c63a0e6826

- Reason for the fix same as in the referenced commit
This commit is contained in:
Nazar Gargol 2020-06-12 18:28:15 +12:00
parent c63a0e6826
commit 060b0e759b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghost/admin/app/services/member-import-validator.js
View File

@ -49,7 +49,7 @@ export default Service.extend({
validationResults.push(new MemberImportError('Stripe customer IDs exist in the data, but no stripe account is connected.'));
}
if (stripeLocalValidation === true) {
if (stripeLocalValidation === true && this.membersUtils.isStripeEnabled) {
let stripeSeverValidation = await this._checkStripeServer(validatedSet);
if (stripeSeverValidation !== true) {
validationResults.push(new MemberImportError('Stripe customer IDs exist in the data, but we could not find such customer in connected Stripe account'));
@ -86,10 +86,9 @@ export default Service.extend({
},
_checkStripeLocal(validatedSet) {
const isStripeConfigured = this.membersUtils.isStripeEnabled;
let result = true;
if (!isStripeConfigured) {
if (!this.membersUtils.isStripeEnabled) {
validatedSet.forEach((member) => {
if (member.stripe_customer_id) {
result = false;

6
ghost/admin/tests/integration/services/member-import-validator-test.js
View File

@ -5,7 +5,7 @@ import {expect} from 'chai';
import {setupTest} from 'ember-mocha';
let MembersUtilsStub = Service.extend({
isStripeEnabled: () => (true)
isStripeEnabled: true
});
describe('Integration: Service: member-import-validator', function () {
@ -39,7 +39,7 @@ describe('Integration: Service: member-import-validator', function () {
const result = await service.check([]);
expect(result.length).to.equal(1);
expect(result[0].message).to.equal('No data present in selected file.');
expect(result[0].message).to.equal('File is empty, nothing to import. Please select a different file.');
});
it('returns validation error for data with invalid email', async function () {
@ -56,7 +56,7 @@ describe('Integration: Service: member-import-validator', function () {
it('returns validation error for data with stripe_customer_id but no connected Stripe', async function () {
this.owner.register('service:membersUtils', Service.extend({
isStripeEnabled: () => (false)
isStripeEnabled: false
}));
let service = this.owner.lookup('service:member-import-validator');