raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,616 Commits 20 Branches 451 Tags
a2c8bea14718efe0c4ccbb375cdcfd9a991a85e5
Commit Graph

4431 Commits

Author SHA1 Message Date
Maikel
a2c8bea147 Merge pull request #3147 from luisramos0/2-0-vos 
[Spree Upgrade] Adapt variant overrides to spree 2
 2018-12-05 10:50:20 +11:00
Pau Pérez Fabregat
30e7d32cea Merge pull request #3157 from coopdevs/fix-producer-mailer-specs 
[Spree Upgrade] Specify :mailer type in specs
 2018-12-04 15:21:17 +01:00
Maikel
60c8147391 Merge pull request #3164 from luisramos0/2-0-stable-dec-3rd 
[Spree Upgrade] Merging master into 2-0-stable (first run in Dec2018)
 2018-12-04 13:38:02 +11:00
Maikel
214235d8dd Merge pull request #3152 from coopdevs/fix-product-spec 
[Spree Upgrade] Fix product spec
 2018-12-04 12:07:33 +11:00
luisramos0
3776b891ce Merge branch 'master' into 2-0-stable-dec-3rd 2018-12-03 15:30:16 +00:00
Pau Perez
46bf4c9eea Specify :mailer type in specs 
According to RSpec docs we need to specify type: :mailer for mails to
work. Check it out:
https://relishapp.com/rspec/rspec-rails/v/3-8/docs/mailer-specs.

This fixes all specs in producer_mailer_spec.rb.
 2018-12-03 15:41:58 +01:00
luisramos0
d962358f15 Fix rubocop and transpec models/variant_override and its spec 2018-11-30 00:43:55 +00:00
luisramos0
0577011f5b Refactor variant override model and its spec: simplify move_stock and remove unused methods 2018-11-30 00:22:04 +00:00
Pau Pérez Fabregat
08297863be Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page 
Expand all steps in the checkout page by default
 2018-11-29 16:28:42 +01:00
Pau Perez
957c38e4f2 Add missing translations causing a test failure 2018-11-28 18:38:09 +01:00
Pau Perez
7834b1d3f3 Fix test case for invalid product master 2018-11-28 17:39:59 +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
Hugo Daniel
60214b9a90 Fix failing specs 2018-11-28 10:31:47 +01:00
Luis Ramos
1bc06e7384 Merge pull request #3139 from luisramos0/2-0-bulk-prod-update-spec-fix 
[Spree Upgrade] Fix tests in bulk_product_update spec
 2018-11-27 18:36:36 +00:00
Pau Pérez Fabregat
c5ae9bdce2 Merge pull request #3132 from luisramos0/2-0-variant-ondemand 
[Spree Upgrade] Add VariantStock.on_demand as attribute_accessible
 2018-11-27 18:05:34 +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
luisramos0
64d16258cf Fix tests in bulk_product_update spec by: 
- setting on_hand in the variant and not in the product directly
- setting variant on_demand to false (default from the factory is on_demand true)
- saving the variant after doing this to trigger appropriate callbacks like creating missing variant stock items
 2018-11-27 16:03:52 +00: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
Maikel
296029ef28 Merge pull request #3131 from coopdevs/fix-restart-checkout-spec 
[Spree Upgrade] Fix checkout spec due to shipments
 2018-11-27 15:16:01 +11:00
luisramos0
e153510a71 Merge branch 'master' into 2-0-stable-nov-24th 2018-11-24 15:19:38 +00:00
luisramos0
73ed5eeaac Fix product import spec related to this change, the value provided to on_hand must be an integer 2018-11-23 18:07:51 +00:00
Maxim Colls
4b588cbfb0 Removed unused toggle helpers in spec/support 2018-11-23 16:47:55 +00:00
Hugo Daniel
f1dc52fe4e Set variant.on_demand to false 2018-11-23 14:30:14 +01:00
Pau Perez
23421758fa Fix checkout spec due to shipments 2018-11-23 12:28:31 +01:00
luisramos0
d28f47046a Fix product model spec by removing unnecessary on_hand setter and adding required fields for a new product 2018-11-22 20:38:58 +00:00
Luis Ramos
0052d571b9 Merge pull request #3100 from HugsDaniel/2999-checkout-feature-specs 
[Spree Upgrade] Fix checkout feature specs
 2018-11-22 16:49:41 +00:00
Hugo Daniel
d7a148bb75 Fix checkout feature specs 2018-11-22 17:01:39 +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 Linke
95dbfae757 Use expect syntax 2018-11-22 15:42:56 +11:00
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