| Index: remoting/webapp/crd/js/menu_button_unittest.js
|
| diff --git a/remoting/webapp/crd/js/menu_button_unittest.js b/remoting/webapp/crd/js/menu_button_unittest.js
|
| index 1367b0da40b42c62eeae3573814eed7f58b26fe7..5edfa77acdac5857f8a7cc77d0ffe8666eb84dab 100644
|
| --- a/remoting/webapp/crd/js/menu_button_unittest.js
|
| +++ b/remoting/webapp/crd/js/menu_button_unittest.js
|
| @@ -13,8 +13,8 @@ var onHide = null;
|
| /** @type {remoting.MenuButton} */
|
| var menuButton = null;
|
|
|
| -module('MenuButton', {
|
| - setup: function() {
|
| +QUnit.module('MenuButton', {
|
| + beforeEach: function() {
|
| var fixture = document.getElementById('qunit-fixture');
|
| fixture.innerHTML =
|
| '<span class="menu-button" id="menu-button-container">' +
|
| @@ -30,28 +30,29 @@ module('MenuButton', {
|
| /** @type {function():void} */ (onShow),
|
| /** @type {function():void} */ (onHide));
|
| },
|
| - teardown: function() {
|
| + afterEach: function() {
|
| onShow = null;
|
| onHide = null;
|
| menuButton = null;
|
| }
|
| });
|
|
|
| -test('should display on click', function() {
|
| +QUnit.test('should display on click', function() {
|
| var menu = menuButton.menu();
|
| - ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| + QUnit.ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| menuButton.button().click();
|
| - ok(menu.offsetWidth != 0 && menu.offsetHeight != 0);
|
| + QUnit.ok(menu.offsetWidth != 0 && menu.offsetHeight != 0);
|
| });
|
|
|
| -test('should dismiss when the menu is clicked', function() {
|
| +QUnit.test('should dismiss when the menu is clicked', function() {
|
| var menu = menuButton.menu();
|
| menuButton.button().click();
|
| menu.click();
|
| - ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| + QUnit.ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| });
|
|
|
| -test('should dismiss when anything outside the menu is clicked', function() {
|
| +QUnit.test('should dismiss when anything outside the menu is clicked',
|
| + function() {
|
| var menu = menuButton.menu();
|
| menuButton.button().click();
|
| var x = menu.offsetRight + 1;
|
| @@ -59,36 +60,36 @@ test('should dismiss when anything outside the menu is clicked', function() {
|
| var notMenu = document.elementFromPoint(x, y);
|
| base.debug.assert(notMenu != menu);
|
| notMenu.click();
|
| - ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| + QUnit.ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| });
|
|
|
| -test('should dismiss when menu item is clicked', function() {
|
| +QUnit.test('should dismiss when menu item is clicked', function() {
|
| var menu = menuButton.menu();
|
| menuButton.button().click();
|
| var element = document.getElementById('menu-option-1');
|
| element.click();
|
| - ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| + QUnit.ok(menu.offsetWidth == 0 && menu.offsetHeight == 0);
|
| });
|
|
|
| -test('should invoke callbacks', function() {
|
| - ok(!onShow.called);
|
| +QUnit.test('should invoke callbacks', function() {
|
| + QUnit.ok(!onShow.called);
|
| menuButton.button().click();
|
| - ok(onShow.called);
|
| - ok(!onHide.called);
|
| + QUnit.ok(onShow.called);
|
| + QUnit.ok(!onHide.called);
|
| menuButton.menu().click();
|
| - ok(onHide.called);
|
| + QUnit.ok(onHide.called);
|
| });
|
|
|
| -test('select method should set/unset background image', function() {
|
| +QUnit.test('select method should set/unset background image', function() {
|
| var element = document.getElementById('menu-option-1');
|
| var style = window.getComputedStyle(element);
|
| - ok(style.backgroundImage == 'none');
|
| + QUnit.ok(style.backgroundImage == 'none');
|
| remoting.MenuButton.select(element, true);
|
| style = window.getComputedStyle(element);
|
| - ok(style.backgroundImage != 'none');
|
| + QUnit.ok(style.backgroundImage != 'none');
|
| remoting.MenuButton.select(element, false);
|
| style = window.getComputedStyle(element);
|
| - ok(style.backgroundImage == 'none');
|
| + QUnit.ok(style.backgroundImage == 'none');
|
| });
|
|
|
| }());
|
|
|