diff --git a/dht-node/package.json b/dht-node/package.json index 049d0373f..564eed726 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -21,9 +21,7 @@ "dotenv": "10.0.0", "log4js": "^6.7.1", "nodemon": "^2.0.20", - "ts-node": "^10.9.1", "tsconfig-paths": "^4.1.2", - "typescript": "^4.9.4", "uuid": "^8.3.2" }, "devDependencies": { @@ -46,7 +44,9 @@ "eslint-plugin-security": "^1.7.1", "prettier": "^2.8.7", "jest": "^27.2.4", - "ts-jest": "^27.0.5" + "ts-jest": "^27.0.5", + "ts-node": "^10.9.1", + "typescript": "^4.9.4" }, "engines": { "node": ">=14" diff --git a/e2e-tests/cypress/e2e/SendCoins.feature b/e2e-tests/cypress/e2e/SendCoins.feature new file mode 100644 index 000000000..00267d331 --- /dev/null +++ b/e2e-tests/cypress/e2e/SendCoins.feature @@ -0,0 +1,38 @@ +Feature: Send coins + As a user + I want to send and receive GDD + I want to see transaction details on overview and transactions pages + + # Background: + # Given the following "users" are in the database: + # | email | password | name | + # | bob@baumeister.de | Aa12345_ | Bob Baumeister | + # | raeuber@hotzenplotz.de | Aa12345_ | Räuber Hotzenplotz | + + Scenario: Send GDD to other user + Given the user is logged in as "bob@baumeister.de" "Aa12345_" + And the user navigates to page "/send" + When the user fills the send form with "" "" "" + And the user submits the send form + Then the transaction details are presented for confirmation "" "" "" "" "" + When the user submits the transaction by confirming + Then the "" and "" are displayed on the "send" page + When the user navigates to page "/transactions" + Then the "" and "" are displayed on the "transactions" page + + Examples: + | receiverName | receiverEmail | amount | memoText | senderBalance | newSenderBalance | + | Räuber Hotzenplotz | raeuber@hotzenplotz.de | 120.50 | Some memo text | 515.11 | 394.61 | + + Scenario: Receive GDD from other user + Given the user is logged in as "raeuber@hotzenplotz.de" "Aa12345_" + And the user receives the transaction e-mail about "" GDD from "" + When the user opens the "transaction" link in the browser + Then the "" and "120.50" are displayed on the "overview" page + When the user navigates to page "/transactions" + Then the "" and "120.50" are displayed on the "transactions" page + + Examples: + | senderName | amount | + | Bob der Baumeister | 120,50 | + diff --git a/e2e-tests/cypress/e2e/models/OverviewPage.ts b/e2e-tests/cypress/e2e/models/OverviewPage.ts index 345124c66..e8f881eba 100644 --- a/e2e-tests/cypress/e2e/models/OverviewPage.ts +++ b/e2e-tests/cypress/e2e/models/OverviewPage.ts @@ -2,6 +2,8 @@ export class OverviewPage { navbarName = '[data-test="navbar-item-username"]' + rightLastTransactionsList = '.rightside-last-transactions' + goto() { cy.visit('/overview') diff --git a/e2e-tests/cypress/e2e/models/SendPage.ts b/e2e-tests/cypress/e2e/models/SendPage.ts new file mode 100644 index 000000000..07b531c4a --- /dev/null +++ b/e2e-tests/cypress/e2e/models/SendPage.ts @@ -0,0 +1,34 @@ +/// + +export class SendPage { + confirmationBox = '.transaction-confirm-send' + submitBtn = '.btn-gradido' + + enterReceiverEmail(email: string) { + cy.get('[data-test="input-identifier"]').find('input') + .clear() + .type(email) + return this + } + + enterAmount(amount: string) { + cy.get('[data-test="input-amount"]') + .find('input') + .clear() + .type(amount) + return this + } + + enterMemoText(text: string) { + cy.get('[data-test="input-textarea"]') + .find('textarea') + .clear() + .type(text) + return this + } + + submit() { + cy.get(this.submitBtn) + .click() + } +} diff --git a/e2e-tests/cypress/support/step_definitions/email_steps.ts b/e2e-tests/cypress/support/step_definitions/email_steps.ts index d31e2474e..31141e574 100644 --- a/e2e-tests/cypress/support/step_definitions/email_steps.ts +++ b/e2e-tests/cypress/support/step_definitions/email_steps.ts @@ -1,9 +1,9 @@ -import { Then, When } from '@badeball/cypress-cucumber-preprocessor' +import { And, Then, When } from '@badeball/cypress-cucumber-preprocessor' +import { OverviewPage } from '../../e2e/models/OverviewPage' import { ResetPasswordPage } from '../../e2e/models/ResetPasswordPage' import { UserEMailSite } from '../../e2e/models/UserEMailSite' const userEMailSite = new UserEMailSite() -const resetPasswordPage = new ResetPasswordPage() Then('the user receives an e-mail containing the {string} link', (linkName: string) => { let emailSubject: string @@ -18,6 +18,10 @@ Then('the user receives an e-mail containing the {string} link', (linkName: stri emailSubject = 'asswor' linkPattern = /\/reset-password\/[0-9]+\d/ break + case 'transaction': + emailSubject = 'Gradido gesendet' + linkPattern = /\/overview/ + break default: throw new Error(`Error in "Then the user receives an e-mail containing the {string} link" step: incorrect linkname string "${linkName}"`) } @@ -51,9 +55,56 @@ Then('the user receives an e-mail containing the {string} link', (linkName: stri ) }) +And('the user receives the transaction e-mail about {string} GDD from {string}', (amount: string, senderName:string) => { + cy.origin( + Cypress.env('mailserverURL'), + { args: { amount, senderName, userEMailSite } }, + ({ amount, senderName, userEMailSite }) => { + const subject = `${senderName} hat dir ${amount} Gradido gesendet` + const linkPattern = /\/transactions/ + cy.visit('/') + cy.get(userEMailSite.emailInbox).should('be.visible') + + cy.get(userEMailSite.emailList) + .find('.email-item') + .filter(`:contains(${subject})`) + .first() + .click() + + cy.get(userEMailSite.emailMeta) + .find(userEMailSite.emailSubject) + .contains(subject) + + cy.get('.email-content', { timeout: 2000}) + .find('.plain-text') + .contains(linkPattern) + .invoke('text') + .then((text) => { + const emailLink = text.match(linkPattern)[0] + cy.task('setEmailLink', emailLink) + }) + } + ) +}) + When('the user opens the {string} link in the browser', (linkName: string) => { + const resetPasswordPage = new ResetPasswordPage() cy.task('getEmailLink').then((emailLink) => { cy.visit(emailLink) }) - cy.get(resetPasswordPage.newPasswordInput).should('be.visible') + + switch (linkName) { + case 'activation': + cy.get(resetPasswordPage.newPasswordInput).should('be.visible') + break + case 'password reset': + cy.get(resetPasswordPage.newPasswordInput).should('be.visible') + break + case 'transaction': + const overviewPage = new OverviewPage() + cy.get(overviewPage.rightLastTransactionsList).should('be.visible') + break + default: + throw new Error(`Error in "Then the user receives an e-mail containing the {string} link" step: incorrect link name string "${linkName}"`) + } }) diff --git a/e2e-tests/cypress/support/step_definitions/send_coin_steps.ts b/e2e-tests/cypress/support/step_definitions/send_coin_steps.ts new file mode 100644 index 000000000..ba9eab4b4 --- /dev/null +++ b/e2e-tests/cypress/support/step_definitions/send_coin_steps.ts @@ -0,0 +1,70 @@ +import { And, Then, When } from '@badeball/cypress-cucumber-preprocessor' +import { SendPage } from '../../e2e/models/SendPage' + +const sendPage = new SendPage() + +When( + 'the user fills the send form with {string} {string} {string}', + (email: string, amount: string, memoText: string) => { + sendPage.enterReceiverEmail(email) + sendPage.enterAmount(amount) + sendPage.enterMemoText(memoText) + } +) + +And('the user submits the send form', () => { + sendPage.submit() + cy.get(sendPage.confirmationBox).should('be.visible') +}) + + +Then('the transaction details are presented for confirmation {string} {string} {string} {string} {string}', (receiverEmail: string, sendAmount: string, memoText: string, senderBalance: string, newSenderBalance: string) => { + cy.get('.transaction-confirm-send').contains(receiverEmail) + cy.get('.transaction-confirm-send').contains(`+ ${sendAmount} GDD`) + cy.get('.transaction-confirm-send').contains(memoText) + cy.get('.transaction-confirm-send').contains(`+ ${senderBalance} GDD`) + cy.get('.transaction-confirm-send').contains(`− ${sendAmount} GDD`) + cy.get('.transaction-confirm-send').contains(`+ ${newSenderBalance} GDD`) +}) + +When('the user submits the transaction by confirming', (receiverName: string, amount) => { + cy.intercept({ + method: 'POST', + url: '/graphql', + hostname: 'localhost', + }).as('sendCoins') + + sendPage.submit() + + cy.wait('@sendCoins').then((interception) => { + cy.wrap(interception.response?.statusCode).should('eq', 200) + cy.wrap(interception.request.body) + .should('have.property', 'query', `mutation ($identifier: String!, $amount: Decimal!, $memo: String!) { + sendCoins(identifier: $identifier, amount: $amount, memo: $memo) +} +` ) + cy.wrap(interception.response?.body) + .should('have.nested.property', 'data.sendCoins') + .and('equal', true) + }) + cy.get('[data-test="send-transaction-success-text"]').should('be.visible') +}) + +Then('the {string} and {string} are displayed on the {string} page', (name: string, amount: string, page: string) => { + switch (page) { + case 'overview': + cy.get('.align-items-center').contains(`${name}`) + cy.get('.align-items-center').contains(`${amount} GDD`) + break + case 'send': + cy.get('.align-items-center').contains(`${name}`) + cy.get('.align-items-center').contains(`${amount} GDD`) + break + case 'transactions': + cy.get('div.mt-3 > div > div.test-list-group-item').eq(0).contains('div.gdd-transaction-list-item-name', `${name}`) + cy.get('div.mt-3 > div > div.test-list-group-item').eq(0).contains('[data-test="transaction-amount"]', `${amount} GDD`) + break + default: + throw new Error(`Error in "Then the {string} and {string} are displayed on the {string}} page" step: incorrect page name string "${page}"`) + } +}) \ No newline at end of file diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue index 7778c6c6e..d6985ba16 100644 --- a/frontend/src/components/Transactions/TransactionReceive.vue +++ b/frontend/src/components/Transactions/TransactionReceive.vue @@ -26,7 +26,9 @@
{{ $t('decay.types.receive') }}
-
{{ amount | GDD }}
+
+ {{ amount | GDD }} +
{{ $t('via_link') }} {{ $t('decay.types.send') }}
-
{{ amount | GDD }}
+
+ {{ amount | GDD }} +
{{ $t('via_link') }}