raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

5852 Commits

Author SHA1 Message Date
luisramos0
bf55f50a7e Fix rubocop warnings on weight and weight_spec 2018-11-07 09:54:30 +00:00
luisramos0
275a192270 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/calculator/weight_spec.rb

* 3 conversions
    from: == expected
      to: eq(expected)

* 3 conversions
    from: obj.should
      to: expect(obj).to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-11-07 09:54:30 +00:00
luisramos0
1ef04354fd Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package) 2018-11-07 09:54:30 +00:00
Luis Ramos
86721d6d42 Merge pull request #2974 from luisramos0/2-0-user-balance 
[Spree Upgrade] Fix User Balance Calculator spec
 2018-11-06 16:00:44 +00:00
luisramos0
79fcc7bce0 Fix user balance calculator spec by setting a target_shipment on line item of the order being tested 2018-11-05 19:23:09 +00:00
Pau Pérez Fabregat
6bc14f4bab Merge pull request #2970 from Matt-Yorkley/2939-edit-order-button 
Remove workaround in failing feature spec
 2018-11-05 19:25:00 +01:00
Pau Pérez Fabregat
057412111d Merge pull request #2972 from coopdevs/mark-last-failing-enterprise-spec-pending 
[Spree Upgrade] Mark last failing enterprises spec as pending
 2018-11-05 18:59:47 +01:00
Pau Perez
f7b6867c28 Perform mail delivery in spec to make it pass 
We need to purposefully enable deliveries for the deliveries array to
list this email. Otherwise the delivery logic is not executed and thus
the deliveries array never filled.
 2018-11-05 17:49:08 +00:00
Pau Perez
21d756a1af Mark last failing enterprises spec as pending 
This will get solved once we complete
https://github.com/openfoodfoundation/openfoodnetwork/issues/2971. Until
then, let's not focus on this spec to reach our 100% green test suite.
 2018-11-05 16:45:53 +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
50a06d1bd9 Merge pull request #2969 from luisramos0/2897-2-0-price-fix 
[Spree Upgrade] Fix specs creating deleted variants
 2018-11-05 11:59:06 +01:00
luisramos0
4f992a18f7 Fix specs creating deleted variants 
Spree checks that each price belongs to a variant
Since we were creating deleted variants, the price models couldnt see those
 2018-11-05 10:43:10 +00:00
Pau Pérez Fabregat
fe8303cb19 Merge pull request #2957 from luisramos0/2-0-paypal-spec 
[Spree Upgrade] Fix occurrences of order.shipping_method= by replacing with order.shipments
 2018-11-02 15:50:59 +01:00
Pau Pérez Fabregat
834520491c Merge pull request #2900 from luisramos0/raise_error_if_no_stock_item_available 
[Spree Upgrade] Avoiding variantStock raise by creating variant first and then setting `count_on_hand`
 2018-11-02 15:49:21 +01:00
Pau Pérez Fabregat
b1f3fa14e5 Merge pull request #2880 from luisramos0/backorders 
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the cart
 2018-11-02 15:47:02 +01: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
Maikel
3259b3ecf1 Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor 
Admin orders refactor
 2018-11-02 16:57:28 +11: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
Pau Pérez Fabregat
8e602d453b Merge pull request #2876 from luisramos0/subs-states-fix 
Fix bug in subscriptions address controller where country states were not correctly returned
 2018-10-30 17:32:34 +01:00
luisramos0
8a034a1538 Fix occurrences of order.shipping_method= by replacing with order.shipments= 2018-10-30 13:37:45 +00: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
Maikel
7609496df3 Merge pull request #2859 from albarnaz/instagram_pattern 
Instagram pattern
 2018-10-30 15:10:27 +11:00
Pau Pérez Fabregat
5fade045f8 Merge pull request #2928 from luisramos0/line_items_controller_spec 
Reorganize LineItemsController's destroy line item specs
 2018-10-29 16:09:20 +01:00
luisramos0
b16ed86b2d Fix shipping_method basic test. Adapt to spree 2 that needs shipping_categories to be set and sets them on the base factory in a after_create block, the build command was not picking it up 2018-10-27 20:34:25 +01:00
Matt-Yorkley
b826beb0d7 Inline hashes in tests 2018-10-26 21:38:57 +01:00
Matt-Yorkley
29492d61f9 Use #allow syntax 2018-10-26 21:38:57 +01:00
Matt-Yorkley
8c19d1afec Move tests from spree/admin/orders_controller_spec to api/orders_controller_spec and tidy up 2018-10-26 21:38:57 +01:00
Matt-Yorkley
033ae4f570 Add basic SearchOrders service spec 2018-10-26 21:38:57 +01:00
Matt-Yorkley
1f8f7b0495 Add new Api::OrdersController spec 2018-10-26 21:38:57 +01:00
Matt-Yorkley
46b1317159 Update orders resource js spec 2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee Refactor Spree::Admin::OrdersController 2018-10-26 21:38:57 +01: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
09f8df6340 Reorganize LineItemsController's destroy line item specs to separate contexts with different test orders (completed_with_total and completed_with_fees) 2018-10-25 18:06:48 +01:00
Pau Pérez Fabregat
8a3f621b42 Merge pull request #2893 from luisramos0/deleted_products_break_inventory 
Fix bug in inventory management page
 2018-10-25 18:20:42 +02: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
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