aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-09-12 23:23:54 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-09-12 23:23:54 +0200
commitd12180d1a5ae5f07f112aaeebbfc295f2fe104d8 (patch)
treefafc200035b15084a819707ebbc49dc6162533b2
parent609e1f87f4b242b1f30ccff75d72a863cb1fdb8e (diff)
downloadjquery-ui-d12180d1a5ae5f07f112aaeebbfc295f2fe104d8.tar.gz
jquery-ui-d12180d1a5ae5f07f112aaeebbfc295f2fe104d8.zip
Widget: Tests code cleanup
-rw-r--r--tests/unit/widget/widget_core.js34
-rw-r--r--tests/unit/widget/widget_extend.js5
2 files changed, 19 insertions, 20 deletions
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 41ae8ffb4..0c4142539 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -571,23 +571,23 @@ test( ".widget() - overriden", function() {
test( "._bind() to element (default)", function() {
expect( 12 );
- var self;
+ var that;
$.widget( "ui.testWidget", {
_create: function() {
- self = this;
+ that = this;
this._bind({
keyup: this.keyup,
keydown: "keydown"
});
},
keyup: function( event ) {
- equals( self, this );
- equals( self.element[0], event.currentTarget );
+ equals( that, this );
+ equals( that.element[0], event.currentTarget );
equals( "keyup", event.type );
},
keydown: function( event ) {
- equals( self, this );
- equals( self.element[0], event.currentTarget );
+ equals( that, this );
+ equals( that.element[0], event.currentTarget );
equals( "keydown", event.type );
}
});
@@ -611,23 +611,23 @@ test( "._bind() to element (default)", function() {
test( "._bind() to descendent", function() {
expect( 12 );
- var self;
+ var that;
$.widget( "ui.testWidget", {
_create: function() {
- self = this;
+ that = this;
this._bind( this.element.find( "strong" ), {
keyup: this.keyup,
keydown: "keydown"
});
},
keyup: function( event ) {
- equals( self, this );
- equals( self.element.find( "strong" )[0], event.currentTarget );
+ equals( that, this );
+ equals( that.element.find( "strong" )[0], event.currentTarget );
equals( "keyup", event.type );
},
keydown: function(event) {
- equals( self, this );
- equals( self.element.find( "strong" )[0], event.currentTarget );
+ equals( that, this );
+ equals( that.element.find( "strong" )[0], event.currentTarget );
equals( "keydown", event.type );
}
});
@@ -987,31 +987,31 @@ test( "._trigger() - instance as element", function() {
$( "#widget" ).testWidget().remove();
});
});
-
+
test( "auto-destroy - .remove() on parent", function() {
shouldDestroy( true, function() {
$( "#widget" ).testWidget().parent().remove();
});
});
-
+
test( "auto-destroy - .remove() on child", function() {
shouldDestroy( false, function() {
$( "#widget" ).testWidget().children().remove();
});
});
-
+
test( "auto-destroy - .empty()", function() {
shouldDestroy( false, function() {
$( "#widget" ).testWidget().empty();
});
});
-
+
test( "auto-destroy - .empty() on parent", function() {
shouldDestroy( true, function() {
$( "#widget" ).testWidget().parent().empty();
});
});
-
+
test( "auto-destroy - .detach()", function() {
shouldDestroy( false, function() {
$( "#widget" ).testWidget().detach();
diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/widget_extend.js
index fb78ecfb7..90e686e18 100644
--- a/tests/unit/widget/widget_extend.js
+++ b/tests/unit/widget/widget_extend.js
@@ -6,7 +6,6 @@ test( "$.widget.extend()", function() {
optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
deep1 = { foo: { bar: true } },
- deep1copy = { foo: { bar: true } },
deep2 = { foo: { baz: true }, foo2: document },
deep2copy = { foo: { baz: true }, foo2: document },
deepmerged = { foo: { bar: true, baz: true }, foo2: document },
@@ -93,10 +92,10 @@ test( "$.widget.extend()", function() {
deepEqual( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
deepEqual( options1, options1Copy, "Check if not modified: options1 must not be modified" );
deepEqual( options2, options2Copy, "Check if not modified: options2 must not be modified" );
-
+
var input = {
key: [ 1, 2, 3 ]
- }
+ };
var output = $.widget.extend( {}, input );
deepEqual( input, output, "don't clone arrays" );
input.key[0] = 10;