From ea24cd106b86dae2411e5b87c367f6ff5163aee8 Mon Sep 17 00:00:00 2001 From: timmywil Date: Mon, 2 May 2011 17:53:55 -0400 Subject: [PATCH] Avoid changing html in two places; add minified jQuery as an option to the main test page --- test/data/testrunner.js | 3 - test/data/versioncheck.js | 8 ++ test/index.built.html | 264 -------------------------------------- test/index.html | 6 +- 4 files changed, 13 insertions(+), 268 deletions(-) create mode 100644 test/data/versioncheck.js delete mode 100644 test/index.built.html diff --git a/test/data/testrunner.js b/test/data/testrunner.js index 1da67651..6d44b460 100644 --- a/test/data/testrunner.js +++ b/test/data/testrunner.js @@ -28,9 +28,6 @@ jQuery.noConflict(); // Allow the test to run with other libs or jQuery's. // QUnit Aliases (function() { - window.equals = window.equal; window.same = window.deepEqual; - })(); - diff --git a/test/data/versioncheck.js b/test/data/versioncheck.js new file mode 100644 index 00000000..f4b7790d --- /dev/null +++ b/test/data/versioncheck.js @@ -0,0 +1,8 @@ +// Run minified source from dist (do make first) +// Should be loaded before QUnit but after src +(function() { + if ( /jquery\=min/.test( window.location.search ) ) { + jQuery.noConflict( true ); + document.write(unescape("%3Cscript%20src%3D%27../dist/jquery.min.js%27%3E%3C/script%3E")); + } +})(); \ No newline at end of file diff --git a/test/index.built.html b/test/index.built.html deleted file mode 100644 index aad27a1f..00000000 --- a/test/index.built.html +++ /dev/null @@ -1,264 +0,0 @@ - - - - - jQuery Test Suite - Fully Built and Compressed - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

jQuery Test Suite

-

-
-

-
    - - -
    -
    -
    - - -
    -
    -

    See this blog entry for more information.

    -

    - Here are some links in a normal paragraph: Google, - Google Groups (Link). - This link has class="blog": - diveintomark - -

    -
    -

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

    -

    This is a normal link: Yahoo

    -

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

    - -
    - -

    Try them out:

    -
      -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - test element -
        - Float test. - -
        - - -
        -
        - -
        - - - - -
        - -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        -
        -
        - -
        -
        hi there
        -
        -
        -
        -
        - -
        -
          -
        1. Rice
          2. -
        2. Beans
          3. -
        3. Blinis
          4. -
        4. Tofu
          5. -
        - -
        I'm hungry. I should...
        - ...Eat lots of food... | - ...Eat a little food... | - ...Eat no food... - ...Eat a burger... - ...Eat some funyuns... - ...Eat some funyuns... -
        - -
        - - -
        - -
        - 1 - 2 -
        -
        -
        -
        -
        -
        fadeIn
        fadeIn
        -
        fadeOut
        fadeOut
        - -
        show
        show
        -
        hide
        hide
        - -
        togglein
        togglein
        -
        toggleout
        toggleout
        - - -
        slideUp
        slideUp
        -
        slideDown
        slideDown
        - -
        slideToggleIn
        slideToggleIn
        -
        slideToggleOut
        slideToggleOut
        - -
        fadeToggleIn
        fadeToggleIn
        -
        fadeToggleOut
        fadeToggleOut
        - -
        fadeTo
        fadeTo
        -
        - -
        -
        - - diff --git a/test/index.html b/test/index.html index b19673d9..1a4d0582 100644 --- a/test/index.html +++ b/test/index.html @@ -28,6 +28,8 @@ + + @@ -48,7 +50,9 @@ -

        jQuery Test Suite

        +

        jQuery Test Suite + (minified) +