Test manual discount deletion in combination with vouchers #17057

zedzior · 2024-11-21T15:46:29Z

This PR adds missing tests for cases when user deletes manual discounts from an order with voucher associated.

Internal issue: https://linear.app/saleor/issue/SHOPX-1585
Docs PR: saleor/saleor-docs#1399

Impact

New migrations
New/Updated API fields or mutations
Deprecated API fields or mutations
Removed API types, fields, or mutations

Docs

Link to documentation:

Pull Request Checklist

Privileged queries and mutations are either absent or guarded by proper permission checks
Database queries are optimized and the number of queries is constant
Database migrations are either absent or optimized for zero downtime
The changes are covered by test cases
All new fields/inputs/mutations have proper labels added (ADDED_IN_X, PREVIEW_FEATURE, etc.)
All migrations have proper dependencies
All indexes are added concurrently in migrations
All RunSql and RunPython migrations have revert option defined

db-queries · 2024-11-22T10:46:50Z

Here is the report for e930510 (saleor:shopx-1585-test-manual-disocunt-deletion-with-vouchers)
Base comparison is 3d728a7.

No differences were found.

# saleor.graphql.accountbenchmark account
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  addresses for federation query count                                    	         11	         11	              2
  customers query                                                         	         53	         53	              0
  delete staff members                                                    	         42	         42	              0
  query staff user                                                        	         24	         24	              3
  staff create                                                            	         24	         24	              3
  staff update groups and permissions                                     	         37	         37	              6
  users for federation query count                                        	         10	         10	              3

# saleor.graphql.accountbenchmark permission group
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  groups for federation query count                                       	          3	          3	              1
  permission group create                                                 	         26	         26	              0
  permission group delete                                                 	         31	         31	              3
  permission group query                                                  	         16	         16	              0
  permission group update                                                 	         45	         45	              2
  permission group update remove users with manage staff                  	         37	         37	              3

# saleor.graphql.appbenchmarks app extensions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  app extensions                                                          	         27	         27	             10
  app extensions with filter[filter0]                                     	         26	         26	             10
  app extensions with filter[filter1]                                     	         14	         14	              2
  app extensions with filter[filter2]                                     	         26	         26	             10
  app extensions with filter[filter3]                                     	         14	         14	              2

# saleor.graphql.appbenchmarks apps
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  apps for federation query count                                         	         11	         11	              3
  apps with tokens and webhooks                                           	         11	         11	              0

# saleor.graphql.attributebenchmark attribute
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  attribute translation                                                   	          8	          8	              0
  attribute value translation                                             	         22	         22	              0
  query attribute                                                         	          8	          8	              0
  query attributes                                                        	         10	         10	              0

# saleor.graphql.channelbenchmark channel
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  channels query                                                          	          7	          7	              0

# saleor.graphql.channelmutations channel update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  channel update mutation remove warehouse                                	         41	         41	              6

# saleor.graphql.checkoutbenchmark checkout mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  add billing address to checkout                                         	         73	         73	              7
  add checkout lines                                                      	        105	        105	             16
  add checkout lines catalogue discount applies                           	        203	        203	             16
  add checkout lines gift discount applies                                	        166	        166	             24
  add checkout lines multiple catalogue discount applies                  	        218	        218	             21
  add checkout lines order discount applies                               	        179	        179	             19
  add checkout lines with external shipping                               	        186	        186	             74
  add checkout lines with reservations                                    	        215	        215	             76
  add delivery to checkout                                                	         92	         92	             14
  add shipping to checkout                                                	         93	         93	             14
  checkout customer note update                                           	         53	         53	              4
  checkout email update                                                   	         52	         52	              3
  checkout payment charge                                                 	         68	         68	             19
  checkout shipping address update                                        	         85	         85	              9
  checkout voucher code                                                   	         98	         98	             13
  complete checkout                                                       	        202	        202	             59
  complete checkout preorder                                              	        213	        213	             63
  complete checkout with digital line                                     	        236	        236	             64
  complete checkout with out of stock webhook                             	        204	        204	             59
  complete checkout with single line                                      	        204	        204	             59
  create checkout                                                         	         80	         80	              5
  create checkout with gift promotion                                     	        117	        117	             14
  create checkout with order promotion                                    	        104	        104	              5
  create checkout with reservations                                       	        179	        179	             37
  customer complete checkout                                              	        215	        215	             65
  customer complete checkout for cc                                       	        240	        240	             74
  update checkout lines                                                   	         95	         95	             15
  update checkout lines with reservations                                 	        228	        228	             91

# saleor.graphql.checkoutbenchmark checkouts
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  staff multiple checkouts                                                	          8	          8	              0

# saleor.graphql.checkoutbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  user checkout details                                                   	         64	         64	              5
  user checkout details with tax app                                      	         93	         93	             33

# saleor.graphql.discountbenchmark promotion create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion create                                                        	         25	         25	              1
  promotion create order promotion                                        	         39	         39	              7

# saleor.graphql.discountbenchmark promotion delete
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  gift promotion delete                                                   	         27	         27	              1
  promotion delete                                                        	         32	         32	              1

# saleor.graphql.discountbenchmark promotion rule create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion rule create                                                   	         25	         25	              1
  promotion rule create gift                                              	        135	        135	              7

# saleor.graphql.discountbenchmark promotion rule delete
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion rule delete                                                   	         25	         25	              0

# saleor.graphql.discountbenchmark promotion rule update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion rule update                                                   	         40	         40	              0

# saleor.graphql.discountbenchmark promotion update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion update                                                        	         18	         18	              0

# saleor.graphql.discountbenchmark promotions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotions querytest promotions query                                   	         11	         11	              0

# saleor.graphql.discountbenchmark sales
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  sales query with channel slug                                           	         11	         11	              0
  sales query without channel slug                                        	          9	          9	              0

# saleor.graphql.discountbenchmark voucher code bulk delete
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  voucher code bulk delete queries                                        	         22	         22	              3

# saleor.graphql.discountbenchmark vouchers
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  vouchers query with channel slug                                        	         22	         22	              0
  vouchers query withot channel slug                                      	         21	         21	              0

# saleor.graphql.giftcardbenchmark gift card mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  create never expiry gift card                                           	         29	         29	              4
  gift card bulk activate by staff                                        	         17	         17	              3
  update gift card                                                        	         37	         37	              4

# saleor.graphql.giftcardbenchmark gift card queries
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  filter gift cards by products                                           	         16	         16	              3
  filter gift cards by tags                                               	         14	         14	              3
  filter gift cards by used by user                                       	         15	         15	              3
  query gift card details                                                 	         16	         16	              3
  query gift cards                                                        	         14	         14	              3

# saleor.graphql.orderbenchmark fulfillment
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fulfillment query                                                       	          8	          8	              0

# saleor.graphql.orderbenchmark fulfillment refund and return products
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fulfillment refund products order lines                                 	         50	         50	              0
  fulfillment return products order lines                                 	         92	         92	              3

# saleor.graphql.orderbenchmark order
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  staff multiple draft orders                                             	          9	          9	              0
  staff multiple orders                                                   	          9	          9	              0
  staff order details                                                     	         55	         55	              7
  user order details                                                      	         52	         52	              8

# saleor.graphql.orderbenchmark order bulk create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order bulk create                                                       	         21	         21	              2

# saleor.graphql.orderbenchmark order fulfill
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order fulfill                                                           	         15	         15	              0
  order fulfill with gift cards                                           	         15	         15	              0

# saleor.graphql.orderbenchmark order lines create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order lines create                                                      	         98	         98	             17
  order lines create variants on promotion                                	        159	        159	             22

# saleor.graphql.pagebenchmark page type
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  page types for federation query count                                   	          3	          3	              0
  query page type                                                         	         20	         20	              6
  query page types                                                        	         27	         27	             12

# saleor.graphql.paymentbenchmark payment transactions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  payment transactions                                                    	         56	         56	             20

# saleor.graphql.productbenchmark category
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  categories children                                                     	          4	          4	              1
  categories for federation query count                                   	          3	          3	              0
  category delete                                                         	         32	         32	              3
  category view                                                           	         28	         28	              1

# saleor.graphql.productbenchmark collection
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  collection add products                                                 	         24	         24	              5
  collection bulk delete                                                  	         29	         29	              4
  collection view                                                         	          7	          7	              0
  collections for federation query count                                  	          4	          4	              1
  create collection                                                       	         25	         25	              6
  delete collection                                                       	         28	         28	              5
  remove products from collection                                         	         21	         21	              5
  retrieve collection channel listings                                    	          7	          7	              0

# saleor.graphql.productbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  report product sales                                                    	         12	         12	              3
  retrieve product list                                                   	          4	          4	              0

# saleor.graphql.productbenchmark product
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  filter products by attributes                                           	          7	          7	              0
  filter products by boolean attributes                                   	         14	         14	              0
  filter products by gift card                                            	         14	         14	              1
  filter products by numeric attributes                                   	         13	         13	              0
  product create                                                          	         45	         45	              3
  product details                                                         	         40	         40	              2
  product translations                                                    	          5	          5	              0
  products for federation query count                                     	          6	          6	              2
  products media for federation query count                               	          5	          5	              0
  products types for federation query count                               	          2	          2	              0
  retrieve channel listings                                               	         23	         23	              0
  retrieve product attributes                                             	          8	          8	              0
  retrieve product images                                                 	          4	          4	              0
  retrieve product media                                                  	          4	          4	              0
  retrive products with product types and attributes                      	          7	          7	              0
  update product                                                          	         59	         59	              4

# saleor.graphql.productbenchmark product variant channel listing update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  variant channel listing update                                          	         37	         37	              3

# saleor.graphql.productbenchmark variant
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variant bulk create                                             	         47	         47	              1
  product variant create                                                  	         63	         63	              3
  products variants for federation query count                            	          6	          6	              2
  retrieve variant list                                                   	         34	         34	              1
  update product variant                                                  	         61	         61	              6

# saleor.graphql.productbenchmark variant stocks
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variants stocks create                                          	         27	         27	              4
  product variants stocks create with single webhook called               	         27	         27	              4
  product variants stocks delete by id                                    	         30	         30	              4
  product variants stocks delete by sku                                   	         30	         30	              4
  product variants stocks delete with out of stock webhook many calls     	         26	         26	              3
  product variants stocks update by sku                                   	         27	         27	              4
  product variants stocks update byid                                     	         27	         27	              4
  query product variants stocks                                           	         12	         12	              0

# saleor.graphql.producttest product sorting attributes
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  sort product not having attribute data                                  	         20	         20	              0

# saleor.graphql.shippingbenchmark shipping methods
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  vouchers query with channel slug                                        	          9	          9	              0
  vouchers query without channel slug                                     	          9	          9	              0

# saleor.graphql.shippingbenchmark shipping zones
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  shipping zones query                                                    	          8	          8	              0

# saleor.graphql.shopbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  retrieve shop                                                           	          2	          2	              0

# saleor.graphql.warehousebenchmark stock bulk update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  stocks bulk update queries count                                        	         33	         33	              6

# saleor.graphql.warehousebenchmark stocks
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  stocks query                                                            	          7	          7	              0

# saleor.graphql.webhookbenchmark webhook events
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  webhooks                                                                	          8	          8	              0

# saleor.orderbenchmark fetch order prices
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fetch order prices catalogue discount                                   	         51	         51	              7
  fetch order prices multiple catalogue discounts                         	        115	        115	             21

# saleor.ordertest fetch
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fetch draft order lines info                                            	         21	         21	              1

codecov · 2024-11-22T10:47:14Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.24%. Comparing base (3d728a7) to head (e930510).

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #17057   +/-   ##
=======================================
  Coverage   94.24%   94.24%           
=======================================
  Files         951      951           
  Lines       74966    74966           
  Branches     7360     7360           
=======================================
  Hits        70650    70650           
  Misses       2767     2767           
  Partials     1549     1549

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests

saleor/tests/e2e/orders/discounts/test_manual_order_discount_and_voucher.py

korycins · 2024-11-27T08:27:55Z

saleor/graphql/order/tests/mutations/test_order_discount.py

@@ -955,6 +964,55 @@ def test_delete_manual_discount_from_order_with_gift_promotion(
    assert order.total_net_amount == order.undiscounted_total_net_amount


+def test_delete_manual_discount_from_order_with_entire_order_voucher(


Do we already have a tests for combination like: manual_discount + shipping_voucher, manual_discount + specifici_products_voucher, manual_discount + voucher_applied_to_the_cheapest_line?

There are tests for line-level and order-level vouchers + e2e test. I believe it is enough

zedzior added voucher tests discount labels Nov 21, 2024

zedzior self-assigned this Nov 21, 2024

zedzior force-pushed the shopx-1585-test-manual-disocunt-deletion-with-vouchers branch from 4a7549c to e0bfc67 Compare November 21, 2024 16:09

zedzior marked this pull request as draft November 22, 2024 09:51

zedzior marked this pull request as ready for review November 22, 2024 10:21

zedzior added the skip changelog label Nov 22, 2024

zedzior requested a review from a team November 22, 2024 10:48

IKarbowiak reviewed Nov 22, 2024

View reviewed changes

saleor/tests/e2e/orders/discounts/test_manual_order_discount_and_voucher.py Outdated Show resolved Hide resolved

zedzior added 5 commits November 25, 2024 15:01

Add tests for manual discount deletion in combination with vouchers

baa69cf

Add e2e test

3c5f218

Extend tests; update changelog

579ac48

Split PR

cda2eee

Link e2e test with testmo

e930510

zedzior force-pushed the shopx-1585-test-manual-disocunt-deletion-with-vouchers branch from 9eabf08 to e930510 Compare November 25, 2024 14:18

zedzior requested review from IKarbowiak and a team November 26, 2024 09:05

IKarbowiak approved these changes Nov 26, 2024

View reviewed changes

IKarbowiak requested a review from a team November 26, 2024 13:24

korycins reviewed Nov 27, 2024

View reviewed changes

korycins requested a review from a team November 27, 2024 08:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test manual discount deletion in combination with vouchers #17057

Test manual discount deletion in combination with vouchers #17057

zedzior commented Nov 21, 2024 •

edited

Loading

db-queries bot commented Nov 22, 2024 •

edited

Loading

codecov bot commented Nov 22, 2024 •

edited

Loading

korycins Nov 27, 2024

zedzior Nov 27, 2024

		@@ -955,6 +964,55 @@ def test_delete_manual_discount_from_order_with_gift_promotion(
		assert order.total_net_amount == order.undiscounted_total_net_amount


		def test_delete_manual_discount_from_order_with_entire_order_voucher(

Test manual discount deletion in combination with vouchers #17057

Are you sure you want to change the base?

Test manual discount deletion in combination with vouchers #17057

Conversation

zedzior commented Nov 21, 2024 • edited Loading

Impact

Docs

Pull Request Checklist

db-queries bot commented Nov 22, 2024 • edited Loading

codecov bot commented Nov 22, 2024 • edited Loading

Codecov Report

korycins Nov 27, 2024

Choose a reason for hiding this comment

zedzior Nov 27, 2024

Choose a reason for hiding this comment

zedzior commented Nov 21, 2024 •

edited

Loading

db-queries bot commented Nov 22, 2024 •

edited

Loading

codecov bot commented Nov 22, 2024 •

edited

Loading