diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index f3f2e5c93..6173238ae 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -200,7 +200,7 @@ Factory.define('donations') .attr('id', uuid) .attr('showDonations', true) .attr('goal', 15000) - .attr('progress', 0) + .attr('progress', 7000) .after((buildObject, options) => { return neode.create('Donations', buildObject) }) diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index 5d39fb82c..377caf0b0 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -35,6 +35,9 @@ const createDefaultAdminUser = async (session) => { id: "${defaultAdmin.id}", slug: "${defaultAdmin.slug}", createdAt: toString(datetime()), + allowEmbedIframes: false, + showShoutsPublicly: false, + sendNotificationEmails: true, deleted: false, disabled: false })-[:PRIMARY_EMAIL]->(e)`, diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index 982150d00..a9210f6a5 100644 --- a/backend/src/schema/resolvers/donations.spec.js +++ b/backend/src/schema/resolvers/donations.spec.js @@ -88,7 +88,7 @@ describe('donations', () => { it('returns the current Donations info', async () => { await expect(query({ query: donationsQuery, variables })).resolves.toMatchObject({ - data: { Donations: { showDonations: true, goal: 15000, progress: 0 } }, + data: { Donations: { showDonations: true, goal: 15000, progress: 7000 } }, errors: undefined, }) }) diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js index fc504f7cd..ea420bc2a 100644 --- a/backend/src/schema/resolvers/registration.js +++ b/backend/src/schema/resolvers/registration.js @@ -91,9 +91,9 @@ const signupCypher = (inviteCode) => { SET user.role = 'user' SET user.createdAt = toString(datetime()) SET user.updatedAt = toString(datetime()) - SET user.allowEmbedIframes = FALSE - SET user.showShoutsPublicly = FALSE - SET user.sendNotificationEmails = TRUE + SET user.allowEmbedIframes = false + SET user.showShoutsPublicly = false + SET user.sendNotificationEmails = true SET email.verifiedAt = toString(datetime()) RETURN user {.*} ` diff --git a/webapp/pages/admin/donations.spec.js b/webapp/pages/admin/donations.spec.js index 41b80a83d..3476aec06 100644 --- a/webapp/pages/admin/donations.spec.js +++ b/webapp/pages/admin/donations.spec.js @@ -143,14 +143,16 @@ describe('donations.vue', () => { it('calls mutation with input values once', async () => { wrapper.find('#showDonations').trigger('click') // set to true + await wrapper.vm.$nextTick() wrapper.find('#donations-goal').setValue('20000') await wrapper.vm.$nextTick() + wrapper.find('#donations-progress').setValue('10000') + await wrapper.vm.$nextTick() wrapper.find('.donations-info-button').trigger('submit') await wrapper.vm.$nextTick() - await flushPromises() expect(mocks.$apollo.mutate).toHaveBeenCalledWith( expect.objectContaining({ - variables: { showDonations: true, goal: 15000, progress: 0 }, + variables: { showDonations: true, goal: 20000, progress: 10000 }, }), ) }) @@ -161,7 +163,7 @@ describe('donations.vue', () => { expect(wrapper.vm.showDonations).toBe(false) // wrapper.find('.donations-info-button').trigger('submit') // await mocks.$apollo.mutate - // expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining({variables: { showDonations: false, goal: 15000, progress: 0 }})) + // expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining({variables: { showDonations: false, goal: 15000, progress: 7000 }})) // expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1) }) diff --git a/webapp/pages/admin/donations.vue b/webapp/pages/admin/donations.vue index 26920e050..1caedb9e1 100644 --- a/webapp/pages/admin/donations.vue +++ b/webapp/pages/admin/donations.vue @@ -24,6 +24,7 @@ data-test="donations-goal" />