Revision: 5656
Author: [email protected]
Date: Tue Jan 7 22:36:32 2014 UTC
Log: tweak for domado-special viewport-dependent tests (merge from
trunk)
svn merge -c 5655 https://google-caja.googlecode.com/svn/trunk/
domado-special has a few tests that rely on the guest content being
larger than the guest viewport, and deleting the history-sniff
tests made the content sometimes smaller than the viewport.
So this change reduces the viewport size.
This fixes
https://code.google.com/p/google-caja/issues/detail?id=1874
http://code.google.com/p/google-caja/source/detail?r=5656
Modified:
/branches/es53
/branches/es53/tests/com/google/caja/plugin/test-domado-special-guest.html
/branches/es53/tests/com/google/caja/plugin/test-domado-special-initial-state.html
=======================================
---
/branches/es53/tests/com/google/caja/plugin/test-domado-special-guest.html
Thu Nov 28 03:46:43 2013 UTC
+++
/branches/es53/tests/com/google/caja/plugin/test-domado-special-guest.html
Tue Jan 7 22:36:32 2014 UTC
@@ -301,6 +301,10 @@
});
</script>
+<p>testResizing and testScrolling need a little extra content to work as
+intended. Here's a little extra content. TODO(kpreid): make this less
fragile,
+move to a separate test file.</p>
+
<p id="testResizing" class="testcontainer">Resizing</p>
<script type="text/javascript">
jsunitRegister('testResizing',
@@ -335,19 +339,19 @@
return w;
}
- assertEquals('initial scrollable dimensions', '600,400', windowDims());
+ assertEquals('initial scrollable dimensions', '600,300', windowDims());
assertEquals('initial width', 600, windowStyleWidth());
window.resizeBy(0, 0);
- assertEquals('scrollable dimensions 1', '600,400', windowDims());
+ assertEquals('scrollable dimensions 1', '600,300', windowDims());
assertEquals('width 1', 600, windowStyleWidth());
- window.resizeBy(-100, 200);
- assertEquals('scrollable dimensions 2', '500,600', windowDims());
+ window.resizeBy(-100, 123);
+ assertEquals('scrollable dimensions 2', '500,423', windowDims());
assertEquals('width 2', 500, windowStyleWidth());
- document.defaultView.resizeTo(600, 400);
- assertEquals('scrollable dimensions 3', '600,400', windowDims());
+ document.defaultView.resizeTo(600, 300);
+ assertEquals('scrollable dimensions 3', '600,300', windowDims());
assertEquals('width 3', 600, windowStyleWidth());
pass('testResizing');
=======================================
---
/branches/es53/tests/com/google/caja/plugin/test-domado-special-initial-state.html
Thu Nov 28 03:46:43 2013 UTC
+++
/branches/es53/tests/com/google/caja/plugin/test-domado-special-initial-state.html
Tue Jan 7 22:36:32 2014 UTC
@@ -31,7 +31,7 @@
title="<Untrusted Content Title>"
style="position: relative;
width: 600px;
- height: 400px;
+ height: 300px;
color: rgb(3,6,9);
cursor: crosshair;
/* on IE, width and height aren't limited for overflow: visible */
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
