raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bulk products edit page , part 1

Browse Source
This commit is contained in:
Gaetan Craig-Riou
2024-07-12 11:02:16 +10:00
parent 94030527a4
commit e8234ee4a0
9 changed files with 168 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
spec/javascripts/services/option_value_namer_test.js
View File

@@ -2,7 +2,7 @@
* @jest-environment jsdom
*/
import OptionValueNamer from "../../../app/webpacker/js/services/option_value_namer";
import OptionValueNamer from "js/services/option_value_namer";
describe("OptionValueNamer", () => {
beforeAll(() => {
@@ -53,14 +53,12 @@ describe("OptionValueNamer", () => {
});
describe("determining if a variant's value is scaled", function() {
var p;
beforeEach(function() {
p = {};
v = { product: p };
v = {};
namer = new OptionValueNamer(v);
});
it("returns true when the product has a scale", function() {
p.variant_unit_scale = 1000;
v.variant_unit_scale = 1000;
expect(namer.value_scaled()).toBe(true);
});
it("returns false otherwise", function() {
@@ -69,7 +67,7 @@ describe("OptionValueNamer", () => {
});
describe("generating option value's value and unit", function() {
var v, p, namer;
var v, namer;
// Mock I18n. TODO: moved to a shared helper
beforeAll(() => {
@@ -84,40 +82,39 @@ describe("OptionValueNamer", () => {
})
beforeEach(function() {
p = {};
v = { product: p };
v = {};
namer = new OptionValueNamer(v);
});
it("generates simple values", function() {
p.variant_unit = 'weight';
p.variant_unit_scale = 1.0;
v.variant_unit = 'weight';
v.variant_unit_scale = 1.0;
v.unit_value = 100;
expect(namer.option_value_value_unit()).toEqual([100, 'g']);
});
it("generates values when unit value is non-integer", function() {
p.variant_unit = 'weight';
p.variant_unit_scale = 1.0;
v.variant_unit = 'weight';
v.variant_unit_scale = 1.0;
v.unit_value = 123.45;
expect(namer.option_value_value_unit()).toEqual([123.45, 'g']);
});
it("returns a value of 1 when unit value equals the scale", function() {
p.variant_unit = 'weight';
p.variant_unit_scale = 1000.0;
v.variant_unit = 'weight';
v.variant_unit_scale = 1000.0;
v.unit_value = 1000.0;
expect(namer.option_value_value_unit()).toEqual([1, 'kg']);
});
it("generates values for all weight scales", function() {
[[1.0, 'g'], [1000.0, 'kg'], [1000000.0, 'T']].forEach(([scale, unit]) => {
p.variant_unit = 'weight';
p.variant_unit_scale = scale;
v.variant_unit = 'weight';
v.variant_unit_scale = scale;
v.unit_value = 100 * scale;
expect(namer.option_value_value_unit()).toEqual([100, unit]);
});
});
it("generates values for all volume scales", function() {
[[0.001, 'mL'], [1.0, 'L'], [1000.0, 'kL']].forEach(([scale, unit]) => {
p.variant_unit = 'volume';
p.variant_unit_scale = scale;
v.variant_unit = 'volume';
v.variant_unit_scale = scale;
v.unit_value = 100 * scale;
expect(namer.option_value_value_unit()).toEqual([100, unit]);
});
@@ -125,14 +122,14 @@ describe("OptionValueNamer", () => {
it("generates right values for volume with rounded values", function() {
var unit;
unit = 'L';
p.variant_unit = 'volume';
p.variant_unit_scale = 1.0;
v.variant_unit = 'volume';
v.variant_unit_scale = 1.0;
v.unit_value = 0.7;
expect(namer.option_value_value_unit()).toEqual([700, 'mL']);
});
it("chooses the correct scale when value is very small", function() {
p.variant_unit = 'volume';
p.variant_unit_scale = 0.001;
v.variant_unit = 'volume';
v.variant_unit_scale = 0.001;
v.unit_value = 0.0001;
expect(namer.option_value_value_unit()).toEqual([0.1, 'mL']);
});
@@ -145,16 +142,16 @@ describe("OptionValueNamer", () => {
// subject.option_value_value_unit.should == [100, unit.pluralize]
});
it("generates singular values for item units when value is 1", function() {
p.variant_unit = 'items';
p.variant_unit_scale = null;
p.variant_unit_name = 'packet';
v.variant_unit = 'items';
v.variant_unit_scale = null;
v.variant_unit_name = 'packet';
v.unit_value = 1;
expect(namer.option_value_value_unit()).toEqual([1, 'packet']);
});
it("returns [null, null] when unit value is not set", function() {
p.variant_unit = 'items';
p.variant_unit_scale = null;
p.variant_unit_name = 'foo';
v.variant_unit = 'items';
v.variant_unit_scale = null;
v.variant_unit_name = 'foo';
v.unit_value = null;
expect(namer.option_value_value_unit()).toEqual([null, null]);
});

56
spec/javascripts/stimulus/product_controller_test.js
View File

@@ -1,56 +0,0 @@
/**
* @jest-environment jsdom
*/
import { Application } from "stimulus";
import product_controller from "../../../app/webpacker/controllers/product_controller";
describe("ProductController", () => {
beforeAll(() => {
const application = Application.start();
application.register("product", product_controller);
});
describe("variant_unit_with_scale", () => {
beforeEach(() => {
document.body.innerHTML = `
<div data-controller="product">
<input id="variant_unit" name="[products][0][variant_unit]" value="weight">
<input id="variant_unit_scale" name="[products][0][variant_unit_scale]" value="1.0">
<select id="variant_unit_with_scale" name="[products][0][variant_unit_with_scale]">
<option selected="selected" value="weight_1">Weight (g)</option>
<option value="weight_1000">Weight (kg)</option>
<option value="volume_4.54609">Volume (gal)</option>
<option value="items">Items</option>
</select>
</div>
`;
});
describe("change", () => {
it("weight_1000", () => {
variant_unit_with_scale.selectedIndex = 1;
variant_unit_with_scale.dispatchEvent(new Event("change"));
expect(variant_unit.value).toBe("weight");
expect(variant_unit_scale.value).toBe("1000");
});
it("volume_4.54609", () => {
variant_unit_with_scale.selectedIndex = 2;
variant_unit_with_scale.dispatchEvent(new Event("change"));
expect(variant_unit.value).toBe("volume");
expect(variant_unit_scale.value).toBe("4.54609");
});
it("items", () => {
variant_unit_with_scale.selectedIndex = 3;
variant_unit_with_scale.dispatchEvent(new Event("change"));
expect(variant_unit.value).toBe("items");
expect(variant_unit_scale.value).toBe("");
});
})
});
});

87
spec/javascripts/stimulus/variant_controller_test.js Normal file
View File

@@ -0,0 +1,87 @@
/**
* @jest-environment jsdom
*/
import { Application } from "stimulus";
import variant_controller from "controllers/variant_controller";
describe("VariantController", () => {
beforeAll(() => {
// Requires global var from page
global.ofn_available_units_sorted = {
"weight": {
"1.0":{"name":"g","system":"metric"},
"1000.0":{"name":"kg","system":"metric"},
"1000000.0":{"name":"T","system":"metric"}
},
"volume":{
"0.001":{"name":"mL","system":"metric"},
"1.0":{"name":"L","system":"metric"},
"4.54609":{"name":"gal","system":"imperial"},
"1000.0":{"name":"kL","system":"metric"}
}
};
const mockedT = jest.fn();
mockedT.mockImplementation((string, opts) => (string + ', ' + JSON.stringify(opts)));
global.I18n = { t: mockedT };
const application = Application.start();
application.register("variant", variant_controller);
});
afterAll(() => {
delete global.I18n;
})
describe("variant_unit_with_scale", () => {
beforeEach(() => {
document.body.innerHTML = `
<div data-controller="variant">
<input id="variant_unit" name="[products][0][variants_attributes][0][variant_unit]" value="weight">
<input id="variant_unit_scale" name="[products][0][variants_attributes][0][variant_unit_scale]" value="1.0">
<select id="variant_unit_with_scale" name="[products][0][variants_attributes][0][variant_unit_with_scale]">
<option selected="selected" value="weight_1">Weight (g)</option>
<option value="weight_1000">Weight (kg)</option>
<option value="volume_4.54609">Volume (gal)</option>
<option value="items">Items</option>
</select>
<input id="variant_unit_name" name="[products][0][variants_attributes][0][variant_unit_name]" type="text" >
<button id="unit_to_display" name="[products][0][variants_attributes][][0][unit_to_display]" type="submit" >2kg</button>
<input id="unit_value" name="[products][0][variants_attributes][0][unit_value]" value="2000.0" >
<input id="unit_description" name="[products][0][variants_attributes][0][unit_description]" >
<input id="unit_value_with_description" name="[products][0][variants_attributes][0][unit_value_with_description]" value="2" type="text" >
<input id="display_as" name="[products][0][variants_attributes][0][display_as]" placeholder="2kg" type="text" >
</div>
`;
});
describe("change", () => {
it("weight_1000", () => {
variant_unit_with_scale.selectedIndex = 1;
variant_unit_with_scale.dispatchEvent(new Event("change"));
expect(variant_unit.value).toBe("weight");
expect(variant_unit_scale.value).toBe("1000");
});
it("volume_4.54609", () => {
variant_unit_with_scale.selectedIndex = 2;
variant_unit_with_scale.dispatchEvent(new Event("change"));
expect(variant_unit.value).toBe("volume");
expect(variant_unit_scale.value).toBe("4.54609");
});
it("items", () => {
variant_unit_with_scale.selectedIndex = 3;
variant_unit_with_scale.dispatchEvent(new Event("change"));
expect(variant_unit.value).toBe("items");
expect(variant_unit_scale.value).toBe("");
});
})
});
});