Commit d91a3f79 authored by Joshua Yu's avatar Joshua Yu

Merge branch 'main' into 'master'

update code See merge request !19
parents 661b7eae 28eeae38
......@@ -142,6 +142,35 @@ describe('case01: Transaction with Succeeded=> Success', function () {
}
});
it('Case 04: update user country => Success', (done) => {
try {
setTimeout(() => {//Wait syncTimeAPI*1000 seconds
ApiReq.updateUserCountry(API_Env.get().headerSet, {"countryCode": "GB",
"countryName": "United Kingdom",
"userId":testData['id']
}, (res, url, header, bodyObject) => {
request = JSON.stringify(bodyObject);
request = {
URL: url,
Headers: header,
Body: JSON.parse(request)
};
// response = res.body;
// Expect response headers:x-app,Content-Type
expect(res.statusCode).to.equal(200);
const resBody = JSON.parse(res.body);
response = resBody;
console.log(resBody)
// // token check
expect(resBody.code).to.equal(0);
done();
});
}, 1000);
} catch (e) {
done(e);
}
});
it('case 05 -Transaction with Succeeded => Success ', (done) => {
(async () => {
......@@ -155,6 +184,7 @@ describe('case01: Transaction with Succeeded=> Success', function () {
await baseStep.waitUntilElement(Driver, loginPage.user_email, 20000);
await loginPage.loginUserPortal(Driver, testUser)
await baseStep.wait(Driver, 1000);
await baseStep.click(Driver, userPlanPage.menu_plan);
await baseStep.waitUntilElement(Driver, userPlanPage.plan_page_sign, 20000);
await userPlanPage.selectPlan(Driver, 'Month Plan');
await baseStep.waitUntilElement(Driver, userPlanPage.bank_card, 20000);
......@@ -200,7 +230,7 @@ describe('case01: Transaction with Succeeded=> Success', function () {
await baseStep.click(Driver, merchantTransactionPage.menu_transaction);
await baseStep.wait(Driver, 2000);
await baseStep.screenShot(Driver, savaPath + '/01_SuccessTransaction.jpeg');
await merchantTransactionPage.checkRecordTransactionList(Driver, "€24.4", "Succeeded", "Payment", "stripe");
await merchantTransactionPage.checkRecordTransactionList(Driver, "€24", "Succeeded", "Payment", "Stripe");
done();
} catch (e) {
......@@ -346,6 +376,7 @@ describe('case02: Transaction with Pending=> Success', function () {
await baseStep.waitUntilElement(Driver, loginPage.user_email, 20000);
await loginPage.loginUserPortal(Driver, testUser)
await baseStep.wait(Driver, 1000);
await baseStep.click(Driver, userPlanPage.menu_plan);
await baseStep.waitUntilElement(Driver, userPlanPage.plan_page_sign, 20000);
await userPlanPage.selectPlan(Driver, 'Month Plan');
await baseStep.click(Driver, userPlanPage.wire_transfer);
......@@ -384,7 +415,7 @@ describe('case02: Transaction with Pending=> Success', function () {
await baseStep.click(Driver, merchantTransactionPage.menu_transaction);
await baseStep.wait(Driver, 2000);
await baseStep.screenShot(Driver, savaPath + '/02_PendingTransaction.jpeg');
await merchantTransactionPage.checkRecordTransactionList(Driver, "€24.4", "Pending", "Payment", "Wire Transfer");
await merchantTransactionPage.checkRecordTransactionList(Driver, "€24", "Pending", "Payment", "Wire Transfer");
done();
......@@ -532,6 +563,7 @@ describe('case03: Transaction with Failed=> Success', function () {
await baseStep.waitUntilElement(Driver, loginPage.user_email, 20000);
await loginPage.loginUserPortal(Driver, testUser)
await baseStep.wait(Driver, 1000);
await baseStep.click(Driver, userPlanPage.menu_plan);
await baseStep.waitUntilElement(Driver, userPlanPage.plan_page_sign, 20000);
await userPlanPage.selectPlan(Driver, 'Month Plan');
await baseStep.click(Driver, userPlanPage.wire_transfer);
......@@ -573,7 +605,7 @@ describe('case03: Transaction with Failed=> Success', function () {
await baseStep.click(Driver, merchantTransactionPage.menu_transaction);
await baseStep.wait(Driver, 2000);
await baseStep.screenShot(Driver, savaPath + '/03_FailedTransaction.jpeg');
await merchantTransactionPage.checkRecordTransactionList(Driver, "€24.4", "Failed", "Payment", "Wire Transfer");
await merchantTransactionPage.checkRecordTransactionList(Driver, "€24", "Failed", "Payment", "Wire Transfer");
done();
......@@ -721,6 +753,7 @@ describe('case04: Transaction with refund => Success', function () {
await baseStep.waitUntilElement(Driver, loginPage.user_email, 20000);
await loginPage.loginUserPortal(Driver, testUser)
await baseStep.wait(Driver, 1000);
await baseStep.click(Driver, userPlanPage.menu_plan);
await baseStep.waitUntilElement(Driver, userPlanPage.plan_page_sign, 20000);
await userPlanPage.selectPlan(Driver, 'Month Plan');
await baseStep.waitUntilElement(Driver, userPlanPage.bank_card, 20000);
......@@ -772,7 +805,7 @@ describe('case04: Transaction with refund => Success', function () {
await baseStep.refreshPage(Driver);
await merchantInvoicePage.checkRecordInvoiceList(Driver,
"-€1", "Credit Note", "Refunded", "stripe", testUser);
"-€1", "Credit Note", "Refunded", "Stripe", testUser);
done();
......@@ -800,7 +833,7 @@ describe('case04: Transaction with refund => Success', function () {
await baseStep.click(Driver, merchantTransactionPage.menu_transaction);
await baseStep.wait(Driver, 2000);
await baseStep.screenShot(Driver, savaPath + '/04_RefundTransaction.jpeg');
await merchantTransactionPage.checkRecordTransactionList(Driver, "€1", "Succeeded", "Refund", "stripe");
await merchantTransactionPage.checkRecordTransactionList(Driver, "€1", "Succeeded", "Refund", "Stripe");
done();
......
......@@ -12,7 +12,7 @@ const baseStep = require('../../../CommonStep/Web/Web_Common_Step');
const API_Object = require("../../../CommonStep/API/API_Object");
const API_Env = require("../../../CommonStep/API/API_Env");
const ApiReq = new API_Object("http://localhost:8088");
const ApiReq = new API_Object("https://api.unibee.top");
const addContext = require('mochawesome/addContext');
const {expect} = require("chai");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment