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
92c7db2249
Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem
2018-10-20 23:43:33 +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
653c67971f
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
2018-10-20 15:11:47 +01:00
luisramos0
d375bb8c55
Migration: Revoke variant overrides without permissions
2018-10-20 12:32:55 +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
5ae0ad87a7
Refactor EnterpriseRelationship before save hook: some renames and extract methods
2018-10-20 11:52:11 +01:00
Matt-Yorkley
c3cef699ca
Use https on all links in emails in production
2018-10-19 17:03:51 +01:00
Transifex-Openfoodnetwork
c911462737
Updating translations for config/locales/en_GB.yml
2018-10-20 02:04:33 +11: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
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
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
c281927372
Fix subscription address form. It now clears the state selection when a different country is selected
2018-10-16 23:02:26 +01:00
luisramos0
1804bf5a2b
Extract countryStates logic from customer_address modal and re-use new CountryStates service
2018-10-16 22:45:38 +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
luisramos0
98161daa90
Refactor duplicated distributors association in payment_method and gateway to a concern
2018-10-16 20:27:22 +01:00
fabricio.albarnaz
419493f153
Move instagram regex to an method to fix codeclimate
2018-10-16 16:09:15 -03:00
fabricio.albarnaz
8e4adbd23a
Add more test cases
2018-10-16 15:34:46 -03:00
fabricio.albarnaz
93a051bf5a
Regex ajust
2018-10-16 15:33:10 -03: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
Pau Pérez Fabregat
590091c42a
Merge pull request #2842 from Matt-Yorkley/pi/missing_variable
...
Fix missing local variable in EntryProcessor
2018-10-16 13:19:23 +02:00
