Fix #14340. Remove remnants of oldIE from unit tests. #1425

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
2 participants
Member

mgol commented Nov 10, 2013

No description provided.

mgol added a commit to mgol/jquery that referenced this pull request Nov 10, 2013

Member

mgol commented Nov 10, 2013

I've run the test suite in IE9, IE10, Safari 7, Safari 5.1, Opera 12.16, Firefox 25 and Chrome 30 and only Chrome errored on one test but it's the same on master. So it should be safe to merge.

test/unit/core.js
+ // "When html is within brackets, do not recognize as html." );
+ equal( jQuery( "element:not(<div></div>)" ).length, 0,
+ "When html is within parens, do not recognize as html." );
+ equal( jQuery( "\\<div\\>" ).length, 0, "Ignore escaped html characters" );
@gibson042

gibson042 Nov 10, 2013

Member

These should be checked in 1.x-master too; they look like the kind of selector now working in Sizzle.

@ghost

ghost Nov 10, 2013

("element [attribútum = '

</ div>']"). Hosszúság, 0,

@mgol

mgol Nov 10, 2013

Member

@gibson042 Do you want it in a separate commit then?

@gibson042

gibson042 Nov 10, 2013

Member

Yeah, a separate commit would let us handle the parsing logic in isolation. If it is good on both branches, I'd just push directly.

@mgol

mgol Nov 10, 2013

Member

@gibson042 I've checked on modern browsers and IE6-9 and it works so I've pushed it on both branches.

test/unit/offset.js
@@ -178,19 +178,14 @@ testIframe("offset/absolute", "absolute", function( $ ) {
});
});
-testIframe("offset/relative", "relative", function( $ ) {
+testIframe( "offset/relative", "relative", function( $ ) {
@gibson042

gibson042 Nov 10, 2013

Member

This being a PR explicitly introducing master/1.x-master divergence, I think style changes should be omitted so they at least can be cherry-picked with minimal conflicts.

@mgol

mgol Nov 10, 2013

Member

I tried to omit style changes in tests I didn't modify but I can go further and not correct style in lines not touched otherwise, is that what you want?

I assume correcting code style in lines that were touched by me for other reasons is ok?

@mgol

mgol Nov 10, 2013

Member

I reverted this & a couple of other style-only changes. I hope I catched them all. :)

@ghost

ghost commented Nov 10, 2013

-TestIframe ("Offset / relatív", "relatív", funkció ($) {

mgol added a commit to mgol/jquery that referenced this pull request Nov 10, 2013

test/unit/css.js
@@ -58,10 +58,6 @@ test("css(String|Hash)", function() {
jQuery("#foo").css({"opacity": ""});
equal( jQuery("#foo").css("opacity"), "1", "Assert opacity is 1 when set to an empty String" );
- equal( jQuery("#empty").css("opacity"), "0", "Assert opacity is accessible via filter property set in stylesheet in IE" );
- jQuery("#empty").css({ "opacity": "1" });
- equal( jQuery("#empty").css("opacity"), "1", "Assert opacity is taken from style attribute when set vs stylesheet in IE with filters" );
@gibson042

gibson042 Nov 10, 2013

Member

I'd like to keep these too; they're harmless but will maintain expect-count parity.

test/unit/manipulation.js
@@ -1028,7 +1027,9 @@ test( "replaceWith(string) for more than one element", function() {
equal(jQuery("#foo p").length, 0, "verify that all the three original element have been replaced");
});
-test( "Empty replaceWith (#13401; #13596)", 8, function() {
+test( "Empty replaceWith (#13401; #13596)", function() {
+ expect( 8 );
@gibson042

gibson042 Nov 10, 2013

Member

This change should also take place in both branches (i.e., not in this PR)

@mgol

mgol Nov 10, 2013

Member

OK, noted.

@mgol

mgol Nov 10, 2013

Member

Hm, I guess I just shouldn't touch that lines at all. I'll revert that.

mgol added a commit to mgol/jquery that referenced this pull request Nov 10, 2013

Member

mgol commented Nov 10, 2013

All comments by @gibson042 addressed.

mgol added a commit to mgol/jquery that referenced this pull request Nov 10, 2013

mgol added a commit to mgol/jquery that referenced this pull request Nov 10, 2013

Member

gibson042 commented Nov 11, 2013

👍

@mgol mgol closed this in 4b39a82 Nov 11, 2013

@mgol mgol deleted the mgol:old_support branch Nov 11, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment