raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prevent-blank-open-street-map

Browse Source
This commit is contained in:
Cillian O'Ruanaidh
2020-07-24 16:00:37 +01:00
parent cc317bc8c9 6cc91d457e
commit 702669e61c
401 changed files with 10508 additions and 3119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee
View File

@@ -63,3 +63,14 @@ describe "ordersCtrl", ->
expect(Orders.index).toHaveBeenCalledWith(jasmine.objectContaining({
'q[order_cycle_id_in][]': ['4', '5']
}))
it "filters orders on inclusive dates", ->
$scope['q']['completed_at_gteq'] = '2020-06-08'
$scope['q']['completed_at_lteq'] = '2020-06-09'
$scope.fetchResults()
expect(Orders.index).toHaveBeenCalledWith(jasmine.objectContaining({
'q[completed_at_gteq]': '2020-06-08 00:00:00'
'q[completed_at_lteq]': '2020-06-09 23:59:59'
}))

2
spec/javascripts/unit/darkswarm/services/products_spec.js.coffee
View File

@@ -107,7 +107,7 @@ describe 'Products service', ->
$httpBackend.expectGET(endpoint).respond([product])
$httpBackend.flush()
expect(Products.products[0].primaryImage).toBeUndefined()
expect(Products.products[0].primaryImageOrMissing).toEqual "/assets/noimage/small.png"
expect(Products.products[0].primaryImageOrMissing).toEqual "/noimage/small.png"
it "sets largeImage", ->
$httpBackend.expectGET(endpoint).respond([productWithImage])