osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DEV: migrate tests to async/await

Browse Source
This commit is contained in:
Maja Komel
2018-07-29 22:51:32 +02:00
parent 176d8ca78d
commit 04baddf731
31 changed files with 1320 additions and 1729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/javascripts/components/categories-admin-dropdown-test.js.es6
+1 -1
View File
@@ -10,7 +10,7 @@ componentTest("default", {
assert.equal(subject.el().find(".d-icon-bars").length, 1);
assert.equal(subject.el().find(".d-icon-caret-down").length, 1);
await subject.expandAwait();
await subject.expand();
assert.equal(subject.rowByValue("create").name(), "New Category");
}
test/javascripts/components/category-chooser-test.js.es6
+2 -2
View File
@@ -30,7 +30,7 @@ componentTest("with excludeCategoryId", {
template: "{{category-chooser excludeCategoryId=2}}",
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.notOk(
this.get("subject")
@@ -44,7 +44,7 @@ componentTest("with scopedCategoryId", {
template: "{{category-chooser scopedCategoryId=2}}",
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
test/javascripts/components/category-selector-test.js.es6
+49 -61
View File
@@ -16,20 +16,18 @@ componentTest("default", {
},
test(assert) {
andThen(() => {
assert.equal(
this.get("subject")
.header()
.value(),
2
);
assert.notOk(
this.get("subject")
.rowByValue(2)
.exists(),
"selected categories are not in the list"
);
});
assert.equal(
this.get("subject")
.header()
.value(),
2
);
assert.notOk(
this.get("subject")
.rowByValue(2)
.exists(),
"selected categories are not in the list"
);
}
});
@@ -41,23 +39,21 @@ componentTest("with blacklist", {
this.set("blacklist", [Category.findById(8)]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.ok(
this.get("subject")
.rowByValue(6)
.exists(),
"not blacklisted categories are in the list"
);
assert.notOk(
this.get("subject")
.rowByValue(8)
.exists(),
"blacklisted categories are not in the list"
);
});
assert.ok(
this.get("subject")
.rowByValue(6)
.exists(),
"not blacklisted categories are in the list"
);
assert.notOk(
this.get("subject")
.rowByValue(8)
.exists(),
"blacklisted categories are not in the list"
);
}
});
@@ -68,39 +64,31 @@ componentTest("interactions", {
this.set("categories", [Category.findById(2), Category.findById(6)]);
},
test(assert) {
this.get("subject")
.expand()
.selectRowByValue(8);
async test(assert) {
await this.get("subject").expand();
await this.get("subject").selectRowByValue(8);
andThen(() => {
assert.equal(
this.get("subject")
.header()
.value(),
"2,6,8",
"it adds the selected category"
);
assert.equal(this.get("categories").length, 3);
});
assert.equal(
this.get("subject")
.header()
.value(),
"2,6,8",
"it adds the selected category"
);
assert.equal(this.get("categories").length, 3);
this.get("subject").expand();
this.get("subject")
.keyboard()
.backspace();
this.get("subject")
.keyboard()
.backspace();
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.header()
.value(),
"2,6",
"it removes the last selected category"
);
assert.equal(this.get("categories").length, 2);
});
await this.get("subject").keyboard("backspace");
await this.get("subject").keyboard("backspace");
assert.equal(
this.get("subject")
.header()
.value(),
"2,6",
"it removes the last selected category"
);
assert.equal(this.get("categories").length, 2);
}
});
test/javascripts/components/combo-box-test.js.es6
+11 -11
View File
@@ -13,7 +13,7 @@ componentTest("default", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -46,7 +46,7 @@ componentTest("with valueAttribute", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -70,7 +70,7 @@ componentTest("with nameProperty", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -94,7 +94,7 @@ componentTest("with an array as content", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -120,7 +120,7 @@ componentTest("with value and none as a string", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -148,7 +148,7 @@ componentTest("with value and none as a string", {
);
assert.equal(this.get("value"), "trout");
await this.get("subject").selectNoneRowAwait();
await this.get("subject").selectNoneRow();
assert.equal(this.get("value"), null);
}
@@ -191,7 +191,7 @@ componentTest("with value and none as an object", {
);
assert.equal(this.get("value"), "evil");
await this.get("subject").selectNoneRowAwait();
await this.get("subject").selectNoneRow();
assert.equal(this.get("value"), null);
}
@@ -207,7 +207,7 @@ componentTest("with no value and none as an object", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -228,7 +228,7 @@ componentTest("with no value and none string", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -247,7 +247,7 @@ componentTest("with no value and no none", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -289,7 +289,7 @@ componentTest("with noneLabel", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
test/javascripts/components/d-editor-test.js.es6
+376 -541
View File
File diff suppressed because it is too large Load Diff
test/javascripts/components/list-setting-test.js.es6
+36 -51
View File
@@ -11,20 +11,18 @@ componentTest("default", {
},
test(assert) {
andThen(() => {
assert.equal(
selectKit()
.header()
.title(),
"bold,italic"
);
assert.equal(
selectKit()
.header()
.value(),
"bold,italic"
);
});
assert.equal(
selectKit()
.header()
.title(),
"bold,italic"
);
assert.equal(
selectKit()
.header()
.value(),
"bold,italic"
);
}
});
@@ -36,14 +34,12 @@ componentTest("with empty string as value", {
},
test(assert) {
andThen(() => {
assert.equal(
selectKit()
.header()
.value(),
""
);
});
assert.equal(
selectKit()
.header()
.value(),
""
);
}
});
@@ -55,14 +51,12 @@ componentTest("with only setting value", {
},
test(assert) {
andThen(() => {
assert.equal(
selectKit()
.header()
.value(),
"bold,italic"
);
});
assert.equal(
selectKit()
.header()
.value(),
"bold,italic"
);
}
});
@@ -74,35 +68,26 @@ componentTest("interactions", {
this.set("choices", ["bold", "italic", "underline"]);
},
test(assert) {
async test(assert) {
const listSetting = selectKit();
listSetting.expand().selectRowByValue("underline");
await listSetting.expand();
await listSetting.selectRowByValue("underline");
andThen(() => {
assert.equal(listSetting.header().value(), "bold,italic,underline");
});
assert.equal(listSetting.header().value(), "bold,italic,underline");
listSetting.expand().fillInFilter("strike");
await listSetting.expand();
await listSetting.fillInFilter("strike");
andThen(() => {
assert.equal(listSetting.highlightedRow().value(), "strike");
});
assert.equal(listSetting.highlightedRow().value(), "strike");
listSetting.keyboard().enter();
await listSetting.keyboard("enter");
andThen(() => {
assert.equal(
listSetting.header().value(),
"bold,italic,underline,strike"
);
});
assert.equal(listSetting.header().value(), "bold,italic,underline,strike");
listSetting.keyboard().backspace();
listSetting.keyboard().backspace();
await listSetting.keyboard("backspace");
await listSetting.keyboard("backspace");
andThen(() => {
assert.equal(listSetting.header().value(), "bold,italic,underline");
});
assert.equal(listSetting.header().value(), "bold,italic,underline");
}
});
test/javascripts/components/multi-select-test.js.es6
+140 -192
View File
@@ -15,14 +15,12 @@ componentTest("with objects and values", {
},
test(assert) {
andThen(() => {
assert.equal(
this.get("subject")
.header()
.value(),
"1,2"
);
});
assert.equal(
this.get("subject")
.header()
.value(),
"1,2"
);
}
});
@@ -34,13 +32,11 @@ componentTest("with title", {
},
test(assert) {
andThen(() =>
assert.equal(
selectKit()
.header()
.title(),
"My title"
)
assert.equal(
selectKit()
.header()
.title(),
"My title"
);
}
});
@@ -58,165 +54,127 @@ componentTest("interactions", {
this.set("values", [1, 2]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"robin",
"it highlights the first content row"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"robin",
"it highlights the first content row"
);
this.set("none", "test.none");
await this.set("none", "test.none");
andThen(() => {
assert.ok(
this.get("subject")
.noneRow()
.exists()
);
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"robin",
"it highlights the first content row"
);
});
assert.ok(
this.get("subject")
.noneRow()
.exists()
);
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"robin",
"it highlights the first content row"
);
this.get("subject").selectRowByValue(3);
this.get("subject").expand();
await this.get("subject").selectRowByValue(3);
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"none",
"it highlights none row if no content"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"none",
"it highlights none row if no content"
);
this.get("subject").fillInFilter("joffrey");
await this.get("subject").fillInFilter("joffrey");
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"joffrey",
"it highlights create row when filling filter"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"joffrey",
"it highlights create row when filling filter"
);
this.get("subject")
.keyboard()
.enter();
await this.get("subject").keyboard("enter");
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"none",
"it highlights none row after creating content and no content left"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.name(),
"none",
"it highlights none row after creating content and no content left"
);
this.get("subject")
.keyboard()
.backspace();
await this.get("subject").keyboard("backspace");
andThen(() => {
const $lastSelectedName = this.get("subject")
.header()
.el()
.find(".selected-name")
.last();
assert.equal($lastSelectedName.attr("data-name"), "joffrey");
assert.ok(
$lastSelectedName.hasClass("is-highlighted"),
"it highlights the last selected name when using backspace"
);
});
const $lastSelectedName = this.get("subject")
.header()
.el()
.find(".selected-name")
.last();
assert.equal($lastSelectedName.attr("data-name"), "joffrey");
assert.ok(
$lastSelectedName.hasClass("is-highlighted"),
"it highlights the last selected name when using backspace"
);
this.get("subject")
.keyboard()
.backspace();
await this.get("subject").keyboard("backspace");
andThen(() => {
const $lastSelectedName = this.get("subject")
.header()
.el()
.find(".selected-name")
.last();
assert.equal(
$lastSelectedName.attr("data-name"),
"robin",
"it removes the previous highlighted selected content"
);
assert.notOk(
this.get("subject")
.rowByValue("joffrey")
.exists(),
"generated content shouldn’t appear in content when removed"
);
});
const $lastSelectedName1 = this.get("subject")
.header()
.el()
.find(".selected-name")
.last();
assert.equal(
$lastSelectedName1.attr("data-name"),
"robin",
"it removes the previous highlighted selected content"
);
assert.notOk(
this.get("subject")
.rowByValue("joffrey")
.exists(),
"generated content shouldn’t appear in content when removed"
);
this.get("subject")
.keyboard()
.selectAll();
await this.get("subject").keyboard("selectAll");
andThen(() => {
const $highlightedSelectedNames = this.get("subject")
.header()
.el()
.find(".selected-name.is-highlighted");
assert.equal(
$highlightedSelectedNames.length,
3,
"it highlights each selected name"
);
});
const $highlightedSelectedNames2 = this.get("subject")
.header()
.el()
.find(".selected-name.is-highlighted");
assert.equal(
$highlightedSelectedNames2.length,
3,
"it highlights each selected name"
);
this.get("subject")
.keyboard()
.backspace();
await this.get("subject").keyboard("backspace");
andThen(() => {
const $selectedNames = this.get("subject")
.header()
.el()
.find(".selected-name");
assert.equal($selectedNames.length, 0, "it removed all selected content");
});
const $selectedNames = this.get("subject")
.header()
.el()
.find(".selected-name");
assert.equal($selectedNames.length, 0, "it removed all selected content");
andThen(() => {
assert.ok(this.get("subject").isFocused());
assert.ok(this.get("subject").isExpanded());
});
assert.ok(this.get("subject").isFocused());
assert.ok(this.get("subject").isExpanded());
this.get("subject")
.keyboard()
.escape();
await this.get("subject").keyboard("escape");
andThen(() => {
assert.ok(this.get("subject").isFocused());
assert.notOk(this.get("subject").isExpanded());
});
assert.ok(this.get("subject").isFocused());
assert.notOk(this.get("subject").isExpanded());
this.get("subject")
.keyboard()
.escape();
await this.get("subject").keyboard("escape");
andThen(() => {
assert.notOk(this.get("subject").isFocused());
assert.notOk(this.get("subject").isExpanded());
});
assert.notOk(this.get("subject").isFocused());
assert.notOk(this.get("subject").isExpanded());
}
});
@@ -227,16 +185,14 @@ componentTest("with limitMatches", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(
this.get("subject")
.el()
.find(".select-kit-row").length,
2
)
assert.equal(
this.get("subject")
.el()
.find(".select-kit-row").length,
2
);
}
});
@@ -248,26 +204,22 @@ componentTest("with minimum", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(
this.get("subject").validationMessage(),
"Select at least 1 item."
)
assert.equal(
this.get("subject").validationMessage(),
"Select at least 1 item."
);
this.get("subject").selectRowByValue("sam");
await this.get("subject").selectRowByValue("sam");
andThen(() => {
assert.equal(
this.get("subject")
.header()
.label(),
"sam"
);
});
assert.equal(
this.get("subject")
.header()
.label(),
"sam"
);
}
});
@@ -280,22 +232,18 @@ componentTest("with minimumLabel", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(this.get("subject").validationMessage(), "min 1")
assert.equal(this.get("subject").validationMessage(), "min 1");
await this.get("subject").selectRowByValue("jeff");
assert.equal(
this.get("subject")
.header()
.label(),
"jeff"
);
this.get("subject").selectRowByValue("jeff");
andThen(() => {
assert.equal(
this.get("subject")
.header()
.label(),
"jeff"
);
});
}
});
test/javascripts/components/single-select-test.js.es6
+312 -411
View File
@@ -16,30 +16,24 @@ componentTest("updating the content refreshes the list", {
this.set("content", [{ id: 1, name: "BEFORE" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.rowByValue(1)
.name(),
"BEFORE"
);
});
assert.equal(
this.get("subject")
.rowByValue(1)
.name(),
"BEFORE"
);
andThen(() => {
this.set("content", [{ id: 1, name: "AFTER" }]);
});
await this.set("content", [{ id: 1, name: "AFTER" }]);
andThen(() => {
assert.equal(
this.get("subject")
.rowByValue(1)
.name(),
"AFTER"
);
});
assert.equal(
this.get("subject")
.rowByValue(1)
.name(),
"AFTER"
);
}
});
@@ -51,24 +45,20 @@ componentTest("accepts a value by reference", {
this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"robin",
"it highlights the row corresponding to the value"
);
});
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"robin",
"it highlights the row corresponding to the value"
);
this.get("subject").selectRowByValue(1);
await this.get("subject").selectRowByValue(1);
andThen(() => {
assert.equal(this.get("value"), 1, "it mutates the value");
});
assert.equal(this.get("value"), 1, "it mutates the value");
}
});
@@ -89,69 +79,63 @@ componentTest("no default icon", {
componentTest("default search icon", {
template: "{{single-select filterable=true}}",
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.ok(
exists(
this.get("subject")
.filter()
.icon()
),
"it has an icon"
);
});
assert.ok(
exists(
this.get("subject")
.filter()
.icon()
),
"it has an icon"
);
}
});
componentTest("with no search icon", {
template: "{{single-select filterable=true filterIcon=null}}",
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.notOk(
exists(
this.get("subject")
.filter()
.icon()
),
"it has no icon"
);
});
assert.notOk(
exists(
this.get("subject")
.filter()
.icon()
),
"it has no icon"
);
}
});
componentTest("custom search icon", {
template: '{{single-select filterable=true filterIcon="shower"}}',
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.ok(
this.get("subject")
.filter()
.icon()
.hasClass("d-icon-shower"),
"it has a the correct icon"
);
});
assert.ok(
this.get("subject")
.filter()
.icon()
.hasClass("d-icon-shower"),
"it has a the correct icon"
);
}
});
componentTest("is expandable", {
template: "{{single-select}}",
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => assert.ok(this.get("subject").isExpanded()));
assert.ok(this.get("subject").isExpanded());
this.get("subject").collapse();
await this.get("subject").collapse();
andThen(() => assert.notOk(this.get("subject").isExpanded()));
assert.notOk(this.get("subject").isExpanded());
}
});
@@ -164,17 +148,15 @@ componentTest("accepts custom value/name keys", {
this.set("content", [{ identifier: 1, item: "robin" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"robin"
);
});
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"robin"
);
}
});
@@ -185,14 +167,12 @@ componentTest("doesn’t render collection content before first expand", {
this.set("content", [{ value: 1, name: "robin" }]);
},
test(assert) {
async test(assert) {
assert.notOk(exists(find(".select-kit-collection")));
this.get("subject").expand();
await this.get("subject").expand();
andThen(() => {
assert.ok(exists(find(".select-kit-collection")));
});
assert.ok(exists(find(".select-kit-collection")));
}
});
@@ -203,29 +183,25 @@ componentTest("dynamic headerText", {
this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.header()
.name(),
"robin"
);
});
assert.equal(
this.get("subject")
.header()
.name(),
"robin"
);
this.get("subject").selectRowByValue(2);
await this.get("subject").selectRowByValue(2);
andThen(() => {
assert.equal(
this.get("subject")
.header()
.name(),
"regis",
"it changes header text"
);
});
assert.equal(
this.get("subject")
.header()
.name(),
"regis",
"it changes header text"
);
}
});
@@ -239,19 +215,17 @@ componentTest("supports custom row template", {
});
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.rowByValue(1)
.el()
.html()
.trim(),
"<b>robin</b>"
);
});
assert.equal(
this.get("subject")
.rowByValue(1)
.el()
.html()
.trim(),
"<b>robin</b>"
);
}
});
@@ -266,31 +240,25 @@ componentTest("supports converting select value to integer", {
]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"régis"
)
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"régis"
);
andThen(() => {
this.set("value", 1);
});
await this.set("value", 1);
andThen(() => {
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"robin",
"it works with dynamic content"
);
});
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"robin",
"it works with dynamic content"
);
}
});
@@ -305,31 +273,25 @@ componentTest("supports converting string as boolean to boolean", {
]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"ASC"
)
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"ASC"
);
andThen(() => {
this.set("value", false);
});
await this.set("value", false);
andThen(() => {
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"DESC",
"it works with dynamic content"
);
});
assert.equal(
this.get("subject")
.selectedRow()
.name(),
"DESC",
"it works with dynamic content"
);
}
});
@@ -340,92 +302,68 @@ componentTest("supports keyboard events", {
this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
},
test(assert) {
this.get("subject")
.expand()
.keyboard()
.down();
async test(assert) {
await this.get("subject").expand();
await this.get("subject").keyboard("down");
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.title(),
"regis",
"the next row is highlighted"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.title(),
"regis",
"the next row is highlighted"
);
this.get("subject")
.keyboard()
.down();
await this.get("subject").keyboard("down");
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.title(),
"robin",
"it returns to the first row"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.title(),
"robin",
"it returns to the first row"
);
this.get("subject")
.keyboard()
.up();
await this.get("subject").keyboard("up");
andThen(() => {
assert.equal(
this.get("subject")
.highlightedRow()
.title(),
"regis",
"it highlights the last row"
);
});
assert.equal(
this.get("subject")
.highlightedRow()
.title(),
"regis",
"it highlights the last row"
);
this.get("subject")
.keyboard()
.enter();
await this.get("subject").keyboard("enter");
andThen(() => {
assert.equal(
this.get("subject")
.selectedRow()
.title(),
"regis",
"it selects the row when pressing enter"
);
assert.notOk(
this.get("subject").isExpanded(),
"it collapses the select box when selecting a row"
);
});
assert.equal(
this.get("subject")
.selectedRow()
.title(),
"regis",
"it selects the row when pressing enter"
);
assert.notOk(
this.get("subject").isExpanded(),
"it collapses the select box when selecting a row"
);
this.get("subject")
.expand()
.keyboard()
.escape();
await this.get("subject").expand();
await this.get("subject").keyboard("escape");
andThen(() => {
assert.notOk(
this.get("subject").isExpanded(),
"it collapses the select box"
);
});
assert.notOk(
this.get("subject").isExpanded(),
"it collapses the select box"
);
this.get("subject")
.expand()
.fillInFilter("regis")
.keyboard()
.tab();
await this.get("subject").expand();
await this.get("subject").fillInFilter("regis");
await this.get("subject").keyboard("tab");
andThen(() => {
assert.notOk(
this.get("subject").isExpanded(),
"it collapses the select box when selecting a row"
);
});
assert.notOk(
this.get("subject").isExpanded(),
"it collapses the select box when selecting a row"
);
}
});
@@ -442,13 +380,11 @@ componentTest("with allowInitialValueMutation", {
},
test(assert) {
andThen(() => {
assert.equal(
this.get("value"),
"1",
"it mutates the value on initial rendering"
);
});
assert.equal(
this.get("value"),
"1",
"it mutates the value on initial rendering"
);
}
});
@@ -464,20 +400,18 @@ componentTest("support appending content through plugin api", {
this.set("content", [{ id: "1", name: "robin" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(this.get("subject").rows().length, 2);
assert.equal(
this.get("subject")
.rowByIndex(1)
.name(),
"regis"
);
});
assert.equal(this.get("subject").rows().length, 2);
assert.equal(
this.get("subject")
.rowByIndex(1)
.name(),
"regis"
);
andThen(() => clearCallbacks());
clearCallbacks();
}
});
@@ -500,20 +434,18 @@ componentTest("support modifying content through plugin api", {
]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(this.get("subject").rows().length, 3);
assert.equal(
this.get("subject")
.rowByIndex(1)
.name(),
"sam"
);
});
assert.equal(this.get("subject").rows().length, 3);
assert.equal(
this.get("subject")
.rowByIndex(1)
.name(),
"sam"
);
andThen(() => clearCallbacks());
clearCallbacks();
}
});
@@ -530,20 +462,18 @@ componentTest("support prepending content through plugin api", {
this.set("content", [{ id: "1", name: "robin" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(this.get("subject").rows().length, 2);
assert.equal(
this.get("subject")
.rowByIndex(0)
.name(),
"regis"
);
});
assert.equal(this.get("subject").rows().length, 2);
assert.equal(
this.get("subject")
.rowByIndex(0)
.name(),
"regis"
);
andThen(() => clearCallbacks());
clearCallbacks();
}
});
@@ -561,16 +491,13 @@ componentTest("support modifying on select behavior through plugin api", {
this.set("content", [{ id: "1", name: "robin" }]);
},
test(assert) {
this.get("subject")
.expand()
.selectRowByValue(1);
async test(assert) {
await this.get("subject").expand();
await this.get("subject").selectRowByValue(1);
andThen(() => {
assert.equal(find(".on-select-test").html(), "1");
});
assert.equal(find(".on-select-test").html(), "1");
andThen(() => clearCallbacks());
clearCallbacks();
}
});
@@ -582,30 +509,24 @@ componentTest("with nameChanges", {
this.set("content", [this.get("robin")]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.header()
.name(),
"robin"
);
});
assert.equal(
this.get("subject")
.header()
.name(),
"robin"
);
andThen(() => {
this.set("robin.name", "robin2");
});
await this.set("robin.name", "robin2");
andThen(() => {
assert.equal(
this.get("subject")
.header()
.name(),
"robin2"
);
});
assert.equal(
this.get("subject")
.header()
.name(),
"robin2"
);
}
});
@@ -616,23 +537,21 @@ componentTest("with null value", {
this.set("content", [{ name: "robin" }]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => {
assert.equal(
this.get("subject")
.header()
.name(),
"robin"
);
assert.equal(
this.get("subject")
.header()
.value(),
undefined
);
});
assert.equal(
this.get("subject")
.header()
.name(),
"robin"
);
assert.equal(
this.get("subject")
.header()
.value(),
undefined
);
}
});
@@ -643,10 +562,10 @@ componentTest("with collection header", {
this.set("collectionHeader", "<h2>Hello</h2>");
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() => assert.ok(exists(".collection-header h2")));
assert.ok(exists(".collection-header h2"));
}
});
@@ -658,13 +577,11 @@ componentTest("with title", {
},
test(assert) {
andThen(() =>
assert.equal(
this.get("subject")
.header()
.title(),
"My title"
)
assert.equal(
this.get("subject")
.header()
.title(),
"My title"
);
}
});
@@ -686,16 +603,14 @@ componentTest("support modifying header computed content through plugin api", {
},
test(assert) {
andThen(() => {
assert.equal(
this.get("subject")
.header()
.title(),
"Not so evil"
);
});
assert.equal(
this.get("subject")
.header()
.title(),
"Not so evil"
);
andThen(() => clearCallbacks());
clearCallbacks();
}
});
@@ -706,16 +621,14 @@ componentTest("with limitMatches", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(
this.get("subject")
.el()
.find(".select-kit-row").length,
2
)
assert.equal(
this.get("subject")
.el()
.find(".select-kit-row").length,
2
);
}
});
@@ -728,26 +641,22 @@ componentTest("with minimum", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(
this.get("subject").validationMessage(),
"Select at least 1 item."
)
assert.equal(
this.get("subject").validationMessage(),
"Select at least 1 item."
);
this.get("subject").selectRowByValue("sam");
await this.get("subject").selectRowByValue("sam");
andThen(() => {
assert.equal(
this.get("subject")
.header()
.label(),
"sam"
);
});
assert.equal(
this.get("subject")
.header()
.label(),
"sam"
);
}
});
@@ -760,23 +669,19 @@ componentTest("with minimumLabel", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
async test(assert) {
await this.get("subject").expand();
andThen(() =>
assert.equal(this.get("subject").validationMessage(), "min 1")
assert.equal(this.get("subject").validationMessage(), "min 1");
await this.get("subject").selectRowByValue("jeff");
assert.equal(
this.get("subject")
.header()
.label(),
"jeff"
);
this.get("subject").selectRowByValue("jeff");
andThen(() => {
assert.equal(
this.get("subject")
.header()
.label(),
"jeff"
);
});
}
});
@@ -787,19 +692,17 @@ componentTest("with accents in filter", {
this.set("content", ["sam", "jeff", "neil"]);
},
test(assert) {
this.get("subject").expand();
this.get("subject").fillInFilter("jéff");
async test(assert) {
await this.get("subject").expand();
await this.get("subject").fillInFilter("jéff");
andThen(() => {
assert.equal(this.get("subject").rows().length, 1);
assert.equal(
this.get("subject")
.rowByIndex(0)
.name(),
"jeff"
);
});
assert.equal(this.get("subject").rows().length, 1);
assert.equal(
this.get("subject")
.rowByIndex(0)
.name(),
"jeff"
);
}
});
@@ -810,18 +713,16 @@ componentTest("with accents in content", {
this.set("content", ["sam", "jéff", "neil"]);
},
test(assert) {
this.get("subject").expand();
this.get("subject").fillInFilter("jeff");
async test(assert) {
await this.get("subject").expand();
await this.get("subject").fillInFilter("jeff");
andThen(() => {
assert.equal(this.get("subject").rows().length, 1);
assert.equal(
this.get("subject")
.rowByIndex(0)
.name(),
"jéff"
);
});
assert.equal(this.get("subject").rows().length, 1);
assert.equal(
this.get("subject")
.rowByIndex(0)
.name(),
"jéff"
);
}
});
test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
+2 -2
View File
@@ -22,7 +22,7 @@ componentTest("default", {
},
async test(assert) {
await this.get("subject").expandAwait();
await this.get("subject").expand();
assert.equal(
this.get("subject")
@@ -55,7 +55,7 @@ componentTest("default", {
"it doesn’t preselect first row"
);
await this.get("subject").selectRowByValueAwait("share");
await this.get("subject").selectRowByValue("share");
assert.equal(this.get("value"), null, "it resets the value");
}
test/javascripts/components/topic-notifications-options-test.js.es6
+2 -2
View File
@@ -33,7 +33,7 @@ componentTest("regular topic notification level descriptions", {
"{{topic-notifications-options value=topic.details.notification_level topic=topic}}",
async test(assert) {
await selectKit().expandAwait();
await selectKit().expand();
await this.set("topic", buildTopic("regular"));
const uiTexts = extractDescs(selectKit().rows());
@@ -59,7 +59,7 @@ componentTest("PM topic notification level descriptions", {
"{{topic-notifications-options value=topic.details.notification_level topic=topic}}",
async test(assert) {
await selectKit().expandAwait();
await selectKit().expand();
await this.set("topic", buildTopic("private_message"));
const uiTexts = extractDescs(selectKit().rows());