diff --git a/test/unit/common.js b/test/unit/common.js index 14bff1b..8a2f42e 100644 --- a/test/unit/common.js +++ b/test/unit/common.js @@ -275,6 +275,13 @@ test("should not wrap buttons when parent has position:absolute (except ie7)", function () { + + //skip this for: ie7 + bootstrap + popup + if($.browser.msie && parseInt($.browser.version, 10) <= 8 && $.fn.editable.defaults.mode === 'popup' && $.fn.editableContainer.Popup.prototype.containerName === 'popover') { + expect(0); + return; + } + var d = $('<div style="position: absolute; top: 200px">').appendTo(fx), e = $('<a href="#" data-pk="1" data-url="post.php" data-name="text1">abc</a>').appendTo(d).editable({ showbuttons: true diff --git a/test/unit/wysihtml5.js b/test/unit/wysihtml5.js index 971ded6..19fd6bc 100644 --- a/test/unit/wysihtml5.js +++ b/test/unit/wysihtml5.js @@ -8,6 +8,14 @@ $(function () { }); asyncTest("should load correct value and save new entered value", function () { + + //skip test for ie7 as it is not supported by wysihtml5 + if($.browser.msie && parseInt($.browser.version, 10) <= 8) { + expect(0); + start(); + return; + } + var v1 = '<h1>qq</h1><br>qwerty', v2 = '11<h2>werqwr</h2>4353', e = $('<a href="#" data-pk="1" data-url="post.php">'+v1+'</a>').appendTo(fx).editable({