From 84561b2dbc06481ca53c4f5dbbf9bdb3fd11e512 Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Thu, 8 Dec 2016 20:15:09 -0800 Subject: [PATCH] Change to can accept donations from charges enabled --- app/models/stripe-connect-account.js | 1 + app/templates/project/settings/donations.hbs | 2 +- .../acceptance/project-donation-goals-test.js | 26 +++++++++---------- .../models/stripe-connect-account-test.js | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/models/stripe-connect-account.js b/app/models/stripe-connect-account.js index 7e94322d7..c1a98641d 100644 --- a/app/models/stripe-connect-account.js +++ b/app/models/stripe-connect-account.js @@ -5,6 +5,7 @@ import { belongsTo } from 'ember-data/relationships'; export default Model.extend({ businessName: attr(), businessUrl: attr(), + canAcceptDonations: attr(), chargesEnabled: attr(), displayName: attr(), email: attr(), diff --git a/app/templates/project/settings/donations.hbs b/app/templates/project/settings/donations.hbs index ef651fc9f..964131f59 100644 --- a/app/templates/project/settings/donations.hbs +++ b/app/templates/project/settings/donations.hbs @@ -1,6 +1,6 @@
{{#if stripeConnectAccount}} - {{#if stripeConnectAccount.chargesEnabled}} + {{#if stripeConnectAccount.canAcceptDonations}} {{donation-goals add=(action 'addDonationGoal') cancel=(action 'cancelDonationGoal') diff --git a/tests/acceptance/project-donation-goals-test.js b/tests/acceptance/project-donation-goals-test.js index 5dfc6d706..56898e613 100644 --- a/tests/acceptance/project-donation-goals-test.js +++ b/tests/acceptance/project-donation-goals-test.js @@ -41,7 +41,7 @@ test('it allows refreshing account if account does not have charges enabled yet' let project = createProjectWithSluggedRoute(); let { organization } = project; - let account = organization.createStripeConnectAccount({ chargesEnabled: false }); + let account = organization.createStripeConnectAccount({ canAcceptDonations: false }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -50,7 +50,7 @@ test('it allows refreshing account if account does not have charges enabled yet' andThen(() => { server.get('stripe-connect-accounts/:id', function() { assert.ok(true, 'Refresh was called'); - account.chargesEnabled = true; + account.canAcceptDonations = true; return account; }); @@ -69,7 +69,7 @@ test('it renders existing donation goals', function(assert) { let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 3, { project }); server.createList('donation-goal', 2); @@ -87,7 +87,7 @@ test('it sets up a new unsaved donation goal if there are no donation goals, whi let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -115,7 +115,7 @@ test('it is possible to add a donation goal when donation goals already exists', let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 1, { project }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -144,7 +144,7 @@ test('it allows editing of existing donation goals', function(assert) { let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 1, { project }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -173,7 +173,7 @@ test('cancelling edit of an unsaved new goal removes that goal from the list', f let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 1, { project }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -197,7 +197,7 @@ test('cancelling edit of an unsaved existing goal keeps that goal in the list', let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 1, { project }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -221,7 +221,7 @@ test('it allows activating donations for the project', function(assert) { let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 1, { project }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -248,7 +248,7 @@ test('it shows donation progress if donations are active', function(assert) { organization }); - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); server.createList('donation-goal', 1, { project }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -268,7 +268,7 @@ test('it does not show donation progress if donations are not active', function( donationsActive: false, organization }); - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -284,7 +284,7 @@ test('it renders validation errors', function(assert) { let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); @@ -328,7 +328,7 @@ test('it renders other errors', function(assert) { let project = createProjectWithSluggedRoute(); let { organization } = project; - organization.createStripeConnectAccount({ chargesEnabled: true }); + organization.createStripeConnectAccount({ canAcceptDonations: true }); authenticateAsMemberOfRole(this.application, server, organization, 'owner'); diff --git a/tests/unit/models/stripe-connect-account-test.js b/tests/unit/models/stripe-connect-account-test.js index fd774ce8d..9ac33425b 100644 --- a/tests/unit/models/stripe-connect-account-test.js +++ b/tests/unit/models/stripe-connect-account-test.js @@ -14,5 +14,5 @@ test('it exists', function(assert) { assert.ok(!!model); }); -testForAttributes('stripe-connect-account', ['accessCode', 'businessName', 'businessUrl', 'chargesEnabled', 'displayName', 'email', 'idFromStripe', 'insertedAt', 'updatedAt']); +testForAttributes('stripe-connect-account', ['accessCode', 'businessName', 'businessUrl', 'canAcceptDonations', 'chargesEnabled', 'displayName', 'email', 'idFromStripe', 'insertedAt', 'updatedAt']); testForBelongsTo('stripe-connect-account', 'organization');