Permalink
Browse files

fix pagetree tests

  • Loading branch information...
FinalAngel committed Apr 5, 2016
1 parent b24e4d0 commit accde6337207898c2d3be43156035c5bd043d908
View
@@ -45,5 +45,6 @@ cms/static/cms/compass_app_log.txt
!cms/static/cms/js/dist
cms/tests/frontend/coverage
node_modules
screenshots
.idea
.better_test.db

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -71,6 +71,9 @@
background-color: $white;
}
}
.cms-admin-sideframe .cms-pagetree-header {
margin-top: -25px;
}
.cms-pagetree-header-title {
padding-top: 6px;
@@ -141,7 +141,7 @@ <h2>{% trans "Main Navigation" %}</h2>
{# INFO: javascript is loaded from cms.pagetree.js #}
{% if cl.get_items or cl.get_items and cl.is_filtered %}
<div class="cms-pagetree cms-pagetree-container">
<div class="js-cms-pagetree" data-json='{
<div class="cms-pagetree-jstree js-cms-pagetree" data-json='{
"urls": {
"tree": "{% url 'admin:get_tree' %}",
"move": "./{id}/move-page/",
@@ -39,7 +39,7 @@ module.exports = function (casperjs) {
var that = this;
return function () {
return this.thenOpen(globals.adminPagesUrl)
.waitUntilVisible('.cms-pagetree [href*="delete"]')
.waitUntilVisible('.cms-pagetree-jstree [href*="delete"]')
.then(that.expandPageTree())
.then(function () {
var pageId;
@@ -48,9 +48,9 @@ module.exports = function (casperjs) {
}
if (pageId) {
this.click('.cms-pagetree [href*="delete"][href*="' + pageId + '"]');
this.click('.cms-pagetree-jstree [href*="delete"][href*="' + pageId + '"]');
} else {
this.click('.cms-pagetree [href*="delete"]'); // first one
this.click('.cms-pagetree-jstree [href*="delete"]'); // first one
}
})
.waitForUrl(/delete/)
@@ -78,7 +78,7 @@ module.exports = function (casperjs) {
if (opts.parent) {
return function () {
return this.wait(1000).thenOpen(globals.adminPagesUrl)
.waitUntilVisible('.cms-pagetree')
.waitUntilVisible('.cms-pagetree-jstree')
.then(that.waitUntilAllAjaxCallsFinish())
.then(that.expandPageTree())
.then(function () {

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit accde63

Please sign in to comment.