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

This commit is contained in:
Cillian O'Ruanaidh
2020-07-24 16:00:37 +01:00
401 changed files with 10508 additions and 3119 deletions

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])