Merge pull request #5120 from FinalAngel/feature/unit-tests/cms-struc…

…tureboard CMS Structureboard unit tests
django-cms · Mar 31, 2016 · 4cd9426 · 4cd9426
2 parents eead5e9 + 41894af
commit 4cd9426
Show file tree

Hide file tree

Showing 5 changed files with 760 additions and 6 deletions.
diff --git a/cms/static/cms/js/dist/bundle.toolbar.min.js b/cms/static/cms/js/dist/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.structureboard.js b/cms/static/cms/js/modules/cms.structureboard.js
@@ -175,14 +175,14 @@ var CMS = window.CMS || {};
             // keyboard handling
             // only if there is a structure / content switcher
             if (that.ui.toolbarModeSwitcher.length) {
-                that.ui.doc.on('keydown', function (e) {
+                that.ui.doc.on('keydown.cms.structureboard.switcher', function (e) {
                     // check if we have an important focus
                     var haveFocusedField = document.activeElement !== document.body;
                     if (e.keyCode === CMS.KEYS.SPACE && !haveFocusedField) {
                         e.preventDefault();
                         if (CMS.settings.mode === 'structure') {
                             that.hide();
-                        } else if (CMS.settings.mode === 'edit') {
+                        } else /* istanbul ignore else */ if (CMS.settings.mode === 'edit') {
                             that.show();
                         }
                     }
@@ -394,7 +394,7 @@ var CMS = window.CMS || {};
          * @private
          * @deprecated as of CMS 3.2
          */
-        _resizeBoard: function () {
+        _resizeBoard: /* istanbul ignore next */ function () {
             // calculate placeholder position
             var id = null;
             var area = null;
@@ -558,7 +558,7 @@ var CMS = window.CMS || {};
                     // save original state events
                     var original = $('.cms-plugin-' + that.getId(originalItem));
                     // cancel if item has no settings
-                    if (original.length === 0 || original.data('settings') === null) {
+                    if (original.length === 0 || !original.data('settings')) {
                         return false;
                     }
                     var parent_bounds = $.grep(original.data('settings').plugin_parent_restriction, function (r) {

diff --git a/cms/tests/frontend/.jshintrc b/cms/tests/frontend/.jshintrc
@@ -12,6 +12,8 @@
         "casper",
         "beforeEach",
         "afterEach",
+        "beforeAll",
+        "afterAll",
         "spyOn",
         "spyOnEvent",
         "fixture",

diff --git a/cms/tests/frontend/unit/cms.modal.test.js b/cms/tests/frontend/unit/cms.modal.test.js
@@ -100,6 +100,7 @@ describe('CMS.Modal', function () {
         });
 
         it('throws an error when no url or html options were passed', function () {
+            spyOn(modal, '_loadIframe');
             expect(modal.open.bind(modal)).toThrowError(
                 Error, 'The arguments passed to "open" were invalid.'
             );
@@ -2206,7 +2207,12 @@ describe('CMS.Modal', function () {
 
                 body.on('keydown.cms', function (e) {
                     if (modal.close.calls.count()) {
-                        done();
+                        // have to wait till next frame here
+                        // because Edge is too fast and it cleans up
+                        // the test case _before_ second trigger call finishes
+                        setTimeout(function () {
+                            done();
+                        }, 0);
                     }
                 });