github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

lint files

Browse Source
This commit is contained in:
Sam
2018-07-24 10:57:16 +10:00
parent dd9d815178
commit 95720e3873
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
View File

@ -77,7 +77,9 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
if (!category.get("parent_category_id")) { if (!category.get("parent_category_id")) {
category.set("position", position++); category.set("position", position++);
(subcategories[category.get("id")] || []).forEach(subcategory => subcategory.set("position", position++)); (subcategories[category.get("id")] || []).forEach(subcategory =>
subcategory.set("position", position++)
);
} }
} }

40
test/javascripts/controllers/reorder-categories-test.js.es6
View File

@ -21,9 +21,11 @@ QUnit.test("fixIndices set unique position number", function(assert) {
reorderCategoriesController.fixIndices(); reorderCategoriesController.fixIndices();
reorderCategoriesController.get("categoriesOrdered").forEach((category, index) => { reorderCategoriesController
assert.equal(category.get("position"), index); .get("categoriesOrdered")
}); .forEach((category, index) => {
assert.equal(category.get("position"), index);
});
}); });
QUnit.test( QUnit.test(
@ -31,10 +33,28 @@ QUnit.test(
function(assert) { function(assert) {
const store = createStore(); const store = createStore();
const parent = store.createRecord("category", { id: 1, position: 1, slug: "parent" }); const parent = store.createRecord("category", {
const child1 = store.createRecord("category", { id: 2, position: 3, slug: "child1", parent_category_id: 1 }); id: 1,
const child2 = store.createRecord("category", { id: 3, position: 0, slug: "child2", parent_category_id: 1 }); position: 1,
const other = store.createRecord("category", { id: 4, position: 2, slug: "other" }); slug: "parent"
});
const child1 = store.createRecord("category", {
id: 2,
position: 3,
slug: "child1",
parent_category_id: 1
});
const child2 = store.createRecord("category", {
id: 3,
position: 0,
slug: "child2",
parent_category_id: 1
});
const other = store.createRecord("category", {
id: 4,
position: 2,
slug: "other"
});
const categories = [child2, parent, other, child1]; const categories = [child2, parent, other, child1];
const expectedOrderSlugs = ["parent", "child2", "child1", "other"]; const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
@ -44,7 +64,9 @@ QUnit.test(
reorderCategoriesController.fixIndices(); reorderCategoriesController.fixIndices();
assert.deepEqual(reorderCategoriesController.get("categoriesOrdered").mapBy("slug"), expectedOrderSlugs); assert.deepEqual(
reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
expectedOrderSlugs
);
} }
); );