From b1fa58cdd4304d8a6ba9909b24fb0e2ba7ba4f1f Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Tue, 18 Mar 2014 17:01:41 -0700 Subject: [PATCH 1/2] - added some unit tests for regression #7086 --- .../default/RecentProjects/unittests.js | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 src/extensions/default/RecentProjects/unittests.js diff --git a/src/extensions/default/RecentProjects/unittests.js b/src/extensions/default/RecentProjects/unittests.js new file mode 100644 index 00000000000..ebc6aad29fd --- /dev/null +++ b/src/extensions/default/RecentProjects/unittests.js @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2014 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define, describe, it, expect, beforeFirst, afterLast, beforeEach, afterEach, runs, brackets, waitsFor, waitsForDone, spyOn */ + +define(function (require, exports, module) { + "use strict"; + + var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"), + FileUtils = brackets.getModule("file/FileUtils"), + KeyEvent = brackets.getModule("utils/KeyEvent"), + _ = brackets.getModule("thirdparty/lodash"); + + describe("Recent Projects", function () { + var extensionPath = FileUtils.getNativeModuleDirectoryPath(module), + testWindow, + $, + CommandManager, + PreferencesManager; + + beforeFirst(function () { + runs(function () { + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { + testWindow = w; + $ = testWindow.$; + CommandManager = testWindow.brackets.test.CommandManager; + PreferencesManager = testWindow.brackets.test.PreferencesManager; + }); + }); + }); + + afterLast(function () { + testWindow = null; + SpecRunnerUtils.closeTestWindow(); + }); + + function openRecentProjectDropDown() { + var flag = false; + CommandManager.execute("recentProjects.toggle"); + testWindow.setTimeout(function () { + flag = true; + }, 100); + + waitsFor(function () { return flag; }); + } + + /* + * This function helps to resolve an issue with sending Keyboard Events in Webkit + */ + function sendKeyEvent(window, k) { + var oEvent = window.document.createEvent('KeyboardEvent'); + + // Chromium Hack + Object.defineProperty(oEvent, 'keyCode', { + get : function () { + return this.keyCodeVal; + } + }); + + Object.defineProperty(oEvent, 'which', { + get : function () { + return this.keyCodeVal; + } + }); + + if (oEvent.initKeyboardEvent) { + oEvent.initKeyboardEvent("keydown", true, true, window.document.defaultView, false, false, false, false, k, k); + } else { + oEvent.initKeyEvent("keydown", true, true, window.document.defaultView, false, false, false, false, k, 0); + } + + oEvent.keyCodeVal = k; + + if (oEvent.keyCode !== k) { + alert("keyCode mismatch " + oEvent.keyCode + "(" + oEvent.which + ")"); + } + + window.document.dispatchEvent(oEvent); + } + + function setupRecentProjectsSpy(howManyProjects) { + spyOn(PreferencesManager, "getViewState").andCallFake(function (prefId) { + if (prefId === "recentProjects") { + // return 5 recent projects + return _.map([1, 2, 3, 4, 5], function (num) { return extensionPath + "/Test-Project-" + num; }); + } else { + return []; + } + }); + } + + describe("UI", function () { + it("should open the recent projects list with only the getting started project", function () { + runs(function () { + openRecentProjectDropDown(); + }); + + runs(function () { + var $dropDown = $("#project-dropdown"); + expect($("#project-dropdown").is(":visible")).toEqual(true); + expect($dropDown.children().length).toEqual(1); + }); + }); + + it("should open the recent project list and show 5 recent projects", function () { + setupRecentProjectsSpy(5); + + runs(function () { + openRecentProjectDropDown(); + }); + + runs(function () { + var $dropDown = $("#project-dropdown"); + expect($dropDown.is(":visible")).toEqual(true); + expect($dropDown.find(".recent-folder-link").length).toEqual(5); + }); + }); + + it("should delete one project from recent project list when delete key is pressed on", function () { + setupRecentProjectsSpy(5); + + runs(function () { + openRecentProjectDropDown(); + }); + + runs(function () { + sendKeyEvent(testWindow, KeyEvent.DOM_VK_DOWN); + sendKeyEvent(testWindow, KeyEvent.DOM_VK_DELETE); + }); + + runs(function () { + var $dropDown = $("#project-dropdown"); + expect($dropDown.is(":visible")).toEqual(true); + expect($dropDown.find(".recent-folder-link").length).toEqual(4); + }); + }); + }); + }); +}); From 9259bc0f8ea923386a66feeb846e0aca10e4d1d9 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Fri, 21 Mar 2014 15:13:23 -0700 Subject: [PATCH 2/2] - removed redundant code and clean up --- .../default/RecentProjects/unittests.js | 43 +++---------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/src/extensions/default/RecentProjects/unittests.js b/src/extensions/default/RecentProjects/unittests.js index ebc6aad29fd..ec2e00e8465 100644 --- a/src/extensions/default/RecentProjects/unittests.js +++ b/src/extensions/default/RecentProjects/unittests.js @@ -65,45 +65,11 @@ define(function (require, exports, module) { waitsFor(function () { return flag; }); } - /* - * This function helps to resolve an issue with sending Keyboard Events in Webkit - */ - function sendKeyEvent(window, k) { - var oEvent = window.document.createEvent('KeyboardEvent'); - - // Chromium Hack - Object.defineProperty(oEvent, 'keyCode', { - get : function () { - return this.keyCodeVal; - } - }); - - Object.defineProperty(oEvent, 'which', { - get : function () { - return this.keyCodeVal; - } - }); - - if (oEvent.initKeyboardEvent) { - oEvent.initKeyboardEvent("keydown", true, true, window.document.defaultView, false, false, false, false, k, k); - } else { - oEvent.initKeyEvent("keydown", true, true, window.document.defaultView, false, false, false, false, k, 0); - } - - oEvent.keyCodeVal = k; - - if (oEvent.keyCode !== k) { - alert("keyCode mismatch " + oEvent.keyCode + "(" + oEvent.which + ")"); - } - - window.document.dispatchEvent(oEvent); - } - function setupRecentProjectsSpy(howManyProjects) { spyOn(PreferencesManager, "getViewState").andCallFake(function (prefId) { if (prefId === "recentProjects") { - // return 5 recent projects - return _.map([1, 2, 3, 4, 5], function (num) { return extensionPath + "/Test-Project-" + num; }); + // return howManyProjects recent projects + return _.map(_.range(1, howManyProjects + 1), function (num) { return extensionPath + "/Test-Project-" + num; }); } else { return []; } @@ -145,8 +111,9 @@ define(function (require, exports, module) { }); runs(function () { - sendKeyEvent(testWindow, KeyEvent.DOM_VK_DOWN); - sendKeyEvent(testWindow, KeyEvent.DOM_VK_DELETE); + var $dropDown = $("#project-dropdown"); + SpecRunnerUtils.simulateKeyEvent(KeyEvent.DOM_VK_DOWN, "keydown", $dropDown[0]); + SpecRunnerUtils.simulateKeyEvent(KeyEvent.DOM_VK_DELETE, "keydown", $dropDown[0]); }); runs(function () {