Skip to content
Permalink
Browse files

Widget: Moved tests out of _tickets into _core.

  • Loading branch information...
scottgonzalez committed Mar 28, 2011
1 parent 6a0cdaa commit 78b17f9d76a552d997aececbf5f848adf906d997
Showing with 88 additions and 92 deletions.
  1. +0 −1 tests/unit/widget/widget.html
  2. +88 −0 tests/unit/widget/widget_core.js
  3. +0 −91 tests/unit/widget/widget_tickets.js
@@ -14,7 +14,6 @@
<script src="../testsuite.js"></script>

<script src="widget_core.js"></script>
<script src="widget_tickets.js"></script>

<script src="../swarminject.js"></script>
</head>
@@ -288,6 +288,45 @@ test( "re-init", function() {
same( actions, [ "optionfoo", "init" ], "correct methods called on re-init with options" );
});

test( "inheritance - options", function() {
// #5830 - Widget: Using inheritance overwrites the base classes options
$.widget( "ui.testWidgetBase", {
options: {
obj: {
key1: "foo",
key2: "bar"
},
arr: [ "testing" ]
}
});

$.widget( "ui.testWidgetExtension", $.ui.testWidgetBase, {
options: {
obj: {
key1: "baz"
},
arr: [ "alpha", "beta" ]
}
});

same( $.ui.testWidgetBase.prototype.options.obj, {
key1: "foo",
key2: "bar"
}, "base class option object not overridden");
same( $.ui.testWidgetBase.prototype.options.arr, [ "testing" ],
"base class option array not overridden");

same( $.ui.testWidgetExtension.prototype.options.obj, {
key1: "baz",
key2: "bar"
}, "extension class option object extends base");
same( $.ui.testWidgetExtension.prototype.options.arr, [ "alpha", "beta" ],
"extension class option array overwrites base");

delete $.ui.testWidgetBase;
delete $.ui.testWidgetExtension;
});

test( "._super()", function() {
expect( 9 );
var instance;
@@ -795,6 +834,55 @@ test( "._trigger() - provide event and ui", function() {
.testWidget( "testEvent" );
});

test( "._trigger() - array as ui", function() {
// #6795 - Widget: handle array arguments to _trigger consistently
expect( 4 );

$.widget( "ui.testWidget", {
_create: function() {},
testEvent: function() {
var ui = {
foo: "bar",
baz: {
qux: 5,
quux: 20
}
};
var extra = {
bar: 5
};
this._trigger( "foo", null, [ ui, extra ] );
}
});
$( "#widget" ).bind( "testwidgetfoo", function( event, ui, extra ) {
same( ui, {
foo: "bar",
baz: {
qux: 5,
quux: 20
}
}, "event: ui hash passed" );
same( extra, {
bar: 5
}, "event: extra argument passed" );
});
$( "#widget" ).testWidget({
foo: function( event, ui, extra ) {
same( ui, {
foo: "bar",
baz: {
qux: 5,
quux: 20
}
}, "callback: ui hash passed" );
same( extra, {
bar: 5
}, "callback: extra argument passed" );
}
})
.testWidget( "testEvent" );
});

test( "._trigger() - instance as element", function() {
expect( 4 );
$.widget( "ui.testWidget", {

This file was deleted.

0 comments on commit 78b17f9

Please sign in to comment.
You can’t perform that action at this time.