From 896d23def9178b33f1019625a1532fe935e782fd Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Tue, 18 Feb 2020 08:13:46 -0500 Subject: [PATCH] fix tests, bill no longer has quantity/price, only total --- .../models/include/referral_signup.json | 6 ----- .../pay_credit_refund_and_restart.json | 6 ----- .../models/tests/payment/pay_free.json | 6 ----- .../tests/payment/recurring_billing.json | 24 ------------------- .../models/tests/promo/account_credit.json | 16 ------------- .../models/tests/promo/first_month_free.json | 18 -------------- .../models/tests/promo/multi_promo.json | 18 -------------- .../tests/promo/referral_month_free.json | 18 -------------- 8 files changed, 112 deletions(-) diff --git a/bubble-server/src/test/resources/models/include/referral_signup.json b/bubble-server/src/test/resources/models/include/referral_signup.json index f79750f1..9b758f0a 100644 --- a/bubble-server/src/test/resources/models/include/referral_signup.json +++ b/bubble-server/src/test/resources/models/include/referral_signup.json @@ -164,8 +164,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{<>.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{<>.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{<>.[0].price}}"}, {"condition": "json[0].getTotal() === {{<>.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -180,8 +178,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{<>.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{<>.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{<>.[0].price}}"}, {"condition": "json[0].getTotal() === {{<>.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -218,8 +214,6 @@ {"condition": "json[0].getPaymentMethod() === _find(<>, function(p) { return p.getMaskedPaymentInfo() === 'FirstMonthFree'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{<>.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{<>.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{<>.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{<>.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] diff --git a/bubble-server/src/test/resources/models/tests/payment/pay_credit_refund_and_restart.json b/bubble-server/src/test/resources/models/tests/payment/pay_credit_refund_and_restart.json index d8535f9f..9bbf53eb 100644 --- a/bubble-server/src/test/resources/models/tests/payment/pay_credit_refund_and_restart.json +++ b/bubble-server/src/test/resources/models/tests/payment/pay_credit_refund_and_restart.json @@ -141,8 +141,6 @@ "check": [ {"condition": "json.length === 1"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -294,8 +292,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan2.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"} ] } @@ -327,8 +323,6 @@ {"condition": "json[0].getStatus().name() === 'success'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan2.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] diff --git a/bubble-server/src/test/resources/models/tests/payment/pay_free.json b/bubble-server/src/test/resources/models/tests/payment/pay_free.json index ce4776a8..5ef241fa 100644 --- a/bubble-server/src/test/resources/models/tests/payment/pay_free.json +++ b/bubble-server/src/test/resources/models/tests/payment/pay_free.json @@ -177,8 +177,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -193,8 +191,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -227,8 +223,6 @@ {"condition": "json[0].getStatus().name() === 'success'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] diff --git a/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json b/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json index ebca77e9..28113d7e 100644 --- a/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json +++ b/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json @@ -141,8 +141,6 @@ "check": [ {"condition": "json.length === 1"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -206,8 +204,6 @@ {"condition": "json.length === 2"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -226,8 +222,6 @@ {"condition": "json[0].getStatus().name() === 'success'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -243,8 +237,6 @@ {"condition": "json.length === 3"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -263,8 +255,6 @@ {"condition": "json[0].getStatus().name() === 'success'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -280,14 +270,10 @@ {"condition": "json.length === 5"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"}, {"condition": "json[1].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[1].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[1].getQuantity() === 1"}, - {"condition": "json[1].getPrice() === {{plans.[0].price}}"}, {"condition": "json[1].getTotal() === {{plans.[0].price}}"}, {"condition": "json[1].getStatus().name() === 'paid'"} ] @@ -306,8 +292,6 @@ {"condition": "json[0].getStatus().name() === 'success'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"}, {"condition": "json[1].getPlan() === '{{plans.[0].uuid}}'"}, @@ -316,8 +300,6 @@ {"condition": "json[1].getStatus().name() === 'success'"}, {"condition": "json[1].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[1].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[1].getBillObject().getQuantity() === 1"}, - {"condition": "json[1].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[1].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[1].getBillObject().getStatus().name() === 'paid'"} ] @@ -335,8 +317,6 @@ {"condition": "json.length === 6"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'unpaid'"} ] @@ -355,8 +335,6 @@ {"condition": "json[0].getStatus().name() === 'failure'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'unpaid'"} ] @@ -391,8 +369,6 @@ {"condition": "json.length === 6"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"} ] } diff --git a/bubble-server/src/test/resources/models/tests/promo/account_credit.json b/bubble-server/src/test/resources/models/tests/promo/account_credit.json index bc1f6630..255dba75 100644 --- a/bubble-server/src/test/resources/models/tests/promo/account_credit.json +++ b/bubble-server/src/test/resources/models/tests/promo/account_credit.json @@ -339,8 +339,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -355,8 +353,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -413,8 +409,6 @@ {"condition": "_find(paymentMethods, function (p) { return p.getUuid() === json[2].getPaymentMethod(); }).getPaymentMethodType().name() === 'promotional_credit'"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -430,8 +424,6 @@ {"condition": "json.length === 2"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -452,8 +444,6 @@ {"condition": "json[0].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -474,8 +464,6 @@ {"condition": "json[0].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -519,8 +507,6 @@ {"condition": "json.length === 3"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -544,8 +530,6 @@ {"condition": "json[1].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'promotional_credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] diff --git a/bubble-server/src/test/resources/models/tests/promo/first_month_free.json b/bubble-server/src/test/resources/models/tests/promo/first_month_free.json index 8d3f0d8e..39e78edb 100644 --- a/bubble-server/src/test/resources/models/tests/promo/first_month_free.json +++ b/bubble-server/src/test/resources/models/tests/promo/first_month_free.json @@ -151,8 +151,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -167,8 +165,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -205,8 +201,6 @@ {"condition": "json[0].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'promotional_credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -302,8 +296,6 @@ {"condition": "json.length === 2"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan2.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -318,8 +310,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan2.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -356,8 +346,6 @@ {"condition": "json[0].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan2.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -373,8 +361,6 @@ {"condition": "json.length === 2"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -395,8 +381,6 @@ {"condition": "json[0].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -417,8 +401,6 @@ {"condition": "json[0].getPaymentMethod() === _find(paymentMethods, function(p) { return p.getPaymentMethodType().name() === 'credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{accountPlan2.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] diff --git a/bubble-server/src/test/resources/models/tests/promo/multi_promo.json b/bubble-server/src/test/resources/models/tests/promo/multi_promo.json index 16d48f58..fef92cc2 100644 --- a/bubble-server/src/test/resources/models/tests/promo/multi_promo.json +++ b/bubble-server/src/test/resources/models/tests/promo/multi_promo.json @@ -250,8 +250,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -266,8 +264,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -304,8 +300,6 @@ {"condition": "_find(referringPaymentMethods, function(p) { return p.getUuid() === json[0].getPaymentMethod() && p.getMaskedPaymentInfo() === 'FirstMonthFree' }) !== null"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -322,8 +316,6 @@ {"condition": "json.length === 2"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -412,8 +404,6 @@ {"condition": "json.length === 3"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -517,8 +507,6 @@ {"condition": "json.length === 4"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -607,8 +595,6 @@ {"condition": "json.length === 5"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -697,8 +683,6 @@ {"condition": "json.length === 6"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -791,8 +775,6 @@ {"condition": "json.length === 7"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] diff --git a/bubble-server/src/test/resources/models/tests/promo/referral_month_free.json b/bubble-server/src/test/resources/models/tests/promo/referral_month_free.json index 6a8e7583..57d9b0cc 100644 --- a/bubble-server/src/test/resources/models/tests/promo/referral_month_free.json +++ b/bubble-server/src/test/resources/models/tests/promo/referral_month_free.json @@ -296,8 +296,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -312,8 +310,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -350,8 +346,6 @@ {"condition": "json[0].getPaymentMethod() === referringCreditPaymentMethod.getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -462,8 +456,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referredAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -478,8 +470,6 @@ {"condition": "json.length === 1"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referredAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -516,8 +506,6 @@ {"condition": "json[0].getPaymentMethod() === _find(referredPaymentMethods, function(p) { return p.getPaymentMethodType().name() === 'promotional_credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{referredAccountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -533,8 +521,6 @@ {"condition": "json.length === 2"}, {"condition": "json[0].getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getAccountPlan() === '{{referredAccountPlan.uuid}}'"}, - {"condition": "json[0].getQuantity() === 1"}, - {"condition": "json[0].getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getStatus().name() === 'paid'"} ] @@ -555,8 +541,6 @@ {"condition": "json[0].getPaymentMethod() === _find(referredPaymentMethods, function(p) { return p.getPaymentMethodType().name() === 'credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{referredAccountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ] @@ -580,8 +564,6 @@ {"condition": "json[0].getPaymentMethod() === _find(referringPaymentMethods, function(p) { return p.getPaymentMethodType().name() === 'promotional_credit'; }).getUuid()"}, {"condition": "json[0].getBillObject().getPlan() === '{{plans.[0].uuid}}'"}, {"condition": "json[0].getBillObject().getAccountPlan() === '{{referringAccountPlan.uuid}}'"}, - {"condition": "json[0].getBillObject().getQuantity() === 1"}, - {"condition": "json[0].getBillObject().getPrice() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getTotal() === {{plans.[0].price}}"}, {"condition": "json[0].getBillObject().getStatus().name() === 'paid'"} ]