raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,645 Commits 17 Branches 453 Tags
287ea6038a3e8f3f4d1e87a02fcda40e7f2d130a
Commit Graph

11645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
287ea6038a Remove distributors from product in completed_order_with_fees factory. This setter is no longer available after product distributions has been deleted 2019-03-22 11:50:24 +00:00
luisramos0
c1d14686a6 Merge branch 'master' into 2-0-stable-Mar22 2019-03-22 10:55:17 +00:00
Luis Ramos
6cd07cd107 Merge pull request #3605 from kristinalim/fix/2788-improve_specs_for_order_syncer 
[Subscriptions] (v1) Fix assertions in specs for OrderSyncer
 2019-03-22 10:31:01 +00:00
Luis Ramos
8d2d5a8708 Merge pull request #3579 from luisramos0/sanitize_data 
Add sanitize and truncate data tasks
 2019-03-22 10:29:57 +00:00
Pau Pérez Fabregat
846e6fdd90 Merge pull request #3560 from kristinalim/fix/2788-shipping_method_id_in_shipments 
2696,2788 [Spree Upgrade] Fix use of shipping method ID for subscriptions
 2019-03-22 11:08:23 +01:00
Pau Pérez Fabregat
deec4f83f8 Merge pull request #3633 from mkllnk/remove-product-distribution-from-sample-data 
Remove usage of ProductDistribution which is dead
 2019-03-22 10:54:59 +01:00
Pau Pérez Fabregat
4595ea033f Merge pull request #3624 from mkllnk/2873-spec-register-link 
Add spec for registration link on Spree pages
 2019-03-22 10:47:43 +01:00
Pau Pérez Fabregat
5b06f580e2 Merge pull request #3614 from mkllnk/3335-localized-number-for-weight-calculator 
Support international decimals in weight calculator
 2019-03-22 10:35:37 +01:00
Pau Pérez Fabregat
87f0ddabe7 Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features 
[Spree Upgrade] Remove unused spree v2 features
 2019-03-22 10:35:15 +01:00
Kristina Lim
c222971e26 Clean up setup data for some OrderSyncer specs 2019-03-22 03:30:50 +08:00
Kristina Lim
0c2a75a227 Randomize bill and ship address of sample subscriptions 
This also fixes some phone references in OrderSyncer specs.
 2019-03-22 02:47:12 +08:00
Kristina Lim
7be669e1dd Add address factory with randomized attributes 
Randomizing all addresses generated will be explored separately.
 2019-03-22 02:45:50 +08:00
Kristina Lim
d047e04e33 Customize addresses for subscriptions in specs 
This forces us to write correct assertions when adding specs affected by
subscription addresses.
 2019-03-22 01:58:27 +08:00
Kristina Lim
94606025c9 Separate call and call! for AdvanceOrderService 2019-03-21 20:34:51 +08:00
luisramos0
61433ee395 Make anonimize and truncate tasks respect rubocop rules 2019-03-21 11:16:56 +00:00
Maikel Linke
0b7192b82a Remove usage of ProductDistribution which is dead 
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
 2019-03-21 17:37:16 +11:00
Maikel Linke
3803094409 Add more examples to LocalizedNumber spec 2019-03-21 12:49:19 +11:00
Maikel Linke
3ef6878233 Avoid global state change by using config stub 2019-03-21 12:49:19 +11:00
Maikel Linke
1ea2f37c18 Support international decimals in weight calculator 
A previous pull request added support for flexible decimal characters
when editing money amounts.
https://github.com/openfoodfoundation/openfoodnetwork/pull/1831

This pull request applies the same principle to the weight calculator
which was missed in the previous pull request.
 2019-03-21 12:49:19 +11:00
Maikel
130ba64f2f Merge pull request #3619 from openfoodfoundation/dependabot/bundler/dalli-2.7.10 
Bump dalli from 2.7.9 to 2.7.10
 2019-03-21 12:47:29 +11:00
Maikel
f1ac33f304 Merge pull request #3590 from mkllnk/3576-bulk-order-spec 
3576 Fix bulk order management race condition
 2019-03-21 12:40:41 +11:00
Maikel Linke
d62908fd2d Add spec for registration link on Spree pages 
The `registration_path` helper resolves to `/signup` in Spree
controllers due to spree_auth_device > config > routes.rb.
We worked around that in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3174

Here we add a spec for this so that we can test more easily if we
remove that workaround or detect it's accidental removal.
 2019-03-21 10:06:15 +11:00
Kristina Lim
d3c2d1859c Update all locales with the latest Transifex translations v1.29.0 2019-03-21 01:56:45 +08:00
Kristina Lim
b942dc1074 Merge pull request #3628 from openfoodfoundation/transifex 
Transifex
 2019-03-21 01:52:58 +08:00
Transifex-Openfoodnetwork
08894c242c Updating translations for config/locales/en_GB.yml 2019-03-21 04:04:33 +11:00
Transifex-Openfoodnetwork
eeb8f12b4e Updating translations for config/locales/en_GB.yml 2019-03-21 04:01:27 +11:00
Transifex-Openfoodnetwork
79eb89ac0b Updating translations for config/locales/en_GB.yml 2019-03-21 03:58:20 +11:00
Luis Ramos
61c778eeac Merge pull request #3555 from luisramos0/2-0-fix-order-state-translations 
[Spree Upgrade] Improve order state translations in v2
 2019-03-20 12:26:35 +00:00
Luis Ramos
59af77eb0e Merge pull request #3620 from mkllnk/3520-customers-spec 
Fix flaky spec by waiting for modal animation
 2019-03-20 12:02:11 +00:00
luisramos0
3841656979 Rename data sanitize task to data anonymize 2019-03-20 11:58:26 +00:00
luisramos0
fefced5400 Improve sanitize data: keep customers connected to users and let addresses' city and zipcode remain as they are 2019-03-20 11:49:55 +00:00
Maikel
0f5e6474b8 Merge pull request #3602 from luisramos0/2-0-shipments-stock-location 
[Spree Upgrade] Add migrations necessary to successfully migrate data to v2
 2019-03-20 21:36:45 +11:00
Pau Pérez Fabregat
98a2e87587 Merge pull request #3610 from luisramos0/2-0-stable-Mar16 
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Mar2019)
 2019-03-20 09:33:07 +01:00
Pau Pérez Fabregat
4f82808243 Merge pull request #3617 from luisramos0/edit-variants-specs 
Add spec to cover editing on_hand and on_demand values in the variants edit page
 2019-03-20 09:13:56 +01:00
Pau Pérez Fabregat
2a3a935c16 Merge pull request #3570 from luisramos0/byebye-prod-distributions 
Delete dead feature product distributions
 2019-03-20 09:01:23 +01:00
Maikel Linke
a66eb7fe1d Add spec for registration link on Spree pages 
The `registration_path` helper resolves to `/signup` in Spree
controllers due to spree_auth_device > config > routes.rb.
We worked around that in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3174

Here we add a spec for this so that we can test more easily if we can
remove that workaround or detect it's accidental removal.
 2019-03-20 15:02:30 +11:00
Maikel Linke
aef5cebeed Fix flaky spec by waiting for modal animation 
Without waiting, `fill_in` can fail randomly:
https://github.com/teamcapybara/capybara/issues/1890
 2019-03-20 12:15:01 +11:00
dependabot[bot]
b0854b6d51 Bump dalli from 2.7.9 to 2.7.10 
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 19:21:33 +00:00
luisramos0
90a14d426b Add spec to cover editing on_hand and on_demand values in the variants edit page 2019-03-18 17:04:59 +00:00
luisramos0
9fff795162 Fix typo in en.yml in key new_shipping_category 2019-03-18 17:04:59 +00:00
luisramos0
b148b9ae46 Remove delete addresses SQL from truncate task 2019-03-18 12:04:37 +00:00
Pau Pérez Fabregat
fb29a7c7c2 Merge pull request #3606 from openfoodfoundation/dependabot/bundler/oj-3.7.10 
Bump oj from 3.7.9 to 3.7.10
 2019-03-18 12:12:13 +01:00
luisramos0
22a051e720 Enable products cache by default only in staging and production 
We keep tests running by default without cache, keeping it as it was before 10a79d5a65

Additionally, cached_products_renderer no longer depends on Rails.env, so here we remove that dependency from it's spec.
 2019-03-17 15:03:15 +00:00
luisramos0
60ee17204b Merge branch 'master' into 2-0-stable-Mar16 2019-03-16 16:17:38 +00:00
Kristina Lim
7505dd0410 Make order sync for shipping methods readable 2019-03-15 07:59:54 +11:00
dependabot[bot]
d7b25d63f9 Bump oj from 3.7.9 to 3.7.10 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.9 to 3.7.10.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.9...v3.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 19:25:55 +00:00
Kristina Lim
3ab00d862e Create subscriptions with set up shipping methods 
The shipping methods are updated to their target settings after the
subscription order has been created, so the order is created with the
"require_ship_address" factory default which is "true".

The shipping method setting at time of order creation has implications
on whether a shipment is set up for the order or not.
 2019-03-15 03:15:55 +08:00
Kristina Lim
ba100a6522 Specify order addresses in some OrderSyncer specs 
This is to check that we are using the correct address data in
assertions.

This also clarifies the scenario for one of the specs.
 2019-03-15 03:15:55 +08:00
Kristina Lim
7200e2c2c2 Specify hub address in some OrderSyncer specs 
This fixes some assertions from using the same subscription shipping and
billing addresses, and distributor address.

One of the specs also pass because the subscription shipping address
matches the distributor address. This commit makes that scenario
clearer.
 2019-03-15 03:15:55 +08:00
Kristina Lim
ad935e8d66 Require spec_helper.rb for OrderSyncer specs 2019-03-15 03:15:54 +08:00