diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-09-13 16:53:31 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-09-13 16:53:31 +0400 |
commit | 5e405cc1aabdc4f0b4984f380f9f628383595f92 (patch) | |
tree | 35d42949bc3381a43d3ffd16e4ce18cbf2f48131 /tests/javascript | |
parent | 5692b6e9bb23a63899ea664a5a4f5840a622ac5c (diff) |
refs #4996 content JS tests do now run on IE10, latest FF + Chrome + Safari + Opera and on my local phantomjs but not on travis phantomjs
Diffstat (limited to 'tests/javascript')
-rw-r--r-- | tests/javascript/content-fixtures/visibleNodes.html | 14 | ||||
-rw-r--r-- | tests/javascript/index.php | 13 |
2 files changed, 15 insertions, 12 deletions
diff --git a/tests/javascript/content-fixtures/visibleNodes.html b/tests/javascript/content-fixtures/visibleNodes.html index 66b49badaa..61493bf7d2 100644 --- a/tests/javascript/content-fixtures/visibleNodes.html +++ b/tests/javascript/content-fixtures/visibleNodes.html @@ -2,10 +2,10 @@ <div class="assertSize" id="ex2" style="opacity: 0"></div> <div class="assertSize" id="ex3" style="visibility: hidden"></div> <div class="assertSize" id="ex4" style="display: none"></div> -<div class="assertSize" id="ex5" style="width: 0px;"></div> -<div class="assertSize" id="ex6" style="height: 0px;"></div> -<div class="assertSize" id="ex7" style="width: 0px;overflow: hidden;"></div> -<div class="assertSize" id="ex8" style="height: 0px;overflow: hidden;"></div> +<div class="assertSize" id="ex5" style="width: 0px;margin-top: 1px;margin-left: 1px;"></div> +<div class="assertSize" id="ex6" style="height: 0px;margin-left: 1px;margin-left: 1px;"></div> +<div class="assertSize" id="ex7" style="width: 0px;margin-top: 1px;margin-left: 1px;overflow: hidden;"></div> +<div class="assertSize" id="ex8" style="height: 0px;margin-top: 1px;margin-left: 1px;overflow: hidden;"></div> <div id="ex9" style="margin-left: -110px;width: 50px;">Test</div> <div id="ex10" style="margin-left: 1000000px; width: 50px;">Test</div> @@ -18,8 +18,8 @@ <div class="assertSize" style="height: 0px;overflow: hidden;"><div class="assertSize" id="ex17"></div></div> <!-- at least one pixel has to be visible of the element --> -<div id="ex18" style="margin-left: -118px;width: 110px;">Test</div> -<div id="ex19" style="margin-left: -118px; width: 111px;">Test</div> +<div id="ex18" style="margin-left: -110px;width: 110px;">Test</div> +<div id="ex19" style="margin-left: -110px; width: 111px;">Test</div> <!-- positioned absolute --> <div id="ex20" style="height: 20px;width: 20px;position: absolute;left: 1px;top: -19px;"></div> @@ -29,7 +29,7 @@ <div id="ex24" style="height: 20px;width: 20px;position: absolute;left: 1px;top: -20px;"></div> <div id="ex25" style="height: 20px;width: 20px;position: absolute;left: -20px;top: 0px;"></div> -<div id="ex26" style="height: 20px;width: 20px;position: absolute;right: -20px;top: 0px;"></div> +<div id="ex26" style="height: 20px;width: 20px;position: absolute;right: -100px;top: 0px;"></div> <div id="ex27" style="height: 20px;width: 20px;position: absolute;left: 1px;bottom: -20px;"></div> <!-- positioned fixed --> diff --git a/tests/javascript/index.php b/tests/javascript/index.php index 0563fd4e95..40cff99a07 100644 --- a/tests/javascript/index.php +++ b/tests/javascript/index.php @@ -64,10 +64,12 @@ testTrackPageViewAsync(); .hideY { overflow-x: hidden !important; } - .ie #contenttest { - position: relative; - margin-left: 8px; - margin-right: 8px; + #contenttest { + position: absolute; + left: 0px; + right: 0px; + top: 0px; + bottom: 0px; } </style> <script src="../../libs/jquery/jquery.js" type="text/javascript"></script> @@ -1259,7 +1261,6 @@ function PiwikTest() { assertInternalNodeNotVisible(_ex(16), 'parent is hidden via width:0, overflow is hidden'); assertInternalNodeNotVisible(_ex(17), 'parent is hidden via height:0, overflow is hidden'); - assertInternalNodeVisible(_ex(18), 'element is visible by 0px'); assertNodeNotInViewport(_ex(18), 'element is not visible, ends directly at left:0px'); assertInternalNodeVisible(_ex(19), 'element is visible by one px'); @@ -1280,6 +1281,7 @@ function PiwikTest() { assertNodeIsInViewport(_ex(31), 'element is position fixed and partially visible bottom'); assertNodeNotInViewport(_ex(32), 'element is position fixed and position too far top'); assertNodeNotInViewport(_ex(33), 'element is position fixed and position too far left'); + assertNodeNotInViewport(_ex(34), 'element is position fixed and position too far right'); assertNodeNotInViewport(_ex(35), 'element is position fixed and position too far bottom'); @@ -2452,6 +2454,7 @@ if ($sqlite) { ok(true, "request.setup"); deleteCookies(); + wait(500); ok(document.cookie === "", "deleteCookies"); }, teardown: function () { |