library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Tests: Adjust by actual scroll position, rather than expected

Browse Source 
Ref 1d2df772b4
This commit is contained in:
Richard Gibson 2017-04-29 01:22:55 -04:00
parent c0edd8dc18
commit da533c6acc
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/data/testinit.js
View File

@ -247,7 +247,7 @@ this.testIframe = function( title, fileName, func, wrapper ) {
width: "500px"
} );
// Overcome TestSwarm iframe visibilty quirks
// Try to overcome TestSwarm iframe visibilty quirks
if ( QUnit.isSwarm ) {
$iframe.css( { left: "0" } );
}

23
test/unit/offset.js
View File

@ -554,10 +554,9 @@ QUnit.test( "chaining", function( assert ) {
return props( position === "static" ? 0 : 8192, position === "static" ? 0 : 4096,
512, 256, 1024, 512, 2048, 1024, position,
position !== "fixed" && "documentElement" );
},
viewportScroll = { top: 2, left: 1 };
};
function getExpectations( htmlPos, bodyPos ) {
function getExpectations( htmlPos, bodyPos, scrollTop, scrollLeft ) {
// Initialize data about page elements
var expectations = {
@ -630,8 +629,8 @@ QUnit.test( "chaining", function( assert ) {
if ( props.style === "fixed" &&
( alwaysScrollable || expectations.documentElement.style !== "fixed" ) ) {
offset.top += viewportScroll.top;
offset.left += viewportScroll.left;
offset.top += scrollTop;
offset.left += scrollLeft;
}
} );
@ -639,13 +638,13 @@ QUnit.test( "chaining", function( assert ) {
// Fudge the tests to work around <html>.gBCR() erroneously including margins
if ( /MSIE (?:9|10)\./.test( navigator.userAgent ) ) {
expectations.documentElement.pos.top -= expectations.documentElement.marginTop -
viewportScroll.top;
scrollTop;
expectations.documentElement.offset.top -= expectations.documentElement.marginTop -
viewportScroll.top;
scrollTop;
expectations.documentElement.pos.left -= expectations.documentElement.marginLeft -
viewportScroll.left;
scrollLeft;
expectations.documentElement.offset.left -= expectations.documentElement.marginLeft -
viewportScroll.left;
scrollLeft;
if ( htmlPos !== "static" ) {
delete expectations.documentElement;
delete expectations.body;
@ -663,11 +662,10 @@ QUnit.test( "chaining", function( assert ) {
var label = "nonzero box properties - html." + htmlPos + " body." + bodyPos;
testIframe( label, "offset/boxes.html", function( assert, $, win, doc ) {
// Define expectations at runtime to properly account for scrolling
var scrollTop = win.pageYOffset,
scrollLeft = win.pageXOffset,
// Define expectations at runtime so alwaysScrollable is correct
expectations = getExpectations( htmlPos, bodyPos );
expectations = getExpectations( htmlPos, bodyPos, scrollTop, scrollLeft );
assert.expect( 1 + 3 * Object.keys( expectations ).length );
@ -682,6 +680,7 @@ QUnit.test( "chaining", function( assert ) {
fixedRect = fixed.getBoundingClientRect();
assert.ok( "CI debug", JSON.stringify(
{
isSwarm: QUnit.isSwarm,
alwaysScrollable: alwaysScrollable,
"original scroll": [ scrollTop, scrollLeft ],
"scroll": [ win.pageYOffset, win.pageXOffset ],