Skip to content
Permalink
Browse files
Massive overhauls to the test suite - it is now generated dynamically…
…, along with the documentation.
  • Loading branch information
jeresig committed Aug 14, 2006
1 parent 61aab47 commit 7448c61ee2199f6f7002e33e533cebc42b000c89
Show file tree
Hide file tree
Showing 10 changed files with 465 additions and 130 deletions.
@@ -6,47 +6,53 @@ DOCS_DIR = ${PREFIX}/docs
TEST_DIR = ${PREFIX}/test
DIST_DIR = ${PREFIX}/dist

MODULES = jquery event fx ajax
MODULES = ${SRC_DIR}/jquery/*\
${SRC_DIR}/event/*\
${SRC_DIR}/fx/*\
${SRC_DIR}/ajax/*

JQ = ${DIST_DIR}/jquery.js
JQ_LITE = ${DIST_DIR}/jquery.lite.js
JQ_PACK = ${DIST_DIR}/jquery.pack.js

JAR = java -jar ${BUILD_DIR}/js.jar

all: jquery lite pack docs
all: jquery lite pack docs test
@@echo "jQuery build complete."

${DIST_DIR}:
@@mkdir -p ${DIST_DIR}

jquery: ${DIST_DIR} ${JQ}

${JQ}:
${JQ}: ${MODULES}
@@echo "Building" ${JQ}

@@for f in ${MODULES}; do \
echo " - Adding module:" $$f;\
cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
done
@@mkdir -p ${DIST_DIR}
@@cat ${MODULES} > ${JQ};

@@echo ${JQ} "Built"
@@echo

lite: ${JQ_LITE}

${JQ_LITE}: jquery
${JQ_LITE}: ${JQ}
@@echo "Building" ${JQ_LITE}

@@echo " - Removing ScriptDoc from" ${JQ}
@@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}

@@echo ${JQ_LITE} "Built"
@@echo

pack: ${JQ_PACK}

${JQ_PACK}: jquery
${JQ_PACK}: ${JQ}
@@echo "Building" ${JQ_PACK}

@@echo " - Compressing using Packer"
@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}

@@echo ${JQ_PACK} "Built"
@@echo

@@ -55,9 +61,13 @@ test: ${JQ}

@@echo " - Making Test Suite Directory:" ${TEST_DIR}
@@mkdir -p ${TEST_DIR}
@@mkdir -p ${TEST_DIR}/tests/

@@echo " - Removing any old tests"
@@rm -f ${TEST_DIR}/tests/*

@@echo " - Copying over script files."
@@cp -R ${BUILD_DIR}/test/js ${TEST_DIR}/js
@@cp -nR ${BUILD_DIR}/test/js ${TEST_DIR}/js

@@echo " - Compiling Test Cases"
@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
@@ -73,10 +83,10 @@ docs: ${JQ}
@@mkdir -p ${DOCS_DIR}/data

@@echo " - Copying over script files."
@@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
@@cp -nR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js

@@echo " - Copying over style files."
@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
@@cp -nR ${BUILD_DIR}/docs/style ${DOCS_DIR}/style

@@echo " - Extracting ScriptDoc from" ${JQ}
@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
@@ -1,83 +1,6 @@
load("build/js/json.js", "build/js/xml.js", "build/js/writeFile.js");

var types = {
jQuery: "A jQuery object.",
Object: "A simple Javascript object. For example, it could be a String or a Number.",
String: "A string of characters.",
Number: "A numeric valid.",
Element: "The Javascript object representation of a DOM Element.",
Hash: "A Javascript object that contains key/value pairs in the form of properties and values.",
"Array<Element>": "An Array of DOM Elements.",
"Array<String>": "An Array of strings.",
Function: "A reference to a Javascript function."
};

var f = readFile(arguments[0]);

var c = [], bm, m;
var blockMatch = /\/\*\*\s*((.|\n)*?)\s*\*\//g;
var paramMatch = /\@(\S+) *((.|\n)*?)(?=\n\@|!!!)/m;

while ( bm = blockMatch.exec(f) ) {
block = bm[1].replace(/^\s*\* ?/mg,"") + "!!!";
var ret = { params: [], examples: [] };

while ( m = paramMatch.exec( block ) ) {
block = block.replace( paramMatch, "" );

var n = m[1];
var v = m[2]
.replace(/\s*$/g,"")
.replace(/^\s*/g,"")
.replace(/&/g, "&")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/\n/g, "<br/>")
/*.replace(/(\s\s+)/g, function(a){
var ret = "";
for ( var i = 0; i < a.length; i++ )
ret += "&nbsp;";
return ret;
})*/ || 1;

if ( n == 'param' || n == 'any' ) {
var args = v.split(/\s+/);
v = args.slice( 2, args.length );
v = { type: args[0], name: args[1], desc: v.join(' ') };
if ( n == 'any' ) v.any = 1;
n = "params";
} else if ( n == 'example' ) {
v = { code: v };
n = "examples";
}

if ( n == 'desc' || n == 'before' || n == 'after' || n == 'result' ) {
ret.examples[ ret.examples.length - 1 ][ n ] = v;
} else {
if ( ret[ n ] ) {
if ( ret[ n ].constructor == Array ) {
ret[ n ].push( v );
} else {
ret[ n ] = [ ret[ n ], v ];
}
} else {
ret[ n ] = v;
}
}
}

ret.desc = block.replace(/\s*!!!$/,"")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;");
//.replace(/\n\n/g, "<br/><br/>")
//.replace(/\n/g, " ");

var m = /^((.|\n)*?(\.|$))/.exec( ret.desc );
if ( m ) ret['short'] = m[1];

if ( ret.name ) c.push( ret );
}
load("build/js/json.js", "build/js/xml.js", "build/js/writeFile.js", "build/js/parse.js");

var c = parse( readFile(arguments[0]) );
var json = Object.toJSON( c );

writeFile( arguments[1] + "/data/jquery-docs-json.js", json );
@@ -11,7 +11,10 @@ var types = {
};

$(document).ready(function(){
$("span.tooltip").ToolTipDemo('#fff');
$("span.tooltip").each(function(){
if ( types[ this.innerHTML ] )
this.title = types[ this.innerHTML ];
}).ToolTipDemo('#fff');

$("a.name").click(function(){
$("div.more,div.short",this.parentNode.parentNode).toggle().find("div.desc",function(){
@@ -6,7 +6,7 @@
<head>
<title>jQuery Docs - API</title>
<link rel="stylesheet" href="style/style.css"/>
<script src="../dist/jquery-svn.js"></script>
<script src="../dist/jquery.js"></script>
<script src="js/tooltip.js"></script>
<script src="js/pager.js"></script>
<script src="js/doc.js"></script>
@@ -18,13 +18,13 @@
<xsl:sort select="@name"/>
<xsl:sort select="count(params)"/>
<li>
<span class='type'><span title='TYPE' class='tooltip'><xsl:value-of select="@type"/></span></span>
<span class='type'><span class='tooltip'><xsl:value-of select="@type"/></span></span>
<span class='fn'>
<a href='#{@name}' class='name' title=''><xsl:value-of select="@name"/></a>
<xsl:if test="not(@property)">(
<xsl:for-each select="params">
<span class='arg-type tooltip' title='TYPE'><xsl:value-of select="@type"/></span><xsl:text> </xsl:text>
<span class='arg-name tooltip' title='{@desc}'><xsl:value-of select="@name"/></span>
<span class='arg-type tooltip'><xsl:value-of select="@type"/></span><xsl:text> </xsl:text>
<span class='arg-name tooltip' title='{desc}'><xsl:value-of select="@name"/></span>
<xsl:if test="position() != last()">
<xsl:if test="@any"> or </xsl:if>
<xsl:if test="not(@any)">, </xsl:if>
@@ -60,6 +60,8 @@
</li>
</xsl:for-each>
</ul>

<p class="raw"><b>Raw Data:</b><xsl:text> </xsl:text><a href="data/jquery-docs-json.js">JSON</a>, <a href="data/jquery-docs-jsonp.js">JSONP</a>, <a href="data/jquery-docs-xml.xml">XML</a></p>
</body>
</html>
</xsl:template>
@@ -126,3 +126,15 @@ ul#docs li div.example pre {
padding: 5px;
overflow: auto;
}

p.raw {
font-size: 11px;
color: #FFF;
margin: 5px auto;
width: 600px;
text-align: right;
}

p.raw a {
color: #FFF;
}
@@ -0,0 +1,69 @@
function parse( f ) {
var c = [], bm, m;
var blockMatch = /\/\*\*\s*((.|\n)*?)\s*\*\//g;
var paramMatch = /\@(\S+) *((.|\n)*?)(?=\n\@|!!!)/m;

while ( bm = blockMatch.exec(f) ) {
block = bm[1].replace(/^\s*\* ?/mg,"") + "!!!";
var ret = { params: [], examples: [], tests: [] };

while ( m = paramMatch.exec( block ) ) {
block = block.replace( paramMatch, "" );

var n = m[1];
var v = m[2]
.replace(/\s*$/g,"")
.replace(/^\s*/g,"")
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
//.replace(/\n/g, "<br/>")
/*.replace(/(\s\s+)/g, function(a){
var ret = "";
for ( var i = 0; i < a.length; i++ )
ret += "&nbsp;";
return ret;
})*/ || 1;

if ( n == 'param' || n == 'any' ) {
var args = v.split(/\s+/);
v = args.slice( 2, args.length );
v = { type: args[0], name: args[1], desc: v.join(' ') };
if ( n == 'any' ) v.any = 1;
n = "params";
} else if ( n == 'example' ) {
v = { code: v };
n = "examples";
} else if ( n == 'test' ) {
n = "tests";
}

if ( n == 'desc' || n == 'before' || n == 'after' || n == 'result' ) {
ret.examples[ ret.examples.length - 1 ][ n ] = v;
} else {
if ( ret[ n ] ) {
if ( ret[ n ].constructor == Array ) {
ret[ n ].push( v );
} else {
ret[ n ] = [ ret[ n ], v ];
}
} else {
ret[ n ] = v;
}
}
}

ret.desc = block.replace(/\s*!!!$/,"")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;");
//.replace(/\n\n/g, "<br/><br/>")
//.replace(/\n/g, " ");

var m = /^((.|\n)*?(\.|$))/.exec( ret.desc );
if ( m ) ret['short'] = m[1];

if ( ret.name ) c.push( ret );
}

return c;
}
@@ -1,21 +1,55 @@
<html>
<html id="html">
<head>
<script type="text/javascript" src="lib/Test/Harness.js"></script>
<script type="text/javascript" src="lib/Test/Harness/Browser.js"></script>
<script type="text/javascript" src="../dist/jquery.js"></script>
<script type="text/javascript" src="js/test.js"></script>
<script>
$(document).ready(function(){
runTests([{FILES}]);
});
</script>
<style>.pass { color: green; } .fail { color: red; } #tests ol { display: none; }</style>
</head>
<body>
<body id="body">
<h1>jQuery - Test Suite</h1>

<!-- Test HTML -->
<dl style="display:none;">
<div id="main" style="display: none;">
<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
<p id="ap">
Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>,
<a id="groups" href="http://groups.google.com/">Google Groups</a>.
This link has <code><a href="#" id="anchor1">class="blog"</a></code>:
<a href="http://diveintomark.org/" class="blog" hreflang="en" id="mark">diveintomark</a>

<script type="text/javascript">
new Test.Harness.Browser().runTests(
"tests/prereq.html",
"tests/css1.html",
"tests/css2.html",
"tests/css3.html",
"tests/xpath.html",
"tests/custom.html",
"tests/basic.html"
);
</script>
</p>
<div id="foo">
<p id="sndp">Everything inside the red border is inside a div with
<code>id="foo"</code>.</p>
<p lang="en" id="en">This is a normal link:
<a id="yahoo" href="http://www.yahoo.com/" class="blogTest">Yahoo</a></p>
<p id="sap">This link has <code><a href="#2" id="anchor2">class="blog"</a></code>:
<a href="http://simon.incutio.com/" class="blog link" id="simon">Simon Willison's Weblog</a></p>

</div>
<p id="first">Try them out: </p>
<ul id="firstUL"></ul>
<ol id="empty"></ol>
<form id="form">
<input type="text" value="Test" id="text1"/>
<input type="text" value="Test" id="text2" disabled="disabled"/>
<input type="radio" name="radio1" id="radio1"/>

<input type="radio" name="radio2" id="radio2" checked/>
<input type="checkbox" name="check" id="check1" checked/>
<input type="checkbox" name="check" id="check2"/>

<input type="hidden" name="hidden" id="hidden1"/>
<input type="text" style="display:none;" id="hidden2"/>
</form>
</div>
</dl>

<ol id="tests"></ol>
</body>
</html>

0 comments on commit 7448c61

Please sign in to comment.