raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

Browse Source 
Conflicts:
	spec/features/admin/bulk_product_update_spec.rb
This commit is contained in:
Rohan Mitchell
2015-05-29 15:08:30 +10:00
parent e5b3736e86 5a43ed2046
commit 952353da8c
18 changed files with 76 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
View File

@@ -61,14 +61,14 @@ describe "BulkProducts service", ->
clonedProduct =
id: 17
spyOn(BulkProducts, "addProducts")
spyOn(BulkProducts, "insertProductAfter")
BulkProducts.products = [originalProduct]
$httpBackend.expectGET("/admin/products/oranges/clone.json").respond 200,
product: clonedProduct
$httpBackend.expectGET("/api/products/17?template=bulk_show").respond 200, clonedProduct
BulkProducts.cloneProduct BulkProducts.products[0]
$httpBackend.flush()
expect(BulkProducts.addProducts).toHaveBeenCalledWith [clonedProduct]
expect(BulkProducts.insertProductAfter).toHaveBeenCalledWith originalProduct, clonedProduct
describe "preparing products", ->