diff options
| -rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/tests/test.js | 32 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/js-unit-tests.html | 16 |
2 files changed, 28 insertions, 20 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/tests/test.js b/bitbake/lib/toaster/toastergui/static/js/tests/test.js index f0df6e4ac1..aac0ba60a2 100644 --- a/bitbake/lib/toaster/toastergui/static/js/tests/test.js +++ b/bitbake/lib/toaster/toastergui/static/js/tests/test.js @@ -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); }); }); - - - - - - diff --git a/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html b/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html index 5b8fd84470..8d65f33cb1 100644 --- a/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html +++ b/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html @@ -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> -{% endblock %} - +<!-- 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 %} |