fix pagetree tests

texastribune · Apr 5, 2016 · accde63 · accde63
1 parent b24e4d0
commit accde63
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/cms/static/cms/css/cms.pagetree.css b/cms/static/cms/css/cms.pagetree.css
diff --git a/cms/static/cms/js/dist/bundle.admin.pagetree.min.js b/cms/static/cms/js/dist/bundle.admin.pagetree.min.js
diff --git a/cms/static/cms/sass/components/_pagetree.scss b/cms/static/cms/sass/components/_pagetree.scss
@@ -71,6 +71,9 @@
         background-color: $white;
     }
 }
+.cms-admin-sideframe .cms-pagetree-header {
+    margin-top: -25px;
+}
 
 .cms-pagetree-header-title {
     padding-top: 6px;

diff --git a/cms/templates/admin/cms/page/tree/base.html b/cms/templates/admin/cms/page/tree/base.html
@@ -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/",

diff --git a/cms/tests/frontend/integration/helpers/cms.js b/cms/tests/frontend/integration/helpers/cms.js
@@ -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 () {

diff --git a/cms/tests/frontend/integration/pagetree.js b/cms/tests/frontend/integration/pagetree.js