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

BPUR: match product supplier on clone

Browse Source
This commit is contained in:
Rob H
2013-06-26 22:42:59 +05:30
committed by Rohan Mitchell
parent c826b18584
commit 19fbbb8374
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/bulk_product_update.js
View File

@@ -224,6 +224,7 @@ productsApp.controller('AdminBulkProductsCtrl', function($scope, $timeout, $http
var id = data.product.id;
dataFetcher("/admin/products/bulk_index.json?q[id_eq]="+id).then(function(data){
var newProduct = data[0];
$scope.matchSupplier(newProduct);
$scope.products.push(newProduct);
});
});

2
spec/features/admin/bulk_product_update_spec.rb
View File

@@ -384,11 +384,13 @@ feature %q{
page.should have_selector "a.clone-product", :count => 4
page.should have_field "product_name", with: "COPY OF #{p1.name}"
page.should have_select "supplier", selected: "#{p1.supplier.name}"
visit '/admin/products/bulk_edit'
page.should have_selector "a.clone-product", :count => 4
page.should have_field "product_name", with: "COPY OF #{p1.name}"
page.should have_select "supplier", selected: "#{p1.supplier.name}"
end
end
end

10
spec/javascripts/unit/bulk_product_update_spec.js
View File

@@ -428,13 +428,15 @@ describe("AdminBulkProductsCtrl", function(){
httpBackend.flush();
});
it("adds the newly created product to scope.products", function(){
it("adds the newly created product to scope.products and matches supplier", function(){
spyOn(scope, "matchSupplier").andCallThrough();
scope.products = [ { id: 13, permalink_live: "oranges" } ];
httpBackend.expectGET('/admin/products/oranges/clone.json').respond(200, { product: { id: 17, name: "new_product", variants: [ { id: 3, name: "V1" } ] } } );
httpBackend.expectGET('/admin/products/bulk_index.json?q[id_eq]=17').respond(200, [ { id: 17, name: "new_product", variants: [ { id: 3, name: "V1" } ] } ] );
httpBackend.expectGET('/admin/products/oranges/clone.json').respond(200, { product: { id: 17, name: "new_product", supplier: { id: 6 }, variants: [ { id: 3, name: "V1" } ] } } );
httpBackend.expectGET('/admin/products/bulk_index.json?q[id_eq]=17').respond(200, [ { id: 17, name: "new_product", supplier: { id: 6 }, variants: [ { id: 3, name: "V1" } ] } ] );
scope.cloneProduct(scope.products[0]);
httpBackend.flush();
expect(scope.products).toEqual( [ { id: 13, permalink_live: "oranges" }, { id: 17, name: "new_product", variants: [ { id: 3, name: "V1" } ] } ] );
expect(scope.matchSupplier).toHaveBeenCalledWith( { id: 17, name: "new_product", supplier: { id: 6 }, variants: [ { id: 3, name: "V1" } ] } );
expect(scope.products).toEqual( [ { id: 13, permalink_live: "oranges" }, { id: 17, name: "new_product", supplier: { id: 6 }, variants: [ { id: 3, name: "V1" } ] } ] );
});
});
});