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
Pau Pérez Fabregat
ac9cfaa8c3 Merge pull request #3093 from mllocs/fix/factories-ignore-warning 
Fixed Factory warning while running tests
 2018-11-21 14:44:03 +01:00
luisramos0
24a7494103 Fix admin/adjustments spec by renaming test adjustment from Shipping to Extra Adjustment. 
This was causing an error because the order factory now includes a Shipping adjustment
 2018-11-21 13:41:16 +00:00
Maxim Colls
f179bf8c49 Fixed Factory warning while running tests 2018-11-20 18:27:43 +00:00
Maikel
733a018f37 Merge pull request #3081 from luisramos0/2-0-enterprise-groups 
[Spree Upgrade] Fix features/admin/enterprise_groups_spec by replacing select2_search with select2_select
 2018-11-20 16:41:05 +11:00
Maikel
b05bfc5cc7 Merge pull request #3075 from luisramos0/2-0-setting-transl 
[Spree Upgrade] Fix translation issue in settings spec
 2018-11-20 16:39:54 +11: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
Maikel
6835d24fbf Merge pull request #3004 from luisramos0/2-0-mail-method-fix 
[Spree Upgrade] Fix line Item specs with problems related to VariantStock.on_hand=
 2018-11-20 16:37:19 +11:00
Luis Ramos
d984d76e6b Merge pull request #3070 from luisramos0/2-0-order-spec-restart 
[Spree Upgrade] Fix order spec restart checkout test and orders controller enterprise with fees test
 2018-11-20 00:38:11 +00:00
luisramos0
5f48f2b8a1 Fix enterprise groups spec by replacing select2_search with select2_select for country and state in enterprise group address 2018-11-19 12:44:25 +00:00
luisramos0
bf32a21155 Allow adapted on_hand attr to be mass assigned in VariantStock. 
Without specifying it in `attr_accessible`, `#assign_attributes` won't
work. See details in
https://apidock.com/rails/v3.2.13/ActiveRecord/Persistence/update_attributes
and https://apidock.com/rails/ActiveRecord/Base/assign_attributes.
 2018-11-19 10:05:17 +00:00
Maikel
90e8813ff6 Merge pull request #3054 from coopdevs/fix/incorrect-order-dates 
Fix/incorrect order dates
 2018-11-19 09:17:11 +11:00
luisramos0
9deb249dec Fix order by changing expected results: order is paid. 
These tests use order factory order_with_credit_payment with ‘amount: order.total + 10000’ and since spree 2 when order payment state is credit_owned (customer has credit after the order), the order is considered paid 71c6c4f297
 2018-11-18 20:58:55 +00:00
luisramos0
a20aba26cd Fix order feature spec by adapting to new spree 2 order factory with 5 line_items by default. Removed currency sign to avoid having problems with it, it's not really part of the spec objective 2018-11-18 16:51:43 +00:00
luisramos0
d29778e2d1 Fix translation issue in spec by refering the correct translation namespace: spree 2018-11-18 16:36:03 +00:00
Maxim Colls
884d4d0122 Fixed specs 2018-11-17 19:46:09 +01: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
luisramos0
ee8d77bc09 Fix order spec restart checkout test by adding a required line_item to the order being tested 2018-11-17 11:57:16 +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
Maikel
5d200b7753 Merge pull request #3026 from luisramos0/2-0-calculator-line-items-for 
[Spree Upgrade] Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package
 2018-11-16 10:41:29 +11:00
Luis Ramos
f985e723e8 Merge pull request #3048 from mkllnk/2882-spree2-email-config 
[Spree Upgrade] Update test mail setup for Spree 2
 2018-11-15 22:25:50 +00:00
Pau Perez
c7a1c4b253 Change order date column translation in BOM 
This makes it consistent with the order page. In both cases we use the
`completed_at` column underneath.
 2018-11-15 19:09:17 +01:00
Hugo Daniel
0868404e98 Add specs for new Api::EnterpriseFeesController 2018-11-15 17:58:56 +01:00
Pau Perez
b1b04b505e Fetch orders sorted by completion date 2018-11-15 15:40:13 +01:00
Hugo Daniel
4e29589be0 Add specs for cloning a product with image 2018-11-15 13:51:40 +01:00
Luis Ramos
1dc5cc6d42 Merge pull request #3040 from luisramos0/2-0-refactor-factories 
[Spree Upgrade] Simplify completed_order_with_fees factory and make shipment_with an ofn factory
 2018-11-15 11:24:49 +00: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
d109f882fc Merge pull request #3038 from luisramos0/2-0-order-factory 
[Spree Upgrade] Remove shipping_method_id from order factory
 2018-11-15 15:22:31 +11: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
Maikel
ebbe02523e Merge pull request #3019 from luisramos0/more-x-spec-reports 
[Spree Upgrade] Make broken report specs xdescribe and leave them for spree upgrade pha…
 2018-11-15 15:17:04 +11:00
Maikel
2d3f706c05 Merge pull request #3042 from luisramos0/2-0-stable-nov-14th 
[Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)
 2018-11-15 15:02:21 +11:00
Maikel Linke
1e312dfa41 Update test mail setup for Spree 2 
https://github.com/openfoodfoundation/openfoodnetwork/issues/2882

The email setup differs between Spree 1 and Spree 2. We already
encapsulated that setup in a single method which now needed changing.
 2018-11-15 14:30:46 +11:00
Maikel
a25cdd90de Merge pull request #3014 from luisramos0/2-0-payments_spec 
[Spree Upgrade] Fix admin payments spec
 2018-11-15 13:02:28 +11:00
luisramos0
ece21a674a Simplify completed_order_with_fees factory and make shipment_with factory an ofn factory to avoid creating extra dummy shipping_method in every test 2018-11-14 23:13:05 +00:00
luisramos0
688ec5fb21 Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec 2018-11-14 23:04:38 +00:00
luisramos0
7c0627a823 Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package 2018-11-14 23:04:38 +00:00
luisramos0
0a77eeb4b6 Merge branch 'master' into 2-0-stable-nov-14th 2018-11-14 11:35:58 +00:00
luisramos0
19321b6d4f Fix admin payments spec. Add missing payment method to order.distributor 2018-11-14 11:26:26 +00:00
luisramos0
2947d7a98c Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout 2018-11-13 21:25:59 +00: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
2037413df7 Make some report specs xdescribe and leave them for spree upgrade phase 2 2018-11-13 14:53:42 +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
Maikel
d8d20429aa Revert "Instagram pattern" 2018-11-09 13:33:11 +11:00
Luis Ramos
0ea0016fc9 Merge pull request #2998 from coopdevs/adapt-product-on-demand 
[Spree Upgrade] Adapt product on demand
 2018-11-08 19:21:46 +00:00
Luis Ramos
ed7c12bd26 Merge pull request #2997 from luisramos0/2-0-stable-nov-8th 
[Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)
 2018-11-08 19:20:42 +00:00
Pau Perez
de31823151 Add #on_demand= to make product creation page work 
We're bringing in the setter that got removed in Spree 2.0 so that we
can still pass an on_demand value from the product creation form.

However, we won't keep the getter to keep things simple. The frontend
seems to be checking the existence of variants anyway, so then it can
also check for product.master.on_demand and we avoid some logic on the
backend.
 2018-11-08 11:41:58 +00:00
luisramos0
fcdb5cd7af Merge branch 'master' into 2-0-stable-nov-8th 2018-11-08 11:18:54 +00:00
Matt-Yorkley
3f33e28839 Fix outdated credit card spec 2018-11-07 20:48:54 +00:00
luisramos0
9490da329a Move Calculator::Weight from models/open_food_network/calculator to models/calculator 2018-11-07 09:54:30 +00:00