Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Modified example for css(String) as proposed in the list (concerning …
…camlCase for dashed properties like font-weight); Modified test to cache test fixture instead of reloading it, should make the test suite run faster
  • Loading branch information
jzaefferer committed Sep 5, 2006
1 parent 00e6e81 commit b5220ad
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
21 changes: 9 additions & 12 deletions build/test/js/test.js
@@ -1,18 +1,13 @@
var queue = [];
var blocking = false;
var fixture;

function reset() {
synchronize(function() {
blocking = true;
$.get('index.html', function(content) {
var div = $(document.createElement('div')).html(content)
// search for main div
.find('[@id=main]').html();
$('#main').html(div);
blocking = false;
process();
});
});
if(fixture) {
$("#main").html(fixture);
} else {
fixture = $("#main").html();
}
}

function synchronize(callback) {
Expand All @@ -31,10 +26,11 @@ function process() {
}

function runTests(files) {
var fixture = null;
reset();
var startTime = new Date();
for( var i=0; i < files.length; i++) {
runTest( files, i );
reset();
}
synchronize(function() {
var runTime = new Date() - startTime;
Expand Down Expand Up @@ -91,6 +87,7 @@ function runTest( files, num ) {
document.getElementById("tests").appendChild( li );

Test = [];
reset();
blocking = false;
process();
});
Expand Down
13 changes: 13 additions & 0 deletions src/jquery/jquery.js
Expand Up @@ -466,6 +466,17 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").css("color");
* @before <p style="color:red;">Test Paragraph.</p>
* @result red
* @desc Retrieves the color style of the first paragraph
*
* @example $("p").css("fontWeight");
* @before <p style="font-weight: bold;">Test Paragraph.</p>
* @result bold
* @desc Retrieves the font-weight style of the first paragraph.
* Note that for all style properties with a dash (like 'font-weight'), you have to
* write it in camelCase. In other words: Every time you have a '-' in a
* property, remove it and replace the next character with an uppercase
* representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth,
* borderStyle, borderBottomWidth etc.
*
* @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"');
*
Expand Down Expand Up @@ -502,6 +513,8 @@ jQuery.fn = jQuery.prototype = {
* @example $("p").css("color","red");
* @before <p>Test Paragraph.</p>
* @result <p style="color:red;">Test Paragraph.</p>
* @desc Changes the color of all paragraphs to red
*
*
* @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
* @test $('#foo').css('display', 'none');
Expand Down

0 comments on commit b5220ad

Please sign in to comment.