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
9ef4852bd4
Merge pull request #2818 from nikobozi/refactor-variant-overrides-query
...
Move query from variant_overrides_controller to its model scope
2018-10-24 11:42:22 +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
7ae5a615b2
Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending
2018-10-21 22:09:21 +01:00
luisramos0
6f78f3c595
Move all specs in proxy_order_spec temporarily to pending
2018-10-21 22:08:10 +01:00
luisramos0
b0ffb0f91a
Move all specs in subscription_confirm_job_spec temporarily to pending
2018-10-21 22:07:23 +01:00
luisramos0
2e64226d29
Move all specs in spec/features/admin/subscriptions_spec temporarily to pending
2018-10-21 22:06:31 +01:00
luisramos0
ca786249a6
Move all specs in subscription_form_spec temporarily to pending
2018-10-21 22:05:45 +01:00
luisramos0
3afc59c864
Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending
2018-10-21 22:04:16 +01:00
luisramos0
5b6b0f408f
Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing
2018-10-21 22:02:34 +01:00
luisramos0
5d36450de2
Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing
2018-10-21 21:56:55 +01:00
luisramos0
f3ef3d0c3e
Avoiding variantStock raise by creating variant first and then setting count_on_hand
2018-10-20 23:28:22 +01:00
luisramos0
9079437284
Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted
2018-10-20 12:32:51 +01:00
luisramos0
c373d5ab33
Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method
2018-10-18 19:44:38 +01:00
luisramos0
df36e0b344
In cart population, replace usage of global allow_backorders with variant.on_demand adapter
2018-10-18 18:37:09 +01:00
luisramos0
a83af367b4
Fix order_spec related to retrieving previously ordered items
...
In spree 2, each completed_order_with_totals comes with 5 line items (see order_factory in spree), so instead of 1+1+1=3 the calculation becomes 5+5+1=11
2018-10-18 10:54:21 +01:00
luisramos0
74eff8730b
Fix tests of fees in a completed order in models/spree/order_spec by:
...
- set distributor with taxes on the order
- simplify the factory completed_order_with_fees by replacing shipment with shipping_method and ship_address and letting the order workflow handle shipments and inventory units
2018-10-18 10:54:21 +01:00
Maikel Linke
9698fd3c5a
Style spec
2018-10-18 11:07:16 +11:00
Maikel Linke
d197c8587f
Test address deletion
2018-10-18 11:06:32 +11:00
Maikel Linke
e96cab957a
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/models/spree/addresses_spec.rb
* 13 conversions
from: obj.should
to: expect(obj).to
* 2 conversions
from: it { should ... }
to: it { is_expected.to ... }
* 1 conversion
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-10-18 10:52:46 +11:00
luisramos0
fe9f4a1c95
Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead
2018-10-17 12:16:33 +01:00
luisramos0
5c5a2194d6
Extract country states logic out of subscriptions address controller into new service CountryStates
2018-10-16 21:58:27 +01:00
luisramos0
feaf16d878
Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases
2018-10-16 20:59:34 +01:00
fabricio.albarnaz
8e4adbd23a
Add more test cases
2018-10-16 15:34:46 -03:00
Luis Ramos
3e4f92fe92
Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix
2018-10-16 17:33:33 +01:00
Pau Pérez Fabregat
c99fec44da
Merge pull request #2824 from luisramos0/2-0-order-spec
...
[Spree Upgrade] Fix taxes tests in models/spree/order_spec
2018-10-16 18:09:33 +02:00
Pau Pérez Fabregat
f2fe3c8cff
Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix
...
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - tax_rate
2018-10-16 18:02:21 +02:00
Pau Pérez Fabregat
db9669b4ce
Merge pull request #2817 from coopdevs/remove-reference-to-on-demand
...
[Spree Upgrade] Remove on_demand from Product serializers
2018-10-16 17:52:42 +02:00
luisramos0
570016463b
Fix order_updater_spec by using create (instead of build) in shipment. Also simplified spec by using prebuild shipment_with and shipping_method factories
2018-10-16 16:37:36 +01:00
Maikel Linke
b109f6d78c
Remove temporary reporting code
2018-10-16 14:48:12 +11:00
fabricio.albarnaz
02bc134c59
Change befor save check to format validation
2018-10-15 17:51:33 -03:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Pau Pérez Fabregat
f8bccda6ab
Merge pull request #2847 from Matt-Yorkley/emails/validation
...
Emails/validation
2018-10-15 15:54:41 +02:00
Pau Perez
a5a2cb8ea7
Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up"
...
This reverts commit fa689b66072aeed9763c
2018-10-15 15:48:48 +02:00
Pau Pérez Fabregat
0e4a3dbc26
Merge pull request #2845 from coopdevs/fix-invalid-variant-creation
...
Fix invalid variant creation
2018-10-15 12:16:39 +02:00
Pau Pérez Fabregat
fa689b6607
Merge pull request #2856 from luisramos0/2-0-adjust-clean-up
...
[Spree Upgrade] Running Transpec and Rubocop in "new" models/spree/adjustment_spec
2018-10-15 11:13:46 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
luisramos0
f133524a9c
Remove useless comment from spec factories
2018-10-12 23:09:36 +01:00
luisramos0
a5522b90f6
Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created
2018-10-12 23:09:35 +01:00
luisramos0
5693f44f5e
Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment
2018-10-12 23:09:35 +01:00
Matt-Yorkley
bd4f0507ce
Adjustments for new Settings and ResetAbsent classes
2018-10-12 16:57:13 +01:00
Matt-Yorkley
1c85de6f58
Use producer and distributor for field names
2018-10-12 16:57:13 +01:00
Matt-Yorkley
2c9dc8899a
Update fields in specs
2018-10-12 16:57:13 +01:00
luisramos0
3b6d29968d
Fix spree/models/adjustment_spec rubocop issues
2018-10-11 23:02:17 +01:00
