Luis Ramos
0aaa41ced0
Merge pull request #3228 from luisramos0/2-0-stable-dec-18th
...
[Spree Upgrade] Merging master into 2-0-stable (third run in Dec2018)
2018-12-19 09:30:57 +00:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
Pau Pérez Fabregat
2deffb9c9f
Merge pull request #3076 from Matt-Yorkley/orders_checkboxes
...
Fix checkbox values on orders page
2018-12-17 10:35:46 +01:00
luisramos0
a5bf7a1f35
Adapt payment controller spec to spree 2
...
In spree 2, since 5ed6015916
2018-12-14 16:04:19 +00:00
Pau Pérez Fabregat
64e41712c6
Merge pull request #3130 from coopdevs/extract-restart-checkout
...
Extract restart checkout
2018-12-12 17:12:53 +01:00
Pau Perez
43cacfc2fc
Fix redirection on admin/products controller specs
...
In Spree v2.0 the product attributes being sent were no longer valid.
Providing a shipping category and setting a stock location on the DB so
that a stock item can be created fixes them.
Remember `Variant#create_stock_item`, which is defined as an
`after_create` callback, relies on `StockLocation` to create the item.
2018-12-12 13:10:39 +01:00
Maikel
1819fc8493
Merge pull request #3199 from luisramos0/2-0-stable-dec-10th
...
[Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)
2018-12-11 18:50:24 +11:00
Maikel
d63ae792b3
Merge pull request #2775 from luisramos0/2-0-checkout-ship-method
...
[Spree Upgrade] Handle shipping_method_id in checkout
2018-12-11 11:59:03 +11:00
Matt-Yorkley
e711c5ed03
Add spec for search filters
2018-12-10 20:48:53 +00:00
luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
Pau Pérez Fabregat
b8a61257da
Merge pull request #3188 from luisramos0/2-0-ctrl-specs
...
[Spree Upgrade] Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-10 12:31:26 +01:00
luisramos0
7df869bd35
Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-05 22:22:15 +00:00
luisramos0
afd243c548
Replace stub with allow in checkout_controller_spec
2018-12-05 15:40:14 +00:00
Pau Perez
6594529cda
Fix manager invitation controller spec
2018-12-05 10:05:39 +01:00
Pau Pérez Fabregat
3b56212290
Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1
...
Remove frontoffice enterprises n+1
2018-12-05 08:12:19 +01:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
luisramos0
258287b88d
Add tests to cover CheckoutController#update with shipping_method_id
2018-11-30 17:04:46 +00:00
Pau Perez
5a85d7a77b
RSpec3-ize controller spec
2018-11-28 13:54:42 +01:00
Hugo Daniel
65dd3eb5b9
Change line items controller HTML response spec to look for form order_edit class
2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat
869f17256d
Merge pull request #3011 from HugsDaniel/3000-api-endpoint-enterprise-fee
...
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-27 17:28:43 +01:00
Maikel
1b58c2519a
Merge pull request #3138 from luisramos0/2-0-stable-nov-24th
...
[Spree Upgrade] Merging master into 2-0-stable (third run in Nov2018)
2018-11-27 16:16:32 +11:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
Pau Perez
23421758fa
Fix checkout spec due to shipments
2018-11-23 12:28:31 +01:00
Pau Perez
453b2a99de
Rename redundant #restart_checkout to #call
2018-11-23 12:05:39 +01:00
Pau Perez
3b681a59ba
Move controller tests to service class tests
2018-11-23 12:04:42 +01:00
Pau Perez
a62a2cb52f
Extract #restart_checkout to a service
2018-11-23 12:04:42 +01:00
Hugo Daniel
a08ddd8171
Use :user factory instead of build_stubbed to create the current_api_user
2018-11-22 14:29:37 +01:00
Maikel
5e82d38bec
Merge pull request #3071 from luisramos0/2-0-xdescribe-proxy-order
...
[Spree Upgrade] Move ProxyOrder controller to xdescribe
2018-11-20 16:38:42 +11:00
luisramos0
d1071acfdb
Move ProxyOrder controller to xdescribe. It's part of non-core feature subscriptions and will be left for spree upgrade phase 2
2018-11-17 12:23:52 +00:00
luisramos0
b40c0e5b80
Fix order controller spec with enterprise fees by adapting to new order factory with 5 line items by default
2018-11-17 12:11:23 +00:00
Maikel
5ecea06098
Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl
...
[Spree Upgrade] Fix credit card controller
2018-11-16 10:43:16 +11:00
Hugo Daniel
0868404e98
Add specs for new Api::EnterpriseFeesController
2018-11-15 17:58:56 +01:00
Hugo Daniel
4e29589be0
Add specs for cloning a product with image
2018-11-15 13:51:40 +01:00
luisramos0
9ba0fc268e
Run transpec and clean up rubocop issues in credit_card_controller and spec
2018-11-15 11:07:43 +00:00
Maikel
a2c9ba60d8
Merge pull request #3035 from luisramos0/2-0-order-ctrl-line-item-delete
...
[Spree Upgrade] Fix orders controller spec when removing line items from order
2018-11-15 15:20:31 +11:00
luisramos0
9b894c6a55
Fix orders controller spec when removing line items from order. Improved spec and adapted to the fact that in spree 2 the default number of line items in this factory is 5
2018-11-13 19:51:26 +00:00
luisramos0
ef5d679f90
Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path
2018-11-12 16:31:57 +00:00
luisramos0
bbdbfc1374
Fix opi/orders_controller_spec by providing line items with shipment and thus make the order workflow work
2018-11-12 16:29:38 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00: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 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
Maikel
3259b3ecf1
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
...
Admin orders refactor
2018-11-02 16:57:28 +11: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
1f8f7b0495
Add new Api::OrdersController 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
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
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
luisramos0
f3ef3d0c3e
Avoiding variantStock raise by creating variant first and then setting count_on_hand
2018-10-20 23:28:22 +01:00
