From 84b6a0beb1de193520bb5541c841cbecc7195a5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?= Date: Mon, 11 Mar 2019 17:25:48 +0100 Subject: [PATCH] Build: Remove manual QUnit fixture resetting It was needed when QUnit 1.x one used but we've since upgraded to QUnit 2.x. Closes gh-4312 Ref gh-4307 --- build/tasks/qunit_fixture.js | 4 +--- test/data/qunit-fixture.js | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/tasks/qunit_fixture.js b/build/tasks/qunit_fixture.js index eb9b5636b..3f332dad0 100644 --- a/build/tasks/qunit_fixture.js +++ b/build/tasks/qunit_fixture.js @@ -13,9 +13,7 @@ module.exports = function( grunt ) { "utf8" ).toString().replace( /\r\n/g, "\n" ) ) + - ";\n" + - "// Compat with QUnit 1.x:\n" + - "document.getElementById( \"qunit-fixture\" ).innerHTML = QUnit.config.fixture;\n" + ";\n" ); grunt.log.ok( "Updated " + dest + "." ); } ); diff --git a/test/data/qunit-fixture.js b/test/data/qunit-fixture.js index 6ea2f3b3d..46f0c3c26 100644 --- a/test/data/qunit-fixture.js +++ b/test/data/qunit-fixture.js @@ -1,4 +1,2 @@ // Generated by build/tasks/qunit_fixture.js QUnit.config.fixture = "

See this blog entry for more information.

\n

\n\tHere are some links in a normal paragraph: Google,\n\tGoogle Groups (Link).\n\tThis link has class=\"blog\":\n\tdiveintomark\n\n

\n
\n\t

Everything inside the red border is inside a div with id=\"foo\".

\n\t

This is a normal link: Yahoo

\n\t

This link has class=\"blog\": Simon Willison's Weblog

\n\n
\n
\n\t
\n
\n\n

Try them out:

\n\n
    \n
    \n\t\n\t\n\t\n\t\n\n\t\n\t\n\t\n\n\t\n\t\n\n\t\n\t\n\n\t\n\n\t\n\n\t\n\t\n\t\n\t\n\t\n\n\t\n\t\t\n\t\t\n\t\n\n\t\n\t\n\t\n\t\n\t\n\t\n\n\ttest element\n
    \nFloat test.\n\n
    \n\t\n\t\n
    \n
    \n\n
    \n\t\n\t\n\t\n\t\n
    \n\n
    \n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\t\n\t\n
    \n
    \n\t
    \n\t\t
    \n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
    \n\t
    \n\t
    hi there
    \n\t
    \n\t\t
    hidden
    \n\t
    \n\t
    \n\t\t
    \n\t
    \n\t
    \n
    \n\n
    \n\t
      \n\t\t
    1. Rice
      2. \n\t\t
    2. Beans
      3. \n\t\t
    3. Blinis
      4. \n\t\t
    4. Tofu
      5. \n\t
    \n\n\t
    I'm hungry. I should...
    \n\t...Eat lots of food... |\n\t...Eat a little food... |\n\t...Eat no food...\n\t...Eat a burger...\n\t...Eat some funyuns...\n\t...Eat some funyuns...\n\t\n\t\n\t\n\t\n\t\t\n\t\n
    \n\n
    \n\t\n\t\n
    \n\n
    \n\t1\n\t2\n\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\n\t\n
    \n
    \n\t
    \n\t\t
    fadeIn
    fadeIn
    \n\t\t
    fadeOut
    fadeOut
    \n\n\t\t
    show
    show
    \n\t\t
    hide
    hide
    \n\t\t
    hide
    hide
    \n\n\t\t
    togglein
    togglein
    \n\t\t
    toggleout
    toggleout
    \n\t\t
    toggleout
    toggleout
    \n\n\t\t
    slideUp
    slideUp
    \n\t\t
    slideDown
    slideDown
    \n\t\t
    slideUp
    slideUp
    \n\n\t\t
    slideToggleIn
    slideToggleIn
    \n\t\t
    slideToggleOut
    slideToggleOut
    \n\n\t\t
    fadeToggleIn
    fadeToggleIn
    \n\t\t
    fadeToggleOut
    fadeToggleOut
    \n\n\t\t
    fadeTo
    fadeTo
    \n\t
    \n\n\t
    \n\t\n
    \n"; -// Compat with QUnit 1.x: -document.getElementById( "qunit-fixture" ).innerHTML = QUnit.config.fixture; -- 2.39.5