Maikel
e873771f18
Merge pull request #9822 from filipefurtad0/redis_CannotConnectError
...
Extracts routing outside it block
2022-10-24 13:33:01 +11:00
Cillian O'Ruanaidh
62cd507fb9
Stub Spree::Config.stripe_connect_enabled instead of changing it before and back after tests
...
It's less code and sometimes there can be issues when config cache values are changed.
Co-authored-by: Maikel <maikel@email.org.au >
2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
4e6d64c0a1
Let people choose which payment methods are available to customers on order cycles
2022-10-21 17:21:31 +01:00
jibees
3a68e237de
Merge pull request #9772 from mkllnk/revenue-report-for-au
...
Add more fields to revenue report as used by Aus
2022-10-20 23:10:17 +02:00
jibees
da851079f4
Merge pull request #9776 from abdellani/product-creation-minor-improvements
...
Product creation minor improvements
2022-10-20 17:30:47 +02:00
Vishal Jain
de28027623
add system spec
2022-10-20 12:15:22 +05:30
filipefurtad0
c4de247dd9
Clarifies contexts, cleans-up spec DRY
2022-10-19 16:56:04 +01:00
filipefurtad0
a244b34627
Extracts routing to context (DRY); creates context for separate it block
2022-10-19 11:15:15 +01:00
filipefurtad0
dabe37ebcb
Extracts routing outside it block
2022-10-19 11:01:56 +01:00
jibees
7b96a1fb5b
Merge pull request #9815 from mkllnk/bulk-product-spec
...
Stabilise spec by waiting for JS
2022-10-19 09:50:55 +02:00
Maikel Linke
04921aeed4
Stabilise spec by waiting for JS
2022-10-19 09:59:51 +11:00
filipefurtad0
c71c5054e0
Replaces js select2 methods by find/click methods
2022-10-18 21:27:52 +01:00
filipefurtad0
b3059bbdbc
Comments out and adds pending on flaky examples
2022-10-18 10:28:44 +01:00
Maikel Linke
a35fab5e1f
Speed up spec by skipping a page
2022-10-18 14:27:18 +11:00
Maikel Linke
c22f6cb805
Add more fields to revenue report as used by Aus
...
We currently maintain our own CSV generation script which could be
replaced if we got all this information here.
2022-10-18 12:51:13 +11:00
Mohamed ABDELLANI
96c6f58ba2
fix test @/spec/system/admin/products_spec.rb:32
2022-10-14 03:26:40 +01:00
Ashwini Seshadri
1596649034
Merge branch 'master' into admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier
2022-10-13 06:48:40 +02:00
jibees
daaff2f7e8
Merge pull request #9764 from mkllnk/simple-oc-spec
...
Stabilise spec by waiting for JS requests
2022-10-12 10:17:51 +02:00
Maikel Linke
9da6f862cd
Stabilise pending spec
2022-10-12 16:49:29 +11:00
Maikel Linke
3eb597bff4
Fix specs which accidentally reversed relationships
2022-10-12 16:49:29 +11:00
Jean-Baptiste Bellet
bfbdb5f44b
Don't need to wait for UI feedback: only check on page content
...
ie. table content
2022-10-11 12:16:25 +02:00
Maikel Linke
5bbbe4b67a
Stabilise spec by waiting for JS requests
...
Well, two seconds is just a guess. Ideally the page wouldn't display
until we have everything loaded. But this logic will be replaced when we
chuck out AngularJS.
This version passed over 100 runs with a busy CPU on my machine.
2022-10-11 14:57:59 +11:00
Maikel Linke
6ef0e04c18
Mark currently broken spec as pending
...
I thought it's better to progress with this PR before we break more
things.
2022-10-10 16:03:18 +11:00
Maikel
82e38d7b91
Merge pull request #9526 from jibees/6730-use-a-date-range-picker
...
Admin, List of Orders & Orders Bulk Management pages: use a date range picker
2022-10-10 13:59:37 +11:00
Maikel
058a45f4e5
Merge pull request #9442 from jibees/8904-display-fees-name-instead-of-type-on-invoices
...
Display fees name instead of type on invoices
2022-10-10 13:15:01 +11:00
Jean-Baptiste Bellet
263b36d1d9
Confirm input changed by pressing enter key
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
a272479483
When selecting date range picker, orders should load
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eec117e769
Implements daterangepicker for /admin/orders/bulk_management
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eb621cae35
Update spec to be more defensive
...
Actually, this one fail on master too (when changing month?)
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
73f55ae776
Implements daterangepicker for /admin/orders
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Maikel Linke
1137e6890b
Supply feature mock with default value
...
Otherwise Rspec complains about receiving another argument which is not
the one we defined here before.
2022-10-08 16:23:17 +02:00
Maikel Linke
52e934ec2b
Consistently use our FeatureToggle module
...
Direct calls to Flipper have the downside that we can't add any new
functionality like storing the feature in the database when used.
2022-10-08 16:23:17 +02:00
Jean-Baptiste Bellet
8b89c901ef
Do not display "Admin and Handling" ie. fees total
2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
72df2867d4
Remove admin_and_handling merging
...
+ update specs as well
2022-10-08 10:00:57 +02:00
Maikel
8072e97579
Merge pull request #9721 from filipefurtad0/fix_flaky_shopping_spec
...
Addresses flakyness in shopping_spec.rb
2022-10-05 13:19:23 +11:00
filipefurtad0
977916cb11
Adds 2 sec sleep time on other flaky examples
2022-10-04 20:58:30 +01:00
filipefurtad0
f4edfcefa2
Adds 2 sec sleep time
2022-10-04 20:17:14 +01:00
binarygit
25ae10dbe8
Create bulk orders cancellation feature
2022-10-04 16:57:31 +02:00
filipefurtad0
7b592fd80b
Adds assertion after page visit to promote page loading
2022-10-04 12:27:58 +01:00
filipefurtad0
8e6f828f66
Splits it cases into respective contexts
2022-10-03 19:30:57 +01:00
filipefurtad0
fa05327342
Adds assertions on clearing searches
...
Asserts on page contents
2022-10-03 19:12:27 +01:00
filipefurtad0
cafa17ec13
Splits test into two assertions
2022-10-03 19:12:27 +01:00
Filipe
4b279d28dd
Merge pull request #9262 from cillian/order-cycle-shipping-methods
...
Let people customise which shipping methods are available to customers on order cycles
2022-09-30 14:36:37 +01:00
Cillian O'Ruanaidh
acd4706890
Set closing time correctly in order_cycles/complex_creating_specific_time_spec.rb
2022-09-30 14:22:11 +01:00
Filipe
f7d21406a1
Merge pull request #9702 from ashwini-seshadri/master
...
Fix for new subscription dialog
2022-09-30 13:32:42 +01:00
Cillian O'Ruanaidh
f9e29f3a78
Fix Metrics/AbcSize violation in order_cycles/complex_creating_specific_time_spec.rb
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
6542b47e72
Adjust order_cycles/complex_creating_specific_time_spec to take into account that DistributorShippingMethods instead of ShippingMethods are connected to OrderCycles now
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
2827e07da6
Define :oc with let so it is available globally to other methods such as :expect_fees_saved
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
23f6901fb4
Adjust order_cycles/simple_spec.rb to take new Checkout Options step into account
...
Note, this doesn't test checking/unchecking some distributor shipping methods and not others because that is tested in order_cycles/complex_creating_time_specific_spec.rb.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a53a3259a8
Connect DistributorShippingMethods to OrderCycles instead of Spree::ShippingMethods
...
Before if a shipping method was shared between multiple distributors it could only be disabled/enabled on that order cycle for all the distributors which have that shipping method e.g. you couldn't select that shipping method for one distributor but disable it for another.
2022-09-30 13:13:39 +01:00