Skip to content
Permalink
Browse files

Tabs: simplified tests a bit, found bug by that - fixed as well as tw…

…o other unreported bugs
  • Loading branch information
Klaus Hartl
Klaus Hartl committed Jan 31, 2009
1 parent 82cf103 commit 195838c443502b5b52c00b889e9b7b0a4af57d63
Showing with 36 additions and 55 deletions.
  1. +27 −47 tests/unit/tabs/tabs.js
  2. +9 −8 ui/ui.tabs.js
@@ -22,23 +22,12 @@ var defaults = {

var el;

// need to wait a bit for the pseudo animation...
function defer(defered, ms) {
var queue = defer.queue || (defer.queue = []);
if (!queue.length) stop();
queue.push(defered);
setTimeout(function() {
queue.shift()();
if (!queue.length) start();
}, ms || 100);
}

module('tabs');

test('init', function() {
expect(9);

var el = $('#tabs1').tabs();
el = $('#tabs1').tabs();

ok(true, '.tabs() called on element');
ok( el.is('.ui-tabs.ui-widget.ui-widget-content.ui-corner-all'), 'attach classes to container');
@@ -55,7 +44,7 @@ module('tabs');
test('destroy', function() {
expect(5);

var el = $('#tabs1').tabs();
el = $('#tabs1').tabs();
el.tabs('destroy');

ok( el.is(':not(.ui-tabs, .ui-widget, .ui-widget-content, .ui-corner-all)'), 'remove classes from container');
@@ -67,7 +56,7 @@ module('tabs');
});

test("defaults", function() {
el = $('#tabs1 > ul').tabs();
el = $('#tabs1').tabs();
$.each(defaults, function(key, val) {
var actual = el.data(key + '.tabs'), expected = val;
same(actual, expected, key);
@@ -83,7 +72,7 @@ module('tabs');
test('remove', function() {
expect(4);

var el = $('#tabs1').tabs();
el = $('#tabs1').tabs();

el.tabs('remove', 0);
equals(el.tabs('length'), 2, 'remove tab');
@@ -167,7 +156,7 @@ module('tabs: Options');
test('selected: null', function() {
expect(2);

var el = $('#tabs1');
el = $('#tabs1');

el.tabs({ selected: null });
equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be selected' );
@@ -178,7 +167,7 @@ module('tabs: Options');
test('deselectable: true', function() {
expect(7);

var el = $('#tabs1 > ul');
el = $('#tabs1');

el.tabs({ deselectable: true });
equals( el.data('deselectable.tabs'), true, 'option set' );
@@ -191,41 +180,39 @@ module('tabs: Options');

el.tabs('select', 1);
equals( $('li.ui-tabs-deselectable', el).length, 0, 'class "ui-tabs-deselectable" not attached');
defer(function() {
equals( $('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden' );
});
equals( $('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden' );

});

test('cookie', function() {
expect(6);

var el = $('#tabs1 > ul');
var cookieName = 'ui-tabs-' + $.data(el[0]);
el = $('#tabs1');
var cookieName = 'tabs_test', cookieObj = { name: cookieName };
$.cookie(cookieName, null); // blank state
var cookie = function() {
return parseInt($.cookie(cookieName), 10);
};

el.tabs({ cookie: {} });
equals(cookie(), 0, 'initial cookie value, no cookie given');
el.tabs({ cookie: cookieObj });
equals(cookie(), 0, 'initial cookie value');

el.tabs('destroy');
el.tabs({ selected: 1, cookie: {} });
equals(cookie(), 1, 'initial cookie value, given selected');
el.tabs({ selected: 1, cookie: cookieObj });
equals(cookie(), 1, 'initial cookie value, from selected property');

el.tabs('select', 2);
equals(cookie(), 2, 'cookie value after tabs select');

equals(cookie(), 2, 'cookie value updated after select');
el.tabs('destroy');
$.cookie(cookieName, 1);
el.tabs({ cookie: {} });
el.tabs({ cookie: cookieObj });
equals(cookie(), 1, 'initial cookie value, from existing cookie');

el.tabs('destroy');
el.tabs({ cookie: {}, deselectable: true });
el.tabs({ cookie: cookieObj, deselectable: true });
el.tabs('select', 0);
equals(cookie(), -1, 'cookie value for all unselected tabs');
equals(cookie(), -1, 'cookie value for all tabs unselected');

el.tabs('destroy');
ok($.cookie(cookieName) === null, 'erase cookie after destroy');
@@ -238,15 +225,13 @@ module('tabs: Tickets');
test('id containing colon, #2715', function() { // http://ui.jquery.com/bugs/ticket/2715
expect(4);

var el = $('#tabs2 > ul').tabs();
el = $('#tabs2').tabs();
ok( $('div.ui-tabs-panel:eq(0)', '#tabs2').is(':visible'), 'first panel should be visible' );
ok( $('div.ui-tabs-panel:eq(1)', '#tabs2').is(':hidden'), 'second panel should be hidden' );

el.tabs('select', 1).tabs('select', 0);
defer(function() {
ok( $('div.ui-tabs-panel:eq(0)', '#tabs2').is(':visible'), 'first panel should be visible' );
ok( $('div.ui-tabs-panel:eq(1)', '#tabs2').is(':hidden'), 'second panel should be hidden' );
});
ok( $('div.ui-tabs-panel:eq(0)', '#tabs2').is(':visible'), 'first panel should be visible' );
ok( $('div.ui-tabs-panel:eq(1)', '#tabs2').is(':hidden'), 'second panel should be hidden' );

});

@@ -258,26 +243,21 @@ module('tabs: Tickets');
};
var expected = inlineStyle('height');

var el = $('#tabs2').tabs();
el = $('#tabs2').tabs();
equals(inlineStyle('height'), expected, 'init should not remove inline style');

el.tabs('select', 1);
defer(function() {
equals(inlineStyle('height'), expected, 'show tab should not remove inline style');
equals(inlineStyle('height'), expected, 'show tab should not remove inline style');

el.tabs('select', 0);
defer(function() {
equals(inlineStyle('height'), expected, 'hide tab should not remove inline style');
});

});
el.tabs('select', 0);
equals(inlineStyle('height'), expected, 'hide tab should not remove inline style');

});

test('Ajax tab with url containing a fragment identifier fails to load, #3627', function() { // http://ui.jquery.com/bugs/ticket/3627
expect(1);

var el = $('#tabs2').tabs();
el = $('#tabs2').tabs();

equals( $('a:eq(2)', el).data('load.tabs'), 'test.html', 'should ignore fragment identifier' );

@@ -41,7 +41,7 @@ $.widget("ui.tabs", {
var cookie = this.cookie || (this.cookie = this.options.cookie.name || 'ui-tabs-' + $.data(this.list[0]));
return $.cookie.apply(null, [cookie].concat($.makeArray(arguments)));
},

_ui: function(tab, panel) {
return {
tab: tab,
@@ -88,7 +88,7 @@ $.widget("ui.tabs", {

// invalid tab href
else
o.disabled.push(i + 1);
o.disabled.push(i);
});

// initialization from scratch
@@ -255,7 +255,6 @@ $.widget("ui.tabs", {

// attach tab event handler, unbind to avoid duplicates from former tabifying...
this.$tabs.unbind('.tabs').bind(o.event + '.tabs', function() {

var $li = $(this).parents('li:eq(0)'),
$hide = self.$panels.filter(':visible'),
$show = $(self._sanitizeSelector(this.hash));
@@ -334,12 +333,13 @@ $.widget("ui.tabs", {
if (o.event != 'click') this.$tabs.bind('click.tabs', function(){return false;});

},

destroy: function() {
var o = this.options;

this.element
.removeClass('ui-tabs ui-widget ui-widget-content ui-corner-all');
this.element.unbind('.tabs')
.removeClass('ui-tabs ui-widget ui-widget-content ui-corner-all')
.removeData('tabs');

this.list.unbind('.tabs')
.removeClass('ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all')
@@ -364,6 +364,7 @@ $.widget("ui.tabs", {
'ui-corner-top ' +
'ui-tabs-selected ' +
'ui-state-active ' +
'ui-state-hover ' +
'ui-tabs-deselectable ' +
'ui-state-disabled ' +
'ui-tabs-panel ' +
@@ -479,7 +480,7 @@ $.widget("ui.tabs", {

// no remote or from cache - just finish with callback
// TODO in any case: insert cancel running load here..!

if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
callback();
return;
@@ -540,7 +541,7 @@ $.widget("ui.tabs", {
url: function(index, url) {
this.$tabs.eq(index).removeData('cache.tabs').data('load.tabs', url);
},

length: function() {
return this.$tabs.length;
}

0 comments on commit 195838c

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