Kristina Lim
210a11783c
Test that saving invalid variant override provides error
2018-12-09 21:43:57 +08:00
luisramos0
7ecce51b8b
Create default stock location and set required product.shipping_category in specs that create products
2018-12-08 14:52:50 +00:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
802e3bb447
Refactor choosing VO on_demand in feature specs
...
We are still using the Rails view I18n scope for :use_producer_settings.
Angular requires this replacement of the default blank option, which we
use for nil on_demand, to be in the template itself.
If we eventually move this template to a JS template, we can move it to
the same I18n scope as the :yes and :no options.
2018-12-05 17:40:31 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7
Make VO count on hand readonly unless limited stock
2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5
Ensure in UI compatible VO count and on demand
2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c
Translate variant override on_demand yes and no
2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4
Allow reset of "on demand" for variant overrides
...
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.
This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
Pau Perez
6af8544c52
Restore perform_deliveries value in tests
2018-12-05 10:20:13 +01:00
Pau Perez
25eb297215
Perform delivery when checking deliveries in specs
2018-12-05 10:05:39 +01:00
Pau Perez
064d9cf183
Do not hide flaky tests under endless retries
...
If it fails, needs fixing, not hiding the problem and making the test
suite longer.
2018-12-05 10:05:39 +01:00
luisramos0
7dc208fb8c
Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes
2018-12-04 13:20:20 +00:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Pau Pérez Fabregat
08297863be
Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page
...
Expand all steps in the checkout page by default
2018-11-29 16:28:42 +01:00
Pau Perez
957c38e4f2
Add missing translations causing a test failure
2018-11-28 18:38:09 +01:00
Hugo Daniel
60214b9a90
Fix failing specs
2018-11-28 10:31:47 +01:00
Luis Ramos
1bc06e7384
Merge pull request #3139 from luisramos0/2-0-bulk-prod-update-spec-fix
...
[Spree Upgrade] Fix tests in bulk_product_update spec
2018-11-27 18:36:36 +00:00
Pau Pérez Fabregat
c5ae9bdce2
Merge pull request #3132 from luisramos0/2-0-variant-ondemand
...
[Spree Upgrade] Add VariantStock.on_demand as attribute_accessible
2018-11-27 18:05:34 +01:00
luisramos0
64d16258cf
Fix tests in bulk_product_update spec by:
...
- setting on_hand in the variant and not in the product directly
- setting variant on_demand to false (default from the factory is on_demand true)
- saving the variant after doing this to trigger appropriate callbacks like creating missing variant stock items
2018-11-27 16:03:52 +00:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
luisramos0
73ed5eeaac
Fix product import spec related to this change, the value provided to on_hand must be an integer
2018-11-23 18:07:51 +00:00
Hugo Daniel
d7a148bb75
Fix checkout feature specs
2018-11-22 17:01:39 +01:00
luisramos0
24a7494103
Fix admin/adjustments spec by renaming test adjustment from Shipping to Extra Adjustment.
...
This was causing an error because the order factory now includes a Shipping adjustment
2018-11-21 13:41:16 +00:00
Maikel
733a018f37
Merge pull request #3081 from luisramos0/2-0-enterprise-groups
...
[Spree Upgrade] Fix features/admin/enterprise_groups_spec by replacing select2_search with select2_select
2018-11-20 16:41:05 +11:00
Maikel
b05bfc5cc7
Merge pull request #3075 from luisramos0/2-0-setting-transl
...
[Spree Upgrade] Fix translation issue in settings spec
2018-11-20 16:39:54 +11:00
luisramos0
5f48f2b8a1
Fix enterprise groups spec by replacing select2_search with select2_select for country and state in enterprise group address
2018-11-19 12:44:25 +00:00
luisramos0
9deb249dec
Fix order by changing expected results: order is paid.
...
These tests use order factory order_with_credit_payment with ‘amount: order.total + 10000’ and since spree 2 when order payment state is credit_owned (customer has credit after the order), the order is considered paid 71c6c4f297
2018-11-18 20:58:55 +00:00
luisramos0
a20aba26cd
Fix order feature spec by adapting to new spree 2 order factory with 5 line_items by default. Removed currency sign to avoid having problems with it, it's not really part of the spec objective
2018-11-18 16:51:43 +00:00
luisramos0
d29778e2d1
Fix translation issue in spec by refering the correct translation namespace: spree
2018-11-18 16:36:03 +00:00
Maxim Colls
884d4d0122
Fixed specs
2018-11-17 19:46:09 +01:00
Pau Perez
c7a1c4b253
Change order date column translation in BOM
...
This makes it consistent with the order page. In both cases we use the
`completed_at` column underneath.
2018-11-15 19:09:17 +01:00
luisramos0
19321b6d4f
Fix admin payments spec. Add missing payment method to order.distributor
2018-11-14 11:26:26 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Matt-Yorkley
fd47756e2f
Remove workaround in failing feature spec
...
Removed an old workaround that clicked a button multiple times.
This was no longer working and causing the spec to fail.
2018-11-05 11:19:57 +00:00
Pau Pérez Fabregat
ad743a03ac
Merge pull request #2888 from luisramos0/backorders-line-items
...
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator
2018-11-02 15:45:25 +01:00
Pau Pérez Fabregat
3b85bbe911
Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs
...
Extract email setup in specs for easy upgrade
2018-11-02 15:40:19 +01:00
Pau Pérez Fabregat
a910fc50f5
Merge pull request #2926 from luisramos0/2-0-stable-oct-25
...
[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)
2018-11-02 15:37:34 +01:00
Pau Pérez Fabregat
b35b24d4ae
Merge pull request #2914 from luisramos0/checkout-language-bug
...
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-30 17:46:37 +01:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
luisramos0
a5d4c50dea
Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test.
2018-10-26 21:32:16 +01:00
luisramos0
90d7b7f4a0
Merge branch 'master' into 2-0-stable-oct-25
2018-10-25 14:28:58 +01:00
Maikel Linke
e6adb8a3b9
Extract email setup in specs for easy upgrade
...
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
2018-10-25 13:53:22 +11:00
Pau Pérez Fabregat
ce93c52dfe
Merge pull request #2850 from Matt-Yorkley/password_change_logout
...
Password change logout
2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat
f32e4dddb1
Merge pull request #2902 from luisramos0/more-pending-tests
...
[Spree Upgrade] Mark specs from secondary features as xfeature
2018-10-23 19:00:49 +02:00
luisramos0
034d9ef72a
Refactor multilingual spec: extract method with repeated assertion
2018-10-23 14:10:52 +01:00
luisramos0
9d9f5d38d7
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-23 14:10:48 +01:00
Luis Ramos
a9b390d0aa
Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs
...
[Spree Upgrade] Fix feature specs for shipping_methods
2018-10-22 23:12:20 +01:00
luisramos0
34d1e6ffdb
Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794
2018-10-21 22:13:15 +01:00
luisramos0
2e64226d29
Move all specs in spec/features/admin/subscriptions_spec temporarily to pending
2018-10-21 22:06:31 +01:00
