Commit 5f54cb70 authored by Dave Methvin's avatar Dave Methvin

Merge pull request #448 from rwldrn/9912

Renames duplicate named test block. Fixes #9912
parents dd3662d0 06c41e09
...@@ -11,7 +11,7 @@ test("disconnected node", function() { ...@@ -11,7 +11,7 @@ test("disconnected node", function() {
var supportsScroll = false; var supportsScroll = false;
testoffset("absolute"/* in iframe */, function($, iframe) { testoffset("absolute (in iframe)", function($, iframe) {
expect(4); expect(4);
var doc = iframe.document, tests; var doc = iframe.document, tests;
...@@ -390,7 +390,7 @@ testoffset("scroll", function( jQuery, win ) { ...@@ -390,7 +390,7 @@ testoffset("scroll", function( jQuery, win ) {
equals( jQuery(window).scrollLeft(), 0, "jQuery(window).scrollLeft() other window" ); equals( jQuery(window).scrollLeft(), 0, "jQuery(window).scrollLeft() other window" );
equals( jQuery(document).scrollTop(), 0, "jQuery(window).scrollTop() other document" ); equals( jQuery(document).scrollTop(), 0, "jQuery(window).scrollTop() other document" );
equals( jQuery(document).scrollLeft(), 0, "jQuery(window).scrollLeft() other document" ); equals( jQuery(document).scrollLeft(), 0, "jQuery(window).scrollLeft() other document" );
// Tests scrollTop/Left with empty jquery objects // Tests scrollTop/Left with empty jquery objects
notEqual( jQuery().scrollTop(100), null, "jQuery().scrollTop(100) testing setter on empty jquery object" ); notEqual( jQuery().scrollTop(100), null, "jQuery().scrollTop(100) testing setter on empty jquery object" );
notEqual( jQuery().scrollLeft(100), null, "jQuery().scrollLeft(100) testing setter on empty jquery object" ); notEqual( jQuery().scrollLeft(100), null, "jQuery().scrollLeft(100) testing setter on empty jquery object" );
...@@ -443,12 +443,12 @@ test("offsetParent", function(){ ...@@ -443,12 +443,12 @@ test("offsetParent", function(){
test("fractions (see #7730 and #7885)", function() { test("fractions (see #7730 and #7885)", function() {
expect(2); expect(2);
jQuery('body').append('<div id="fractions"/>'); jQuery('body').append('<div id="fractions"/>');
var expected = { top: 1000, left: 1000 }; var expected = { top: 1000, left: 1000 };
var div = jQuery('#fractions'); var div = jQuery('#fractions');
div.css({ div.css({
position: 'absolute', position: 'absolute',
left: '1000.7432222px', left: '1000.7432222px',
...@@ -456,14 +456,14 @@ test("fractions (see #7730 and #7885)", function() { ...@@ -456,14 +456,14 @@ test("fractions (see #7730 and #7885)", function() {
width: 100, width: 100,
height: 100 height: 100
}); });
div.offset(expected); div.offset(expected);
var result = div.offset(); var result = div.offset();
equals( result.top, expected.top, "Check top" ); equals( result.top, expected.top, "Check top" );
equals( result.left, expected.left, "Check left" ); equals( result.left, expected.left, "Check left" );
div.remove(); div.remove();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment