raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,379 Commits 18 Branches 452 Tags
872cfcfc5889a01dd58cf40200fc94de8c7ea630
Commit Graph

6112 Commits

Author SHA1 Message Date
Luis Ramos
7313e3c096 Merge pull request #5501 from luisramos0/grumpy_cat_take_2 
Enterprises Controller: reset_distributor must be called before any call to memoized current_distributor
 2020-05-26 23:06:59 +01:00
Luis Ramos
52810b0f4a Make enterprises controller spec assert the corrrect state of current_distributor 
This validates bug #5496 is fixed
 2020-05-26 11:26:20 +01:00
Luis Ramos
4026e072d5 Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor 2020-05-26 11:13:16 +01:00
Steve Roberts
2bb3cf1c54 Name checkbox element id var more informatively 2020-05-26 09:53:51 +10:00
Luis Ramos
cb0aefd29c Make display on attribute available for managers to change, not just super admins 2020-05-25 11:21:53 +01:00
François Turbelin
b2b988b063 Apply new order directly inside service 2020-05-24 14:41:40 +02:00
Luis Ramos
f34f693620 Merge branch 'master' into 3-0-stable-may-22 2020-05-22 22:54:19 +01:00
Pau Pérez Fabregat
3f593d6246 Merge pull request #5440 from luisramos0/grumpy_cat 
Fix Grumpy Cat on shop page (cart with items from a closed OC)
 2020-05-22 18:38:41 +02:00
Pau Pérez Fabregat
72399cb6df Merge pull request #5485 from luisramos0/byeby_phantom_js 
Rename method refering to phantomjs
 2020-05-22 18:37:28 +02:00
Luis Ramos
9a71ffc093 Merge pull request #5438 from Matt-Yorkley/cart-stock-ux 
Cart stock UX
 2020-05-22 14:21:16 +01:00
Matt-Yorkley
f0525b861c Update expectations in API caching test 
Rails 4 has slightly changed the format of the cache keys here, so the response was not as expected.
 2020-05-22 14:54:57 +02:00
Pau Perez
e339a37cd5 Allow to create order_cycle_schedules 
There's no way we can create an order_cycle_schedules if the schedule
doesn't have an id, which we can't get if to persist it we need an OC
first, which in turn, will create an order_cycle_schedules.
 2020-05-22 14:22:31 +02:00
Matt-Yorkley
b00fbd69ae Update Fragment Caching for Rails 4 
Rails 4 introduced "automagically" modified cache keys, that included a digest in the key on any cache entry related to views. This is not what we want at all, fixed here with the `skip_digest: true` option.
 2020-05-22 14:22:21 +02:00
Matt-Yorkley
a9abe48ede Re-enable cache invalidation test 2020-05-22 14:21:45 +02:00
Matt-Yorkley
04ffe7b911 Fix expectations and mock responses for Rails 4 
Mocking these objects is working differently in Rails 4, and utilising `#and_call_original` helped to ensure different parts of the codebase were receiving the correct response objects (AR relations, etc).
 2020-05-22 14:21:45 +02:00
Luis Ramos
639c1e1ccc Rename method, it's not phantomjs running underneath any more 2020-05-22 10:57:51 +01:00
Pau Pérez Fabregat
050e83e745 Merge pull request #5410 from luisramos0/fix_some_specs 
[Spree 2] Make api/enterprises_controller_spec less flaky
 2020-05-21 13:45:39 +02:00
Luis Ramos
2ae34d8df3 Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page 
change shop name to be link to shop on transactions page
 2020-05-21 10:56:19 +01:00
Maikel
da55956a6e Merge pull request #5392 from luisramos0/ship_method_bo 
Make "backoffice only" ship methods work and remove option "frontoffice only"
 2020-05-21 10:16:15 +10:00
Luis Ramos
e287680c1b Merge pull request #5429 from mkllnk/5400-orders-distributors-report 
5400 List each order only once in Orders And Distributors report
 2020-05-20 20:36:58 +01:00
Matt-Yorkley
6b3a7228ce Update flash message with instruction to update the quantities 2020-05-20 09:43:29 +02:00
Luis Ramos
76b721b663 Merge pull request #5457 from Matt-Yorkley/cart-fix 
Fix cart fields sharing same scope
 2020-05-19 19:31:49 +01:00
Luis Ramos
758d7c82f7 Rename order_cycle.accessible_by to remove name clash with active record 2020-05-19 12:21:13 +01:00
Matt-Yorkley
05e6f5792d Fix cart fields sharing same scope 
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
 2020-05-19 10:23:12 +02:00
Matt-Yorkley
e54fad9bfd Add spec for maximum quantities with multiple items in cart 
This currently fails
 2020-05-19 10:21:24 +02:00
Steve Roberts
446bf268b4 scroll_to substitute 2020-05-19 14:16:45 +10:00
Maikel Linke
2d95e9ebc0 List each order only once in report 2020-05-19 10:38:28 +10:00
Maikel Linke
19f7f04816 Add spec for report bug 2020-05-19 10:38:28 +10:00
Maikel Linke
359fd1ac98 Improve readability of report spec 2020-05-19 10:38:28 +10:00
Steve Roberts
049b1b4638 Split up the specs again. 
This now shows that there is one consistent spec erroring, spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb:
Capybara::ElementNotFound:
       Unable to find visible checkbox "order_cycle_incoming_exchange_0_select_all_variants" that is not disabled
 2020-05-19 10:14:26 +10:00
Matt-Yorkley
fe27c8466e Add feature specs for full cart page stock correction process 2020-05-18 14:51:11 +02:00
Luis Ramos
6c81c19f00 Remove dead code 2020-05-16 14:19:25 +01:00
Luis Ramos
ace73be4e2 Add unit tests to order_cart_reset 2020-05-15 20:05:45 +01:00
Luis Ramos
f22eae752d Adapt spec to validate issue #5340 2020-05-15 19:30:01 +01:00
Luis Ramos
35824c7aa1 Rename restartCheckout to order_checkout_restart to make it follow service naming convention 2020-05-15 19:29:37 +01:00
Luis Ramos
ba585064e1 Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders 2020-05-15 19:29:37 +01:00
Luis Ramos
493adc8b1f Fix problem in spec where wrong enterprise was being used 2020-05-15 19:29:37 +01:00
David Cook
b4228e8cdd 5299 Remove unnecessary comments 2020-05-15 15:11:26 +10:00
David Cook
79df4868de 5299: Unit and feature test for filtering by multiple order cycles 2020-05-15 15:04:01 +10:00
Pau Perez
403e1d317d Make JobLogger spec more reliable 
This will hopefully fix our bild. I believe that the underlying issue is
that the logger's test double gets leaked into other examples, as RSpec
tells when running `spec/jobs/` specs.

```
5) SubscriptionPlacementJob performing the job when unplaced proxy_orders exist processes placeable proxy_orders
     Failure/Error: JobLogger.logger.info("Placing Order for Proxy Order #{proxy_order.id}")
       #<InstanceDouble(Logger) (anonymous)> was originally created in one example but has leaked into another example and can no longer be used. rspec-mocks' doubles are designed to only last for one example, and you need to create a new one in each example you wish to use it for.
     # ./app/jobs/subscription_placement_job.rb:31:in `place_order_for'
```
Read more: https://relishapp.com/rspec/rspec-mocks/v/3-4/docs/basics/scope#doubles-cannot-be-reused-in-another-example

For whatever reason the JobLogger keeps its `.logger` being stubbed
after this spec.
 2020-05-14 13:51:57 +02:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2 Merge pull request #5377 from manvil/1782_enterprise_at_same_address 
Handling multiple enterprises at the same location
 2020-05-13 19:31:14 +01:00
Luis Ramos
ef2d7f9485 Merge pull request #5330 from openfoodfoundation/mobile-ux-filters 
[mobile ux] Merge search and filter epic to master
 2020-05-13 08:59:32 +01:00
Luis Ramos
83381ad439 Relax array order verification 2020-05-12 15:46:23 +01:00
Luis Ramos
41645e8351 Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file 
Output logs in Delayed Job's log file
 2020-05-12 10:05:26 +01:00
Matt-Yorkley
ab143ceaed Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report 
Change date displayed on sales_tax reports
 2020-05-11 09:56:38 +02:00
Matt-Yorkley
14d928c39d Fix feature specs where UI has changed 2020-05-10 09:44:11 +02:00
Matt-Yorkley
3ca491683a Merge pull request #5317 from Matt-Yorkley/caching-timed-shops 
[Caching] Timed caching on shops data
 2020-05-09 15:33:26 +02:00
Pau Perez
fa8c1270ce Skip unreliable caching test 
This spec failed two times in a row and it's blocking the release.
 2020-05-08 16:37:30 +02:00
Pau Perez
b99bcc3c12 Make test not depend on response's order 
I'm assuming this is failing in CI due to the order in which the closed
shops are returned.
 2020-05-08 15:56:20 +02:00