spec/asynchronous_spec.js spec/skipping_spec.js @@ -1,9 +1,15 @@ +Screw.Defaults = Screw.Defaults || {}; +Screw.Defaults.to_run = 'body > .describe > .describes > .describe'; + (function($) { $(Screw).bind('loaded', function() { $('.status').fn({ display: function() { $(this).text( - $('.passed').length + $('.failed').length + ' test(s), ' + $('.failed').length + ' failure(s)' + $('.it.passed' ).length + $('.failed').length + $('.skipped').length + ' finished, ' + + $('.it.failed' ).length + ' failure(s), ' + + $('.it.skipped').length + ' skipped, ' + + $('.it.async' ).length + ' running asynchronous test(s)' ); } }); @@ -44,10 +50,12 @@ }, run: function() { + if ($(this).hasClass('skipped')){return} + try { try { $(this).fn('parent').fn('run_befores'); - $(this).data('screwunit.run')(); + $(this).data('screwunit.run')($(this)); } finally { $(this).fn('parent').fn('run_afters'); } @@ -73,15 +81,15 @@ }); $('.before').fn({ - run: function() { $(this).data('screwunit.run')() } + run: function() { $(this).data('screwunit.run')($(this)) } }); $('.after').fn({ - run: function() { $(this).data('screwunit.run')() } + run: function() { $(this).data('screwunit.run')($(this)) } }); $(Screw).trigger('before'); - var to_run = unescape(location.search.slice(1)) || 'body > .describe > .describes > .describe'; + var to_run = unescape(location.search.slice(1)) || Screw.Defaults.to_run; $(to_run) .focus() .eq(0).trigger('scroll').end() lib/screw.behaviors.js @@ -2,18 +2,70 @@ var Screw = (function($) { var screw = { Unit: function(fn) { var contents = fn.toString().match(/^[^\{]*{((.*\n*)*)}/m)[1]; - var fn = new Function("matchers", "specifications", - "with (specifications) { with (matchers) { " + contents + " } }" + var fn = new Function("matchers", "specifications", "utilities", + "with (specifications) { with (matchers) { with (utilities) {" + contents + " } } }" ); $(Screw).queue(function() { Screw.Specifications.context.push($('body > .describe')); - fn.call(this, Screw.Matchers, Screw.Specifications); + fn.call(this, Screw.Matchers, Screw.Specifications, Screw.Utilities); Screw.Specifications.context.pop(); $(this).dequeue(); }); }, + Utilities: { + /* + * 'me' is $(this) being passed to the screwunit.run function (see screw.behaviors.js) + * $(this).data('screwunit.run')($(this)); + */ + + skip: function(me){ + return { + because: function(reason) { + me.trigger('skipped', [reason]); + throw ''; + } + } + }, + + using: function( me ) { + return { + wait : function( seconds ) { + return { + and_then: function( fn ) { + var f = function() { + var async_count = me.data('async_waiting_count') - 1; + me.data('async_waiting_count', async_count); + if (async_count < 1) { + me.removeClass('async'); + } + + try { + fn(me); + } catch (e) { + me.trigger('failed', [e]); + return; + } + me.trigger('passed'); + }; + + var async_count = me.data('async_waiting_count') || 0 + me.data('async_waiting_count', async_count + 1) + + me.addClass('async'); + + // allow the "it" we are called from to finish, which will add class "passed", which we want to remove. + setTimeout(function(){ me.trigger('running'); }, 2); + + setTimeout(f, 1000 * parseInt(seconds,10)); + } + } + } + } + } + }, + Specifications: { context: [], lib/screw.builder.js @@ -87,4 +87,16 @@ html { cursor: pointer; color: #000 !important; border-bottom: 1px solid #9A8E51; - } \ No newline at end of file + } + + + .describes .describe .its .it.skipped h2 { + background-color: #8DEEEE; + color: #000000 !important; + } + + .describes .describe .its .it.skipped p { + margin-left: 1em; + color: #000000; + } + \ No newline at end of file lib/screw.css @@ -10,7 +10,9 @@ return $(this).addClass('focused'); }) .bind('scroll', function() { - document.body.scrollTop = $(this).offset().top; + var sel = $(this).fn('selector'); + var use_browser_top = $.inArray(sel, [ Screw.Defaults.to_run + ':eq(0)', 'body > .describe']) >= 0; + document.body.scrollTop = use_browser_top ? 0 : $(this).offset().top; }); $('.it') @@ -18,25 +20,52 @@ $(this).addClass('enqueued'); }) .bind('running', function() { - $(this).addClass('running'); + $(this) + .addClass('running') + .removeClass('failed') + .removeClass('passed'); }) .bind('passed', function() { - $(this).addClass('passed'); + if ($(this).hasClass('skipped')){return} + $(this) + .addClass('passed') + .removeClass('failed'); + $('.status').fn('display'); }) .bind('failed', function(e, reason) { + if ($(this).hasClass('skipped')){return} + reason = reason || ''; $(this) .addClass('failed') + .removeClass('passed') .append($('<p class="error"></p>').text(reason.toString())); + $('.status').fn('display'); if (reason.fileName || reason.lineNumber) { $(this) .append($('<p class="error"></p>').text(reason.fileName + " : " + reason.lineNumber)); } }) + .bind('skipped', function(e, reason) { + $(this) + .removeClass('failed') + .removeClass('passed') + .addClass('skipped') + .append($('<p class="skip_reason"></p>').text("Skipped because: " + reason.toString())); + $('.status').fn('display'); + }); + + $('.before') + .bind('skipped', function(e, reason){ + if ($(this).hasClass('skipped')){ return } + $(this) + .addClass('skipped') + .append($('<p class="skip_reason"></p>').text("Group Skipped because: " + reason.toString())); + $('.it', $(this).parent().parent().get(0)) + .addClass('skipped'); + $('.status').fn('display'); + }); }) .bind('before', function() { - $('.status').text('Running...'); - }) - .bind('after', function() { - $('.status').fn('display') + $('.status').text('Starting...'); }) })(jQuery); \ No newline at end of file lib/screw.events.js @@ -5,6 +5,23 @@ Screw.Unit(function() { describe('Behaviors', function() { describe('#run', function() { + describe("A describe block with exceptions", function() { + var after_invoked = false; + after(function() { + after_invoked = true; + }); + + describe("an exception in a test", function() { + it("fails because it throws an exception. This is the only test that should fail", function() { + throw('an exception'); + }); + + it("invokes [after]s even if the previous [it] raised an exception", function() { + expect(after_invoked).to(equal, true); + }); + }); + }); + describe("a simple [describe]", function() { it("invokes the global [before] before an [it]", function() { expect(global_before_invoked).to(equal, true); @@ -138,23 +155,6 @@ Screw.Unit(function() { }); }); }); - - describe("A describe block with exceptions", function() { - var after_invoked = false; - after(function() { - after_invoked = true; - }); - - describe("an exception in a test", function() { - it("fails because it throws an exception", function() { - throw('an exception'); - }); - - it("invokes [after]s even if the previous [it] raised an exception", function() { - expect(after_invoked).to(equal, true); - }); - }); - }); }); describe("#selector", function() { spec/behaviors_spec.js @@ -64,7 +64,8 @@ Screw.Unit(function() { expect(raised).to(be_true); }); - it("(will fail without prototype) should do responseJSON when the response is JSON", function () { + it("should do responseJSON when the response is JSON if Prototype is included", function () { + if (!window.Prototype){return} TH.Ajax.mock("/a_url", "{'foo': 'bar'}", 200); var ajx = new Ajax.Request("/a_url", { onComplete: function (resp) { response = resp } spec/mock_spec.js @@ -14,6 +14,8 @@ <script src="matchers_spec.js"></script> <script src="print_spec.js"></script> <script src="mock_spec.js"></script> + <script src="asynchronous_spec.js"></script> + <script src="skipping_spec.js"></script> <link rel="stylesheet" href="../lib/screw.css"> </head> spec/suite.html ff725f34ec1e2f854e9f894a3697a9385d7e7b94 321ddcbcbf1c83f08fd4d4359821aee519a230f8 topper topper@toppingdesign.com http://github.com/tobowers/screw-unit/commit/88fc8bb3b2b0c5e5509f37a5d68c7fe7955a2b7b 88fc8bb3b2b0c5e5509f37a5d68c7fe7955a2b7b 2008-09-18T07:19:27-07:00 2008-09-18T07:19:27-07:00 Merge branch 'merge_branch' ff6a56ac859be1557401eafed0d800fbab280de4 topper topper@toppingdesign.com