Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Josh test speed increase #1347 #1355

Merged
merged 5 commits into from
Sep 7, 2016
Merged

Josh test speed increase #1347 #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a4d11d
turning verbosity off when running tests by default
Capt-Slow Sep 1, 2016
6785f9d
Removing sleeps/pauses when I can
Capt-Slow Sep 2, 2016
d612736
flaky test fix
Capt-Slow Sep 6, 2016
37589f8
#1347 cut runtime down by nearly 50%
Capt-Slow Sep 6, 2016
ed8513c
Merge branch 'development' into josh-test-speed-increase
kieckhafer Sep 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/acceptance-tests/elements/element-map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ first_order_new_btn: "button.btn.btn-success"
order_total: "//div[2]/div[2]/span"
order_total_w_tax: "//div[3]/div[2]/span"
order_total_post_discount: "//div[4]/div[2]/span"
new_orders_header: "span.label"

# orders details
approve_btn: "//button[@type='submit']"
Expand Down
4 changes: 3 additions & 1 deletion tests/acceptance-tests/lib/admin-order-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ const eleMap = yaml.safeLoad(fs.readFileSync("./tests/acceptance-tests/elements/

module.exports = {
refundAmount: function () {
browser.waitForVisible(eleMap.captured_total, 2000);
const captTotal = browser.getText(eleMap.captured_total);
browser.pause("10000");
browser.waitForEnabled(eleMap.refund_amnt_txt_box, 20000);
browser.setValue(eleMap.refund_amnt_txt_box, captTotal);
browser.pause("7000");
},
voidAmount: function () {
browser.waitForVisible(eleMap.order_total_w_tax, 20000);
const captTotalWTax = browser.getText(eleMap.order_total_w_tax);
// const orderTotal = browser.getText(eleMap.order_total);
browser.pause("2000");
Expand Down
26 changes: 11 additions & 15 deletions tests/acceptance-tests/lib/user-shop-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const eleMap = yaml.safeLoad(fs.readFileSync("./tests/acceptance-tests/elements/
module.exports = {
userAddress: function () {
browser.pause("5000");
browser.waitForEnabled(eleMap.country_dd, 6000);
browser.selectByValue(eleMap.country_dd, userData.country);
browser.setValue("input[name='fullName']", userData.name);
browser.setValue("input[name='address1']", userData.address1);
Expand All @@ -20,8 +21,7 @@ module.exports = {
browser.pause("5000");
},
authorizeNetPaymentInfo: function () {
browser.pause("2000");
browser.waitForEnabled(eleMap.authorizenet_cc, "6000");
browser.waitForEnabled(eleMap.authorizenet_cc, 6000);
try {
browser.setValue(eleMap.authorizenet_cc, userData.visa);
} catch (e) {
Expand All @@ -32,7 +32,7 @@ module.exports = {
browser.pause("5000");
browser.selectByValue("select[name='expireMonth']", userData.exp_month);
browser.selectByValue("select[name='expireYear']", userData.exp_year);
browser.waitForEnabled(eleMap.authorizenet_cvv, "8000");
browser.waitForEnabled(eleMap.authorizenet_cvv, 8000);
try {
browser.setValue(eleMap.authorizenet_cvv, userData.cvv);
} catch (e) {
Expand All @@ -42,13 +42,12 @@ module.exports = {
}
},
braintreePaymentInfo: function () {
browser.pause("2000");
browser.waitForEnabled(eleMap.braintree_cc, "6000");
browser.waitForEnabled(eleMap.braintree_cc, 6000);
browser.setValue(eleMap.braintree_cc, userData.visa);
browser.pause("5000");
browser.selectByValue(eleMap.braintree_exp_month, userData.exp_month);
browser.selectByValue(eleMap.braintree_exp_year, userData.exp_year);
browser.waitForEnabled(eleMap.braintree_cvv, "8000");
browser.waitForEnabled(eleMap.braintree_cvv, 8000);
try {
browser.setValue(eleMap.braintree_cvv, userData.cvv);
} catch (e) {
Expand All @@ -58,13 +57,12 @@ module.exports = {
}
},
examplePaymentInfo: function () {
browser.pause("2000");
browser.waitForEnabled(eleMap.example_payment_cc, "6000");
browser.pause(6000);
browser.setValue(eleMap.example_payment_cc, userData.visa);
browser.pause("5000");
browser.selectByValue(eleMap.example_payment_exp_month, userData.exp_month);
browser.selectByValue(eleMap.example_payment_exp_year, userData.exp_year);
browser.waitForEnabled(eleMap.example_payment_cvv, "8000");
browser.waitForEnabled(eleMap.example_payment_cvv, 8000);
try {
browser.setValue(eleMap.example_payment_cvv, userData.cvv);
} catch (e) {
Expand All @@ -74,13 +72,12 @@ module.exports = {
}
},
paypalPaymentInfo: function () {
browser.pause("2000");
browser.waitForEnabled(eleMap.paypal_cc, "6000");
browser.pause(6000);
browser.setValue(eleMap.paypal_cc, userData.paypal_visa);
browser.pause("5000");
browser.selectByValue(eleMap.paypal_exp_month, userData.exp_month);
browser.selectByValue(eleMap.paypal_exp_year, userData.exp_year);
browser.waitForEnabled(eleMap.paypal_cvv, "8000");
browser.waitForEnabled(eleMap.paypal_cvv, 8000);
try {
browser.setValue(eleMap.paypal_cvv, userData.cvv);
} catch (e) {
Expand All @@ -90,13 +87,12 @@ module.exports = {
}
},
stripePaymentInfo: function () {
browser.pause("2000");
browser.waitForEnabled(eleMap.stripe_cc, "6000");
browser.pause(6000);
browser.setValue(eleMap.stripe_cc, userData.stripe_visa);
browser.pause("5000");
browser.selectByValue(eleMap.stripe_exp_month, userData.exp_month);
browser.selectByValue(eleMap.stripe_exp_year, userData.exp_year);
browser.waitForEnabled(eleMap.stripe_cvv, "8000");
browser.waitForEnabled(eleMap.stripe_cvv, 8000);
try {
browser.setValue(eleMap.stripe_cvv, userData.cvv);
} catch (e) {
Expand Down
18 changes: 8 additions & 10 deletions tests/acceptance-tests/test/specs/authorizenet-refund.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,33 @@ describe("authorize net refund test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart_logged_in, 3000);
browser.click(eleMap.add_to_cart_logged_in);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
shopUser.checkForAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.authorizenet, 5000);
browser.click(eleMap.authorizenet);
browser.pause("6000");
shopUser.authorizeNetPaymentInfo();
browser.click(eleMap.authorizenet_complete_order_btn);
browser.pause("6000");
// navigate to orders page
browser.click(eleMap.orders_page_btn);
browser.pause("5000");
browser.click(eleMap.first_order_new_btn);
browser.pause("2000");
browser.waitForEnabled(eleMap.approve_btn, 5000);
browser.click(eleMap.approve_btn);
browser.pause("2000");
browser.waitForEnabled(eleMap.capture_payment_btn, 2000);
browser.click(eleMap.capture_payment_btn);
adminUser.refundAmount();
browser.click(eleMap.apply_refund_btn);
browser.pause("5000");
browser.waitForEnabled(eleMap.apply_refund_pop_up_btn, 5000);
browser.click(eleMap.apply_refund_pop_up_btn);
browser.pause("2000");
browser.waitForVisible("h2", 5000);
expect(browser.getText("h2"))
.to.equal("Reaction does not yet support direct refund processing from Authorize.net. Please visit their web portal to perform this action.");
// error pop up ok btn
Expand Down
15 changes: 6 additions & 9 deletions tests/acceptance-tests/test/specs/authorizenet-void.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,30 @@ describe("authorize net void test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart_logged_in, 3000);
browser.click(eleMap.add_to_cart_logged_in);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
shopUser.checkForAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.authorizenet, 5000);
browser.click(eleMap.authorizenet);
browser.pause("6000");
shopUser.authorizeNetPaymentInfo();
browser.click(eleMap.authorizenet_complete_order_btn);
browser.pause("6000");
// navigate to orders page
browser.click(eleMap.orders_page_btn);
browser.pause("5000");
browser.click(eleMap.first_order_new_btn);
browser.pause("20000");
adminUser.voidAmount();
browser.click(eleMap.approve_btn);
browser.pause("2000");
browser.waitForVisible("h2", 5000);
expect(browser.getText("h2")).to.equal("Applying a 100% discount will void / cancel this order with your payment provider");
browser.click(eleMap.apply_discount_btn);
browser.pause("5000");
browser.waitForVisible(eleMap.order_total_post_discount, 5000);
const getTotal = browser.getText(eleMap.order_total_post_discount);
expect(getTotal[0]).to.equal("$0.00");
browser.click(eleMap.capture_payment_btn);
Expand Down
24 changes: 11 additions & 13 deletions tests/acceptance-tests/test/specs/braintree-refund.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,33 @@ describe("braintree refund test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart_logged_in, 5000);
browser.click(eleMap.add_to_cart_logged_in);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn, 5000);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
shopUser.checkForAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.braintree, 5000);
browser.click(eleMap.braintree);
browser.pause("6000");
shopUser.braintreePaymentInfo();
browser.pause("5000");
browser.waitForEnabled(eleMap.braintree_complete_order_btn, 5000);
browser.click(eleMap.braintree_complete_order_btn);
browser.pause("6000");
browser.pause(5000);
browser.click(eleMap.orders_page_btn);
browser.pause("5000");
browser.pause("15000");
browser.click(eleMap.first_order_new_btn);
browser.pause("10000");
browser.waitForEnabled(eleMap.approve_btn, 10000);
browser.click(eleMap.approve_btn);
browser.pause("2000");
browser.waitForEnabled(eleMap.capture_payment_btn, 5000);
browser.click(eleMap.capture_payment_btn);
adminUser.refundAmount();
browser.click(eleMap.apply_refund_btn);
browser.pause("5000");
browser.pause(5000);
browser.click(eleMap.apply_refund_pop_up_btn);
browser.pause("2000");
browser.pause(5000);
expect(browser.getText("h2"))
.to.equal("Braintree does not allow refunds until transactions are settled. This can take up to 24 hours. Please try again later.");
// error pop up ok btn
Expand Down
12 changes: 5 additions & 7 deletions tests/acceptance-tests/test/specs/braintree-void.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@ describe("braintree net void test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart_logged_in, 3000);
browser.click(eleMap.add_to_cart_logged_in);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
shopUser.checkForAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.braintree, 5000);
browser.click(eleMap.braintree);
browser.pause("6000");
shopUser.braintreePaymentInfo();
Expand All @@ -41,10 +40,9 @@ describe("braintree net void test", function () {
browser.click(eleMap.orders_page_btn);
browser.pause("5000");
browser.click(eleMap.first_order_new_btn);
browser.pause("2000");
adminUser.voidAmount();
browser.click(eleMap.approve_btn);
browser.pause("2000");
browser.waitForVisible("h2", 5000);
expect(browser.getText("h2")).to.equal("Applying a 100% discount will void / cancel this order with your payment provider");
browser.click(eleMap.apply_discount_btn);
browser.pause("5000");
Expand Down
17 changes: 7 additions & 10 deletions tests/acceptance-tests/test/specs/example-payment-refund.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,31 @@ describe("example payment refund test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart_logged_in, 3000);
browser.click(eleMap.add_to_cart_logged_in);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
shopUser.checkForAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.example_payment, 5000);
browser.click(eleMap.example_payment);
browser.pause("6000");
shopUser.examplePaymentInfo();
browser.pause("5000");
browser.click(eleMap.example_payment_complete_order_btn);
browser.pause("6000");
browser.click(eleMap.orders_page_btn);
browser.pause("5000");
browser.click(eleMap.first_order_new_btn);
browser.pause("2000");
browser.waitForEnabled(eleMap.approve_btn, 5000);
browser.click(eleMap.approve_btn);
browser.pause("2000");
browser.waitForEnabled(eleMap.capture_payment_btn, 5000);
browser.click(eleMap.capture_payment_btn);
adminUser.refundAmount();
browser.click(eleMap.apply_refund_btn);
browser.pause("5000");
browser.waitForEnabled(eleMap.apply_refund_pop_up_btn, 5000);
browser.click(eleMap.apply_refund_pop_up_btn);
browser.pause("2000");
});
});
14 changes: 6 additions & 8 deletions tests/acceptance-tests/test/specs/guest-authorizenet-checkout.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,22 @@ describe("authorize net guest checkout test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart, 5000);
browser.click(eleMap.add_to_cart);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn, 3000);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
browser.waitForEnabled(eleMap.continue_as_guest, 5000);
browser.click(eleMap.continue_as_guest);
browser.pause("3000");
shopUser.userAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.authorizenet, 5000);
browser.click(eleMap.authorizenet);
browser.pause("6000");
shopUser.authorizeNetPaymentInfo();
browser.click(eleMap.authorizenet_complete_order_btn);
browser.pause("6000");
browser.waitForVisible("#order-status", 10000);
expect(browser.getText("#order-status")).to.equal("Your order is now submitted.");
});
});
16 changes: 7 additions & 9 deletions tests/acceptance-tests/test/specs/guest-braintree-checkout.app-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,23 @@ describe("braintree guest checkout test", function () {
browser.pause("5000");
userDo.UserActions.refreshShop();
browser.click(eleMap.product);
browser.pause("5000");
browser.waitForEnabled(eleMap.red_option, 5000);
browser.click(eleMap.red_option);
browser.pause("2000");
browser.waitForEnabled(eleMap.add_to_cart, 5000);
browser.click(eleMap.add_to_cart);
browser.pause("2000");
browser.waitForEnabled(eleMap.checkout_btn, 5000);
browser.click(eleMap.checkout_btn);
browser.pause("5000");
browser.waitForEnabled(eleMap.continue_as_guest, 5000);
browser.click(eleMap.continue_as_guest);
browser.pause("3000");
shopUser.userAddress();
// free shipping option
browser.click(eleMap.free_shipping);
browser.pause("3000");
browser.waitForEnabled(eleMap.braintree, 5000);
browser.click(eleMap.braintree);
browser.pause("6000");
shopUser.braintreePaymentInfo();
browser.pause("5000");
browser.waitForEnabled(eleMap.braintree_complete_order_btn, 5000);
browser.click(eleMap.braintree_complete_order_btn);
browser.pause("6000");
browser.waitForVisible("#order-status", 10000);
expect(browser.getText("#order-status")).to.equal("Your order is now submitted.");
});
});
Loading