raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

BPUR: Fix final unstable tests, js concurrency etc.

Browse Source
This commit is contained in:
Rob H
2013-06-26 16:45:50 +05:30
committed by Rohan Mitchell
parent ba840124d2
commit f169dcda88
4 changed files with 94 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,7 +301,7 @@ feature %q{
first("a.delete-product").click
page.driver.browser.switch_to.alert.accept
page.should have_selector "a.delete-product"
sleep(0.1) if page.has_selector? "a.delete-product", :count => 3
page.should have_selector "a.delete-product", :count => 2
#page.should have_selector "div.flash.notice", text: "Product has been deleted."

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

@@ -200,21 +200,69 @@ describe("AdminBulkProductsCtrl", function(){
ctrl('AdminBulkProductsCtrl', { $scope: scope } );
}));
it("gets a list of suppliers", function(){
it("gets a list of suppliers and then resets products with a list of data", function(){
httpBackend.expectGET('/enterprises/suppliers.json').respond("list of suppliers");
scope.refreshSuppliers();
httpBackend.expectGET('/admin/products/bulk_index.json').respond("list of products");
spyOn(scope, "resetProducts");
scope.initialiseData();
httpBackend.flush();
expect(scope.suppliers).toEqual("list of suppliers");
});
it("gets a list of products", function(){
httpBackend.expectGET('/admin/products/bulk_index.json').respond("list of products");
scope.refreshProducts();
httpBackend.flush();
expect(scope.products).toEqual("list of products");
expect(scope.resetProducts).toHaveBeenCalledWith("list of products");
});
});
describe("resetting products", function(){
beforeEach(function(){
module('bulk_product_update');
});
beforeEach(inject(function($controller,$rootScope) {
scope = $rootScope.$new();
ctrl = $controller;
ctrl('AdminBulkProductsCtrl', { $scope: scope } );
spyOn(scope, "matchSupplier");
scope.products = {};
scope.resetProducts( [ { id: 1, name: "P1" }, { id: 3, name: "P2" } ] );
}));
it("sets products to the value of 'data'", function(){
expect(scope.products).toEqual( [ { id: 1, name: "P1" }, { id: 3, name: "P2" } ] );
});
it("resets dirtyProducts",function(){
expect(scope.dirtyProducts).toEqual({});
});
it("calls match matchSupplier once for each product", function(){
expect(scope.matchSupplier.calls.length).toEqual(2);
});
});
describe("matching supplier", function(){
beforeEach(function(){
module('bulk_product_update');
});
beforeEach(inject(function($controller,$rootScope) {
scope = $rootScope.$new();
ctrl = $controller;
ctrl('AdminBulkProductsCtrl', { $scope: scope } );
}));
it("changes the supplier of the product to the one which matches it from the suppliers list", function(){
var s1_s = { id: 1, name: "S1" };
var s2_s = { id: 2, name: "S2" };
var s1_p = { id: 1, name: "S1" };
expect(s1_s == s1_p).not.toEqual(true);
scope.suppliers = [ s1_s, s2_s ];
var product = { id: 10, supplier: s1_p };
scope.matchSupplier(product);
expect(product.supplier).toEqual(s1_s);
});
});
describe("getting on_hand counts when products have variants", function(){
var p1, p2, p3;
beforeEach(function(){