sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: Update JS unit tests 

Update JS unit tests.
- Expand the add remove layer check to make sure that the layer is
  actually added to the project.
- Remove some unused vars
- Make sure that the layers/project ids will always exist at the point
  of running the test.
- Add the missing typeahead input fields to the dom to fix the failing
  typeahead test.

(Bitbake rev: 46af40b95f842aa14ef7e3f0d516aef3899d5e42)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood 2015-10-09 10:32:43 +01:00 committed by Richard Purdie
parent ab896df63b
commit 2d6701f190
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bitbake/lib/toaster/toastergui/static/js/tests/test.js
View File

@ -13,8 +13,6 @@ QUnit.test("Layer alert notification", function(assert) {
"name":"meta-example"
};
var correctResponse = "You have added <strong>3</strong> layers to your project: <a id=\"layer-affected-name\" href=\"/toastergui/project/1/layer/22\">meta-example</a> and its dependencies <a href=\"/toastergui/project/1/layer/9\" data-original-title=\"\" title=\"\">meta-example-two</a>, <a href=\"/toastergui/project/1/layer/9\" data-original-title=\"\" title=\"\">meta-example-three</a>";
var layerDepsList = [
{
"layerdetailurl":"/toastergui/project/1/layer/9",
@ -68,9 +66,9 @@ QUnit.test("Show notification", function(assert){
});
var layer = {
"id": 91,
"name": "meta-crystalforest",
"layerdetailurl": "/toastergui/project/4/layer/91"
"id": 1,
"name": "meta-testing",
"layerdetailurl": "/toastergui/project/1/layer/1"
};
QUnit.test("Add layer", function(assert){
@ -84,11 +82,19 @@ QUnit.test("Add layer", function(assert){
}
}, 200);
libtoaster.addRmLayer(layer, true, function(deps){
assert.equal(deps.length, 1);
done();
});
/* Compare the number of layers before and after the add in the project */
libtoaster.getProjectInfo(libtoaster.ctx.projectPageUrl, function(prjInfo){
var origNumLayers = prjInfo.layers.length;
libtoaster.addRmLayer(layer, true, function(deps){
libtoaster.getProjectInfo(libtoaster.ctx.projectPageUrl,
function(prjInfo){
assert.ok(prjInfo.layers.length > origNumLayers,
"Layer not added to project");
done();
});
});
});
});
QUnit.test("Rm layer", function(assert){
@ -156,7 +162,7 @@ QUnit.test("Layer btns init", function(assert){
});
QUnit.test("Table init", function(assert){
assert.throws(tableInit({ url : tableUrl }));
assert.throws(tableInit({ url : ctx.tableUrl }));
});
$(document).ajaxError(function(event, jqxhr, settings, errMsg){
@ -167,9 +173,3 @@ $(document).ajaxError(function(event, jqxhr, settings, errMsg){
assert.notOk(jqxhr.responseText);
});
});

16
bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
View File

@ -22,9 +22,11 @@
<script src="{% static 'js/table.js' %}"></script>
<script>
var tableUrl = '{% url 'projectlayers' project.pk %}';
var ctx = {
tableUrl : '{% url 'projectlayers' project.pk %}',
projectId : {{project.pk}},
}
</script>
<script src="{% static 'js/tests/test.js' %}"></script>
<div id="qunit"></div>
@ -34,6 +36,12 @@
<input type="text" id="projects" placeholder="projects"></input>
<input type="text" id="machines" placeholder="machines"></input>
<!-- import layer dependency input typeahead -->
<input type="text" id="layer-dependency" style="display:none"></input>
<!-- project page input typeaheads -->
<input type="text" id="layer-add-input" style="display:none"></input>
<input type="text" id="machine-change-input" style="display:none"></input>
<!-- import layer dependency input typeahead on layer details edit layer -->
<input type="text" id="layer-dep-input" style="display:none"></input>
{% endblock %}