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
Pau Pérez Fabregat
9a06c1ef98
Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin
...
[Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2
2018-10-23 18:59:01 +02:00
Pau Pérez Fabregat
235d42024a
Merge pull request #2903 from luisramos0/2884-2-0-order-ships-path
...
[Spree Upgrade] In order list page, the shipment state is now a label, not a link. The shipments page is gone in spree 2.
2018-10-23 18:57:05 +02: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
d0d9038308
Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2
2018-10-22 11:24:01 +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
653c67971f
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
2018-10-20 15:11:47 +01:00
Pau Pérez Fabregat
32632addfb
Merge pull request #2823 from luisramos0/2-0-order-spec-fees
...
[Spree Upgrade] Fix fees tests in models/spree/order_spec
2018-10-18 13:30:15 +02:00
luisramos0
a92e8c9923
Improve readability of shipment decorator
2018-10-18 10:54:21 +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
luisramos0
91f52d80c8
Fix problem in order and adjustment model specs by fixing the order.adjustment association
...
This fix was taken from spree 2.1 here 3fa44165c7
2018-10-18 10:53:00 +01:00
luisramos0
2ccbb87adc
Fix payment decorator bug
...
Payment line items must come from the order, payment does not have inventory_units
2018-10-18 10:53:00 +01:00
Maikel
3a2e52cc98
Merge pull request #2780 from luisramos0/2-0-stripe-factory
...
[Spree Upgrade] Fix Stripe connect factory
2018-10-18 14:54:28 +11:00
Maikel
01c21c302c
Merge pull request #2811 from luisramos0/2-0-adjust-basic-spec-fix
...
[Spree Upgrade] Fixes shipping tests in adjustment spec
2018-10-18 14:49:28 +11:00
luisramos0
98161daa90
Refactor duplicated distributors association in payment_method and gateway to a concern
2018-10-16 20:27:22 +01:00
Pau Pérez Fabregat
601e0b927a
Merge pull request #2816 from luisramos0/2-0-adjust-enterprise-fees-spec-fix-aplicator
...
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - enterprise_fee_aplicator
2018-10-16 19:47:10 +02:00
Pau Pérez Fabregat
54f0ccab93
Merge pull request #2861 from luisramos0/2-0-stable-spree-revision
...
[Spree Upgrade] Update spree 2-0-4-stable revision used to pick up latest commits
2018-10-16 19:41:08 +02: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
luisramos0
b3c56e6823
Duplicated payment method distributors association to gateway. This fixes the inheritance problem found in stripe gateway
...
See PR 2780 for more details
2018-10-16 16:55:18 +01: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
Luis Ramos
faf8322c59
Merge pull request #2785 from luisramos0/2-0-order-updater-fix
...
[Spree Upgrade] Fix order_updater_spec by using create (instead of build) in shipment
2018-10-16 16:43:42 +01: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
Pau Pérez Fabregat
afe1d7caef
Merge pull request #2863 from luisramos0/2-0-stable-oct
...
[Spree Upgrade] Merging master into 2-0-stable (one month of commits in master)
2018-10-16 17:09:56 +02: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
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +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
4380ff7bd7
Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4)
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
bd31348b94
Improve docs and readability on tax_rate_decorator
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
fcff835922
Update results on dropdown select
2018-10-12 17:06:42 +01:00
Matt-Yorkley
8a0a33deec
Merge pull request #2858 from Matt-Yorkley/rubocop_line_limit
...
Increase rubocop line limit to 100
2018-10-12 16:52:37 +01:00
luisramos0
1b6f7485b8
Update spree 2-0-4-stable revision used to pick up latest commits
2018-10-12 12:05:18 +01:00
luisramos0
3b6d29968d
Fix spree/models/adjustment_spec rubocop issues
2018-10-11 23:02:17 +01:00
