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 'master' into redesign

Browse Source
This commit is contained in:
Rohan Mitchell
2015-05-29 17:37:18 +10:00
parent 6f513fee77 952353da8c
commit fee854a3f8
20 changed files with 96 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", ->

2
spec/javascripts/unit/bulk_product_update_spec.js.coffee
View File

@@ -215,6 +215,7 @@ describe "filtering products for submission to database", ->
variant_unit_scale: 1
variant_unit_name: 'loaf'
available_on: available_on
tax_category_id: null
master_attributes:
id: 2
unit_value: 250
@@ -238,6 +239,7 @@ describe "AdminProductEditCtrl", ->
module ($provide)->
$provide.value "producers", []
$provide.value "taxons", []
$provide.value "tax_categories", []
$provide.value 'SpreeApiKey', 'API_KEY'
null