@@ -19,13 +19,6 @@ var jQuery = window.jQuery = function( selector, context ) { return new jQuery.prototype.init( selector, context ); }; -// Map over the $ in case of overwrite -if ( window.$ ) - var _$ = window.$; - -// Map the jQuery namespace to the '$' one -window.$ = jQuery; - // A simple way to check for HTML strings or ID strings // (both of which we optimize for) var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/; lib/jquery-1.2.3.js @@ -36,7 +36,7 @@ Screw.Mock = (function () { var element = opts.element || jQuery("#dom_test"); element = jQuery(element); - if (!/\.html$/.test(mock)) { + if (!((/\.html$/).test(mock))) { mock += ".html"; } @@ -96,6 +96,5 @@ Screw.Unit(function() { if (jQuery("#dom_test")) { jQuery('#dom_test').empty(); } - Screw.Prototype.Ajax.reset(); }); }); lib/screw.mock.js @@ -97,9 +97,6 @@ Screw.Prototype.Ajax = (function () { Screw.Unit(function() { before(function() { - if (jQuery("#dom_test")) { - jQuery('#dom_test').empty(); - } Screw.Prototype.Ajax.reset(); }); }); lib/screw.prototype.js @@ -2,33 +2,33 @@ Screw.Matchers.argWhichWill = function(matcher, expected) { return new Screw.Stub.ArgumentMatcher(matcher, expected); }; -Screw.Stub = (function($) { +Screw.Stub = (function() { var self = {}; var stubbedObjects = []; - var base = function(obj, name, private) { - private = private || {}; + var base = function(obj, name, priv) { + priv = priv || {}; var self = {}; - private.returnVal = null; - private.functionWasCalled = function() {}; + priv.returnVal = null; + priv.functionWasCalled = function() {}; self = function(receiver, args) { - private.functionWasCalled(); + priv.functionWasCalled(); - if (private.implementation) - return private.implementation.apply(receiver, args); + if (priv.implementation) + return priv.implementation.apply(receiver, args); else - return private.returnVal; + return priv.returnVal; }; self.andReturn = function(val) { - private.returnVal = val; + priv.returnVal = val; return self; }; self.as = function(implementation) { - private.implementation = implementation; + priv.implementation = implementation; return self; }; @@ -45,36 +45,36 @@ Screw.Stub = (function($) { }; var shouldReceive = function(obj, name) { - var private = {}; - var self = base(obj, name, private); + var priv = {}; + var self = base(obj, name, priv); - private.expectedCallCount = 1; - private.actualCallCount = 0; - private.validated = false; - private.expectedArguments; + priv.expectedCallCount = 1; + priv.actualCallCount = 0; + priv.validated = false; + priv.expectedArguments; - private.functionWasCalled = function() { - private.actualCallCount += 1; + priv.functionWasCalled = function() { + priv.actualCallCount += 1; }; self.numberOfTimes = function(count) { - private.expectedCallCount = count; + priv.expectedCallCount = count; return self; }; self.withArguments = function() { - private.expectedArguments = arguments; + priv.expectedArguments = arguments; return self; }; self.accepts = function(args) { - if (!private.expectedArguments) { + if (!priv.expectedArguments) { return true; - } else if (args.length !== private.expectedArguments.length) { + } else if (args.length !== priv.expectedArguments.length) { return false; } else { for (var i=0; i < args.length; i++) { - var expected = private.expectedArguments[i]; + var expected = priv.expectedArguments[i]; var actual = args[i]; if (expected instanceof Screw.Stub.ArgumentMatcher) { if (!expected.matcher.match(expected.expected, actual)) @@ -88,12 +88,12 @@ Screw.Stub = (function($) { }; self.validate = function() { - if (!private.validated && private.expectedCallCount !== private.actualCallCount) { - private.validated = true; - throw('expected ' + $.print(name) + ' to be called ' + - private.expectedCallCount.toString() + + if (!priv.validated && priv.expectedCallCount !== priv.actualCallCount) { + priv.validated = true; + throw('expected ' + jQuery.print(name) + ' to be called ' + + priv.expectedCallCount.toString() + ' times, but it was called ' + - private.actualCallCount.toString() + ' times.'); + priv.actualCallCount.toString() + ' times.'); } }; @@ -106,8 +106,8 @@ Screw.Stub = (function($) { }; var stubReceiver = function(obj, name) { - var private = {}; - private.oldVal = obj[name]; + var priv = {}; + priv.oldVal = obj[name]; var self = function() { for(var i=0; i < self.stubs.length; i++) { @@ -117,10 +117,10 @@ Screw.Stub = (function($) { } } - if (private.oldVal.constructor === Function) { - return private.oldVal.apply(obj, arguments); + if (priv.oldVal.constructor === Function) { + return priv.oldVal.apply(obj, arguments); } else { - return private.oldVal; + return priv.oldVal; } }; @@ -131,10 +131,10 @@ Screw.Stub = (function($) { stub.validate(); } } - } + }; self.reset = function() { - obj[name] = private.oldVal; + obj[name] = priv.oldVal; }; self.stubs = []; @@ -146,7 +146,7 @@ Screw.Stub = (function($) { self.shouldReceive = function(obj, name) { stubReceiver(obj, name); return shouldReceive(obj, name); - } + }; self.stub = function(obj, name) { stubReceiver(obj, name); @@ -175,7 +175,7 @@ Screw.Stub = (function($) { }; return self; -}(jQuery)); +}()); Screw.Unit(function() { after(function() { lib/screw.stub.js @@ -160,16 +160,16 @@ Screw.Unit(function() { describe("#selector", function() { describe('a [describe]', function() { it('manufactures a CSS selector that uniquely locates the [describe]', function() { - $('.describe').each(function() { - expect($($(this).fn('selector')).get(0)).to(equal, $(this).get(0)) + jQuery('.describe').each(function() { + expect(jQuery(jQuery(this).fn('selector')).get(0)).to(equal, jQuery(this).get(0)) }); }); }); describe('an [it]', function() { it('manufactures a CSS selector that uniquely locates the [it]', function() { - $('.it').each(function() { - expect($($(this).fn('selector')).get(0)).to(equal, $(this).get(0)) + jQuery('.it').each(function() { + expect(jQuery(jQuery(this).fn('selector')).get(0)).to(equal, jQuery(this).get(0)) }); }); }); spec/behaviors_spec.js @@ -190,7 +190,7 @@ Screw.Unit(function() { describe('#match_selector', function() { var elt; before(function() { - elt = $("<div class='foo'></div>"); + elt = jQuery("<div class='foo'></div>"); }); it("matches a jQuery element against the expected selector", function() { @@ -213,7 +213,7 @@ Screw.Unit(function() { describe('#contain_selector', function() { var elt; before(function() { - elt = $("<div><div class='foo'></div></div>"); + elt = jQuery("<div><div class='foo'></div></div>"); }); it("matches a jQuery element against the expected selector", function() { spec/matchers_spec.js @@ -2,115 +2,115 @@ Screw.Unit(function() { describe("Print", function() { describe('when given undefined', function() { it("returns 'undefined'", function() { - expect($.print(undefined)).to(equal, 'undefined'); + expect(jQuery.print(undefined)).to(equal, 'undefined'); }); }); describe('when given null', function() { it("returns 'null'", function() { - expect($.print(null)).to(equal, 'null'); + expect(jQuery.print(null)).to(equal, 'null'); }); }); describe('when given a number', function() { it("returns the string representation of the number", function() { - expect($.print(1)).to(equal, '1'); - expect($.print(1.01)).to(equal, '1.01'); - expect($.print(-1)).to(equal, '-1'); + expect(jQuery.print(1)).to(equal, '1'); + expect(jQuery.print(1.01)).to(equal, '1.01'); + expect(jQuery.print(-1)).to(equal, '-1'); }); }); describe('when given a boolean', function() { it("returns the string representation of the boolean", function() { - expect($.print(true)).to(equal, 'true'); - expect($.print(false)).to(equal, 'false'); + expect(jQuery.print(true)).to(equal, 'true'); + expect(jQuery.print(false)).to(equal, 'false'); }); }); describe('when given a string', function() { it("returns the string, quoted", function() { - expect($.print('asdf')).to(equal, '"asdf"'); + expect(jQuery.print('asdf')).to(equal, '"asdf"'); }); describe('when the string is longer than the [max_string] option', function() { it("returns the string, truncated", function() { - expect($.print('asdf', { max_string: 3 })).to(equal, '"asd..."'); + expect(jQuery.print('asdf', { max_string: 3 })).to(equal, '"asd..."'); }); }); describe('when the strings has quotes or escaped characters', function() { it("returns the string, with quotes and escaped characters escaped", function() { - expect($.print('as"df')).to(equal, '"as\\"df"'); - expect($.print('as\tdf')).to(equal, '"as\\tdf"'); + expect(jQuery.print('as"df')).to(equal, '"as\\"df"'); + expect(jQuery.print('as\tdf')).to(equal, '"as\\tdf"'); }); }); }); describe('when given a function', function() { it("returns the function's signature", function() { - expect($.print(function() {})).to(match, /function\s*\(\)/); - expect($.print(function foo() {})).to(match, /function\s*foo\(\)/); - expect($.print(function foo(bar) {})).to(match, /function\s*foo\(bar\)/); + expect(jQuery.print(function() {})).to(match, /function\s*\(\)/); + expect(jQuery.print(function foo() {})).to(match, /function\s*foo\(\)/); + expect(jQuery.print(function foo(bar) {})).to(match, /function\s*foo\(bar\)/); }); }); describe('when given an element', function() { it("returns the string representation of the element", function() { - expect($.print($('<div></div>').get(0))).to(equal, '<div>'); - expect($.print($('<div foo="bar"></div>').get(0))).to(equal, '<div>'); + expect(jQuery.print(jQuery('<div></div>').get(0))).to(equal, '<div>'); + expect(jQuery.print(jQuery('<div foo="bar"></div>').get(0))).to(equal, '<div>'); }); }); describe('when given an array', function() { it("returns the printed elements, comma separated, encircled by square brackets", function() { - expect($.print([])).to(equal, '[]'); - expect($.print([1])).to(equal, '[ 1 ]'); - expect($.print([1, 2, 3])).to(equal, '[ 1, 2, 3 ]'); + expect(jQuery.print([])).to(equal, '[]'); + expect(jQuery.print([1])).to(equal, '[ 1 ]'); + expect(jQuery.print([1, 2, 3])).to(equal, '[ 1, 2, 3 ]'); }); describe('when the array is longer than the [max_array] option', function() { it("returns the printed array, truncated", function() { - expect($.print([1, 2, 3, 4], { max_array: 2 })).to(equal, '[ 1, 2, 2 more... ]'); + expect(jQuery.print([1, 2, 3, 4], { max_array: 2 })).to(equal, '[ 1, 2, 2 more... ]'); }); }); describe('when the array has arrays as its elements', function() { it("returns the recursively printed array", function() { - expect($.print([[]])).to(equal, '[ [] ]'); - expect($.print([ [1, 2, 3], 4 ])).to(equal, '[ [ 1, 2, 3 ], 4 ]'); + expect(jQuery.print([[]])).to(equal, '[ [] ]'); + expect(jQuery.print([ [1, 2, 3], 4 ])).to(equal, '[ [ 1, 2, 3 ], 4 ]'); }); }); describe('when the array has objects as its elements', function() { it("returns recursively printed array", function() { - expect($.print([{}])).to(equal, '[ {} ]'); - expect($.print([ { foo: 'bar' }, 'baz' ])).to(equal, '[ { foo: "bar" }, "baz" ]'); + expect(jQuery.print([{}])).to(equal, '[ {} ]'); + expect(jQuery.print([ { foo: 'bar' }, 'baz' ])).to(equal, '[ { foo: "bar" }, "baz" ]'); }); }); }); describe('when given a jQuery', function() { - it("returns the printed array of elements engirthed in '$()' ", function() { - expect($.print($('<div></div>'))).to(equal, '$([ <div> ])'); + it("returns the printed array of elements engirthed in 'jQuery()' ", function() { + expect(jQuery.print(jQuery('<div></div>'))).to(equal, '$([ <div> ])'); }); }); describe('when given an object', function() { it("returns the keys and values of the object, enraptured with curly braces", function() { - expect($.print({})).to(equal, '{}'); - expect($.print({ foo: 1, bar: 2 })).to(equal, '{ foo: 1, bar: 2 }'); + expect(jQuery.print({})).to(equal, '{}'); + expect(jQuery.print({ foo: 1, bar: 2 })).to(equal, '{ foo: 1, bar: 2 }'); }); describe('when the values of the object are non-primitive', function() { it("recursively prints the keys and values", function() { - expect($.print({ foo: [1, 2] })).to(equal, '{ foo: [ 1, 2 ] }'); + expect(jQuery.print({ foo: [1, 2] })).to(equal, '{ foo: [ 1, 2 ] }'); }); describe('when the object has circular references', function() { it("returns elipses for circularities", function() { var circular = {}; circular[0] = circular; - expect($.print(circular)).to(equal, '{ 0: { 0: ... } }'); + expect(jQuery.print(circular)).to(equal, '{ 0: { 0: ... } }'); }); }); }); spec/print_spec.js @@ -1,6 +1,9 @@ <html> <head> <script type="text/javascript" src="../lib/jquery-1.2.3.js"></script> + <script type="text/javascript"> + jQuery.noConflict(); + </script> <script type="text/javascript" src="../lib/jquery.fn.js"></script> <script type="text/javascript" src="../lib/jquery.print.js"></script> <script type="text/javascript" src="../lib/screw.builder.js"></script> @@ -19,7 +22,6 @@ <script type="text/javascript" src="stub_spec.js"></script> <script type="text/javascript" src="asynchronous_spec.js"></script> <script type="text/javascript" src="skipping_spec.js"></script> - <script type="text/javascript" src="print_spec.js"></script> <script type="text/javascript" src="prototype.js"></script> <script type="text/javascript" src="prototype_spec.js"></script> spec/suite.html my_diff.diff 76abb4666bd8e2a8e15904ee7678444851791ef1 topper topper@toppingdesign.com http://github.com/tobowers/screw-unit/commit/8f99702a93be160a91ecd7916ae62d36c2dbdafc 8f99702a93be160a91ecd7916ae62d36c2dbdafc 2009-11-02T09:12:52-08:00 2009-11-02T09:12:52-08:00 passing tests d8558ec9d0186ec643472445b58400aab3a64fcd topper topper@toppingdesign.com