diff --git a/src/extensions/default/CSSCodeHints/unittests.js b/src/extensions/default/CSSCodeHints/unittests.js
index 754ec03d039..67da96a8c64 100644
--- a/src/extensions/default/CSSCodeHints/unittests.js
+++ b/src/extensions/default/CSSCodeHints/unittests.js
@@ -28,9 +28,6 @@ define(function (require, exports, module) {
"use strict";
var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
- CodeHintManager = brackets.getModule("editor/CodeHintManager"),
- DocumentManager = brackets.getModule("document/DocumentManager"),
- FileUtils = brackets.getModule("file/FileUtils"),
testContentCSS = require("text!unittest-files/regions.css"),
testContentHTML = require("text!unittest-files/region-template.html"),
CSSCodeHints = require("main");
@@ -481,7 +478,7 @@ define(function (require, exports, module) {
var expectedString = "shape-inside:polygon()";
testEditor.setCursorPos({ line: 1, ch: 15 }); // after shape-inside
- var hintList = expectHints(CSSCodeHints.cssPropHintProvider);
+ expectHints(CSSCodeHints.cssPropHintProvider);
selectHint(CSSCodeHints.cssPropHintProvider, "polygon()");
expect(testDocument.getLine(1).length).toBe(expectedString.length);
expect(testDocument.getLine(1)).toBe(expectedString);
diff --git a/src/extensions/default/HTMLCodeHints/unittests.js b/src/extensions/default/HTMLCodeHints/unittests.js
index 0a0e5cc55a0..1e117716df1 100644
--- a/src/extensions/default/HTMLCodeHints/unittests.js
+++ b/src/extensions/default/HTMLCodeHints/unittests.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone */
+/*global define, describe, it, xit, expect, beforeEach, afterEach, $, brackets */
define(function (require, exports, module) {
"use strict";
@@ -31,7 +31,6 @@ define(function (require, exports, module) {
// Modules from the SpecRunner window
var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
Editor = brackets.getModule("editor/Editor").Editor,
- CodeHintManager = brackets.getModule("editor/CodeHintManager"),
HTMLCodeHints = require("main");
describe("HTML Code Hinting", function () {
diff --git a/src/extensions/default/HtmlEntityCodeHints/unittests.js b/src/extensions/default/HtmlEntityCodeHints/unittests.js
index 268743ccf4a..13ee46d4545 100644
--- a/src/extensions/default/HtmlEntityCodeHints/unittests.js
+++ b/src/extensions/default/HtmlEntityCodeHints/unittests.js
@@ -23,15 +23,13 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone */
+/*global define, describe, it, expect, beforeEach, afterEach, brackets */
define(function (require, exports, module) {
"use strict";
// Modules from the SpecRunner window
var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
- Editor = brackets.getModule("editor/Editor").Editor,
- CodeHintManager = brackets.getModule("editor/CodeHintManager"),
HTMLEntityHints = require("main").SpecialCharHints,
defaultContent = require("text!unittest-files/default.html");
diff --git a/src/extensions/default/InlineColorEditor/unittests.js b/src/extensions/default/InlineColorEditor/unittests.js
index d97dd065dbb..0f5733fb51b 100644
--- a/src/extensions/default/InlineColorEditor/unittests.js
+++ b/src/extensions/default/InlineColorEditor/unittests.js
@@ -23,16 +23,13 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, $, brackets, waitsForDone, spyOn, tinycolor, KeyEvent */
+/*global define, describe, it, expect, beforeEach, afterEach, waits, runs, $, brackets, waitsForDone, spyOn, tinycolor */
define(function (require, exports, module) {
"use strict";
// Modules from the SpecRunner window
var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
- Editor = brackets.getModule("editor/Editor").Editor,
- DocumentManager = brackets.getModule("document/DocumentManager"),
- Strings = brackets.getModule("strings"),
KeyEvent = brackets.getModule("utils/KeyEvent"),
testContentCSS = require("text!unittest-files/unittests.css"),
testContentHTML = require("text!unittest-files/unittests.html"),
diff --git a/src/extensions/default/InlineTimingFunctionEditor/unittests.js b/src/extensions/default/InlineTimingFunctionEditor/unittests.js
index cc85c37a23b..eaec163df19 100644
--- a/src/extensions/default/InlineTimingFunctionEditor/unittests.js
+++ b/src/extensions/default/InlineTimingFunctionEditor/unittests.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, $, brackets, waitsForDone, spyOn, KeyEvent */
+/*global define, describe, it, expect, beforeEach, afterEach, runs, $, brackets, waitsForDone */
define(function (require, exports, module) {
"use strict";
diff --git a/src/extensions/default/JSLint/unittests.js b/src/extensions/default/JSLint/unittests.js
index e0197beb8bc..9b8d2a3e3a7 100644
--- a/src/extensions/default/JSLint/unittests.js
+++ b/src/extensions/default/JSLint/unittests.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, brackets, waitsForDone, spyOn */
+/*global define, describe, it, expect, beforeEach, afterEach, runs, brackets, waitsForDone, spyOn */
define(function (require, exports, module) {
"use strict";
diff --git a/src/extensions/default/JavaScriptCodeHints/unittests.js b/src/extensions/default/JavaScriptCodeHints/unittests.js
index 0b960bbb1fd..ccce4556740 100644
--- a/src/extensions/default/JavaScriptCodeHints/unittests.js
+++ b/src/extensions/default/JavaScriptCodeHints/unittests.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone, beforeFirst, afterLast, spyOn */
+/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, brackets, waitsForDone, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
@@ -30,13 +30,11 @@ define(function (require, exports, module) {
var Commands = brackets.getModule("command/Commands"),
CommandManager = brackets.getModule("command/CommandManager"),
DocumentManager = brackets.getModule("document/DocumentManager"),
- Editor = brackets.getModule("editor/Editor").Editor,
EditorManager = brackets.getModule("editor/EditorManager"),
FileSystem = brackets.getModule("filesystem/FileSystem"),
FileUtils = brackets.getModule("file/FileUtils"),
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
- UnitTestReporter = brackets.getModule("test/UnitTestReporter"),
JSCodeHints = require("main"),
Preferences = require("Preferences"),
ScopeManager = require("ScopeManager"),
@@ -270,7 +268,7 @@ define(function (require, exports, module) {
* @param {string} hintSelection - the hint to select
*/
function selectHint(provider, hintObj, hintSelection) {
- var hintList = expectHints(provider);
+ expectHints(provider);
_waitForHints(hintObj, function (hintList) {
expect(hintList).toBeTruthy();
var index = findHint(hintList, hintSelection);
@@ -315,8 +313,6 @@ define(function (require, exports, module) {
* editor is expected to stay in the same file, then file may be omitted.
*/
function editorJumped(expectedLocation) {
- var oldLocation = testEditor.getCursorPos();
-
var jumpPromise = JSCodeHints.handleJumpToDefinition();
@@ -937,7 +933,7 @@ define(function (require, exports, module) {
var testPos = { line: 96, ch: 33 };
testEditor.setCursorPos(testPos);
- var hintObj = expectHints(JSCodeHints.jsHintProvider);
+ expectHints(JSCodeHints.jsHintProvider);
runs(function () {
expectParameterHint([], 0);
});
diff --git a/src/extensions/default/JavaScriptQuickEdit/unittests.js b/src/extensions/default/JavaScriptQuickEdit/unittests.js
index 14f6d8fd8bb..f75cfa56c5c 100644
--- a/src/extensions/default/JavaScriptQuickEdit/unittests.js
+++ b/src/extensions/default/JavaScriptQuickEdit/unittests.js
@@ -75,9 +75,7 @@ define(function (require, exports, module) {
* @param {?boolean} expectInline Use false to verify that an inline editor should not be opened. Omit otherwise.
*/
var _initInlineTest = function (openFile, openOffset, expectInline, workingSet) {
- var allFiles,
- inlineOpened = null,
- spec = this;
+ var spec = this;
workingSet = workingSet || [];
expectInline = (expectInline !== undefined) ? expectInline : true;
diff --git a/src/extensions/default/QuickView/unittests.js b/src/extensions/default/QuickView/unittests.js
index 8ee493cee13..9daebaf02ae 100644
--- a/src/extensions/default/QuickView/unittests.js
+++ b/src/extensions/default/QuickView/unittests.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone */
+/*global define, describe, it, expect, beforeEach, runs, brackets, waitsForDone */
define(function (require, exports, module) {
"use strict";
diff --git a/src/extensions/default/RecentProjects/unittests.js b/src/extensions/default/RecentProjects/unittests.js
index 41cd367222f..9eb60d49e11 100644
--- a/src/extensions/default/RecentProjects/unittests.js
+++ b/src/extensions/default/RecentProjects/unittests.js
@@ -22,7 +22,7 @@
*/
/*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 */
+/*global define, describe, it, expect, beforeFirst, afterLast, runs, brackets, waitsFor, spyOn */
define(function (require, exports, module) {
"use strict";
diff --git a/src/extensions/default/StaticServer/unittests.js b/src/extensions/default/StaticServer/unittests.js
index d94163c9642..ac657f3a5ac 100644
--- a/src/extensions/default/StaticServer/unittests.js
+++ b/src/extensions/default/StaticServer/unittests.js
@@ -23,23 +23,19 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, waitsForDone, runs, $, brackets, waitsForDone, spyOn, tinycolor, KeyEvent */
+/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, waitsForDone, runs, $, brackets, waitsForDone, spyOn */
define(function (require, exports, module) {
"use strict";
var main = require("main"),
- NodeConnection = brackets.getModule("utils/NodeConnection"),
FileUtils = brackets.getModule("file/FileUtils"),
- SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
StaticServer = require("StaticServer");
var testFolder = FileUtils.getNativeModuleDirectoryPath(module) + "/unittest-files";
var CONNECT_TIMEOUT = 20000;
-
- var LOCALHOST_PORT_PARSER_RE = /http:\/\/127\.0\.0\.1:(\d+)\//;
-
+
function makeBaseUrl(serverInfo) {
return "http://" + serverInfo.address + ":" + serverInfo.port;
}
@@ -504,9 +500,6 @@ define(function (require, exports, module) {
waitsFor(function () { return text; }, "waiting for text from server");
runs(function () {
- var expectedWarning = "writeFilteredResponse: Missing callback for " +
- path + "/index.txt. This command must only be called after a requestFilter event has fired for a path.";
-
// verify console warning
expect(logs.length).toBe(2);
@@ -608,7 +601,6 @@ define(function (require, exports, module) {
fileRelPath = "subdir/index.html",
file1Path = projectPath + fileRelPath,
file2Path = outsidePath + fileRelPath,
- file1FileUrl = encodeURI(fileProtocol + projectPath + fileRelPath),
file2FileUrl = encodeURI(fileProtocol + outsidePath + fileRelPath),
file1ServerUrl = config.baseUrl + encodeURI(fileRelPath),
server = new StaticServer(config);
diff --git a/src/extensions/default/UrlCodeHints/unittests.js b/src/extensions/default/UrlCodeHints/unittests.js
index 62dbbe7b040..abfb0964250 100644
--- a/src/extensions/default/UrlCodeHints/unittests.js
+++ b/src/extensions/default/UrlCodeHints/unittests.js
@@ -23,15 +23,13 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, beforeFirst, afterLast, waitsFor, runs, $, brackets, waitsForDone */
+/*global define, describe, it, expect, beforeEach, afterEach, beforeFirst, afterLast, waitsFor, runs, brackets, waitsForDone */
define(function (require, exports, module) {
"use strict";
// Modules from the SpecRunner window
var DocumentManager = brackets.getModule("document/DocumentManager"),
- Editor = brackets.getModule("editor/Editor").Editor,
- EditorManager = brackets.getModule("editor/EditorManager"),
FileUtils = brackets.getModule("file/FileUtils"),
SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
UrlCodeHints = require("main");
@@ -42,7 +40,6 @@ define(function (require, exports, module) {
var extensionPath = FileUtils.getNativeModuleDirectoryPath(module),
testHtmlPath = extensionPath + "/testfiles/test.html",
testCssPath = extensionPath + "/testfiles/subfolder/test.css",
- testWindow,
testDocument,
testEditor,
hintsObj;
diff --git a/src/extensions/default/WebPlatformDocs/unittests.js b/src/extensions/default/WebPlatformDocs/unittests.js
index 2823625b28d..893705ca6a8 100644
--- a/src/extensions/default/WebPlatformDocs/unittests.js
+++ b/src/extensions/default/WebPlatformDocs/unittests.js
@@ -193,7 +193,6 @@ define(function (require, exports, module) {
),
viewer = new InlineDocsViewer(prop, details),
$a,
- title,
href,
$links = viewer.$htmlContent.find("a:not(.close)");
diff --git a/src/extensions/samples/circular_dependency_test/main.js b/src/extensions/samples/circular_dependency_test/main.js
index 52e69cf1cf1..70eabd07ccb 100644
--- a/src/extensions/samples/circular_dependency_test/main.js
+++ b/src/extensions/samples/circular_dependency_test/main.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $ */
+/*global define */
define(function (require, exports, module) {
"use strict";
diff --git a/src/extensions/samples/circular_dependency_test/secondary.js b/src/extensions/samples/circular_dependency_test/secondary.js
index ef3f4bc1bfd..75b0f95f3a8 100644
--- a/src/extensions/samples/circular_dependency_test/secondary.js
+++ b/src/extensions/samples/circular_dependency_test/secondary.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, window */
+/*global define, window */
define(function (require, exports, module) {
"use strict";
diff --git a/test/BootstrapReporterView.js b/test/BootstrapReporterView.js
index cff76dd19f8..37eab85011c 100644
--- a/test/BootstrapReporterView.js
+++ b/test/BootstrapReporterView.js
@@ -22,14 +22,11 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50, regexp: true, forin: true */
-/*global jasmine, $, define, document, require */
+/*global $, define, document */
define(function (require, exports, module) {
'use strict';
var _ = require("thirdparty/lodash");
-
- var UrlParams = require("utils/UrlParams").UrlParams,
- SpecRunnerUtils = require("spec/SpecRunnerUtils");
var BootstrapReporterView = function (doc, reporter) {
doc = doc || document;
@@ -67,9 +64,7 @@ define(function (require, exports, module) {
$badgePassed = $(''),
$badgeFailed = $(''),
$anchor = $('' + suiteName + '').append($badgeAll).append($badgePassed).append($badgeFailed),
- $listItem = $('').append($anchor),
- self = this,
- active;
+ $listItem = $('').append($anchor);
this._topLevelSuiteMap[suiteName] = {
$badgeAll: $badgeAll,
@@ -106,8 +101,7 @@ define(function (require, exports, module) {
};
BootstrapReporterView.prototype._handleRunnerStart = function (event, reporter) {
- var topLevelData,
- self = this;
+ var topLevelData;
// create top level suite list navigation
this._createSuiteList(reporter.suites, reporter.sortedNames, reporter.totalSpecCount);
diff --git a/test/SpecRunner.js b/test/SpecRunner.js
index c9d8e4d169a..be2eaf25976 100644
--- a/test/SpecRunner.js
+++ b/test/SpecRunner.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global require, define, $, waitsForDone, beforeEach, afterEach, beforeFirst, afterLast, jasmine, brackets */
+/*global require, define, $, beforeEach, afterEach, beforeFirst, afterLast, jasmine, brackets */
// Set the baseUrl to brackets/src
require.config({
@@ -40,28 +40,29 @@ require.config({
define(function (require, exports, module) {
'use strict';
-
- var _ = require("thirdparty/lodash");
-
+
// Utility dependencies
var AppInit = require("utils/AppInit"),
- CodeHintManager = require("editor/CodeHintManager"),
- Global = require("utils/Global"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
ExtensionLoader = require("utils/ExtensionLoader"),
Async = require("utils/Async"),
FileSystem = require("filesystem/FileSystem"),
FileUtils = require("file/FileUtils"),
- Menus = require("command/Menus"),
UrlParams = require("utils/UrlParams").UrlParams,
UnitTestReporter = require("test/UnitTestReporter").UnitTestReporter,
NodeConnection = require("utils/NodeConnection"),
- NodeDomain = require("utils/NodeDomain"),
BootstrapReporterView = require("test/BootstrapReporterView").BootstrapReporterView,
- ColorUtils = require("utils/ColorUtils"),
- PreferencesBase = require("preferences/PreferencesBase"),
NativeApp = require("utils/NativeApp");
+ // Load modules for later use
+ require("thirdparty/lodash");
+ require("editor/CodeHintManager");
+ require("utils/Global");
+ require("command/Menus");
+ require("utils/NodeDomain");
+ require("utils/ColorUtils");
+ require("preferences/PreferencesBase");
+
// Load modules that self-register and just need to get included in the test-runner window
require("document/ChangedDocumentTracker");
@@ -98,7 +99,6 @@ define(function (require, exports, module) {
reporter,
reporterView,
_writeResults = new $.Deferred(),
- _writeResultsPromise = _writeResults.promise(),
resultsPath;
/**
diff --git a/test/TestPreferencesImpl.js b/test/TestPreferencesImpl.js
index 30f4987f2a3..8147abdfe6a 100644
--- a/test/TestPreferencesImpl.js
+++ b/test/TestPreferencesImpl.js
@@ -22,7 +22,7 @@
*/
-/*global define, $, localStorage, brackets, console */
+/*global define, $ */
/**
* Generates the fully configured preferences systems used IN TESTING. This configuration does
@@ -105,4 +105,4 @@ define(function (require, exports, module) {
exports.reloadUserPrefs = _reloadUserPrefs;
exports.STATE_FILENAME = STATE_FILENAME;
exports.SETTINGS_FILENAME = SETTINGS_FILENAME;
-});
\ No newline at end of file
+});
diff --git a/test/UnitTestReporter.js b/test/UnitTestReporter.js
index 2945c1c62cb..b48d7c8f0c0 100644
--- a/test/UnitTestReporter.js
+++ b/test/UnitTestReporter.js
@@ -37,9 +37,11 @@ define(function (require, exports, module) {
"use strict";
var SpecRunnerUtils = require("spec/SpecRunnerUtils"),
- Global = require("utils/Global"),
BuildInfoUtils = require("utils/BuildInfoUtils");
+ // make sure the global brackets variable is loaded
+ require("utils/Global");
+
var activeReporter;
/**
@@ -428,4 +430,4 @@ define(function (require, exports, module) {
exports.UnitTestReporter = UnitTestReporter;
exports.getActiveReporter = getActiveReporter;
-});
\ No newline at end of file
+});
diff --git a/test/perf/Performance-test.js b/test/perf/Performance-test.js
index d63c10d1a75..8c1f20fff61 100644
--- a/test/perf/Performance-test.js
+++ b/test/perf/Performance-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, afterEach, it, runs, waitsFor, waitsForDone, expect, brackets */
+/*global define, describe, beforeEach, afterEach, it, runs, waitsForDone */
// TODO: Eventually we should have a brackets performance test suite that is separate from the unit tests
@@ -114,4 +114,4 @@ define(function (require, exports, module) {
openFile("jquery.mobile-1.1.0.min.js");
});
});
-});
\ No newline at end of file
+});
diff --git a/test/spec/Async-test.js b/test/spec/Async-test.js
index b6b0d78c6ca..d814487c935 100644
--- a/test/spec/Async-test.js
+++ b/test/spec/Async-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, afterEach, it, runs, waits, waitsFor, waitsForDone, waitsForFail, expect, $, jasmine */
+/*global define, describe, beforeEach, it, runs, waitsFor, waitsForDone, waitsForFail, expect, $ */
define(function (require, exports, module) {
"use strict";
@@ -663,4 +663,4 @@ define(function (require, exports, module) {
});
});
});
-});
\ No newline at end of file
+});
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
index 032eb74a70a..d18469a75ac 100644
--- a/test/spec/CSSUtils-test.js
+++ b/test/spec/CSSUtils-test.js
@@ -22,13 +22,12 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, xdescribe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, beforeFirst, afterLast */
+/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
- var Async = require("utils/Async"),
- FileSystem = require("filesystem/FileSystem"),
+ var FileSystem = require("filesystem/FileSystem"),
FileUtils = require("file/FileUtils"),
CSSUtils = require("language/CSSUtils"),
HTMLUtils = require("language/HTMLUtils"),
@@ -66,9 +65,7 @@ define(function (require, exports, module) {
if (fileEntry) {
spec.addMatchers({toMatchSelector: toMatchSelector});
-
- var doneLoading = false;
-
+
runs(function () {
FileUtils.readAsText(fileEntry)
.done(function (text) {
diff --git a/test/spec/CodeHint-test.js b/test/spec/CodeHint-test.js
index 4769a032988..fd0abb6e54b 100644
--- a/test/spec/CodeHint-test.js
+++ b/test/spec/CodeHint-test.js
@@ -22,14 +22,13 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, afterEach, it, runs, waits, waitsForDone, expect, $, beforeFirst, afterLast */
+/*global define, describe, beforeEach, afterEach, it, runs, waitsForDone, expect, $, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
// Load dependent modules
- var HTMLUtils = require("language/HTMLUtils"),
- SpecRunnerUtils = require("spec/SpecRunnerUtils"),
+ var SpecRunnerUtils = require("spec/SpecRunnerUtils"),
KeyEvent = require("utils/KeyEvent"),
Commands = require("command/Commands"),
EditorManager, // loaded from brackets.test
@@ -38,8 +37,7 @@ define(function (require, exports, module) {
KeyBindingManager;
var testPath = SpecRunnerUtils.getTestPath("/spec/CodeHint-test-files"),
- testWindow,
- initCodeHintTest;
+ testWindow;
describe("CodeHintManager", function () {
this.category = "integration";
@@ -228,7 +226,7 @@ define(function (require, exports, module) {
// doesn't matter what was inserted, but line should be different
var newPos = editor.getCursorPos();
- lineAfter = editor.document.getLine(pos.line);
+ lineAfter = editor.document.getLine(newPos.line);
expect(lineBefore).not.toEqual(lineAfter);
// and popup should auto-close
diff --git a/test/spec/CodeHintUtils-test.js b/test/spec/CodeHintUtils-test.js
index 8c1dfd0df9d..163eac1cb50 100644
--- a/test/spec/CodeHintUtils-test.js
+++ b/test/spec/CodeHintUtils-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define: false, describe: false, beforeEach: false, afterEach: false, it: false, runs: false, waitsFor: false, expect: false, $: false */
+/*global define, describe, beforeEach, afterEach, it, expect, $ */
define(function (require, exports, module) {
'use strict';
diff --git a/test/spec/CodeInspection-test.js b/test/spec/CodeInspection-test.js
index 82e015523bd..ddec47bb212 100644
--- a/test/spec/CodeInspection-test.js
+++ b/test/spec/CodeInspection-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, beforeFirst, afterEach, afterLast, waitsFor, waits, runs, brackets, waitsForDone, spyOn, xit, jasmine */
+/*global define, describe, it, expect, beforeEach, beforeFirst, afterEach, afterLast, waits, runs, waitsForDone, spyOn */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/CommandManager-test.js b/test/spec/CommandManager-test.js
index 3b83d56fee9..da945aaca8e 100644
--- a/test/spec/CommandManager-test.js
+++ b/test/spec/CommandManager-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, afterEach, it, runs, waitsFor, expect, brackets, $ */
+/*global define, describe, beforeEach, afterEach, it, expect, $ */
define(function (require, exports, module) {
'use strict';
diff --git a/test/spec/Document-test.js b/test/spec/Document-test.js
index 08d01434860..3379a3efcb4 100644
--- a/test/spec/Document-test.js
+++ b/test/spec/Document-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, jasmine, describe, beforeFirst, afterLast, beforeEach, afterEach, it, runs, waitsFor, expect, waitsForDone */
+/*global define, jasmine, describe, beforeFirst, afterLast, beforeEach, afterEach, it, runs, expect, waitsForDone */
define(function (require, exports, module) {
'use strict';
@@ -259,7 +259,7 @@ define(function (require, exports, module) {
describe("Dirty flag and undo", function () {
- var promise, doc;
+ var promise;
it("should not fire dirtyFlagChange when created", function () {
var dirtyFlagListener = jasmine.createSpy();
diff --git a/test/spec/DocumentCommandHandlers-test.js b/test/spec/DocumentCommandHandlers-test.js
index c8e85d545da..a6cf1dd75e3 100644
--- a/test/spec/DocumentCommandHandlers-test.js
+++ b/test/spec/DocumentCommandHandlers-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, describe, beforeEach, afterEach, it, runs, waits, waitsFor, expect, brackets, waitsForDone, waitsForFail, spyOn, beforeFirst, afterLast, jasmine, xit */
+/*global define, describe, beforeEach, afterEach, it, runs, expect, brackets, waitsForDone, waitsForFail, spyOn, beforeFirst, afterLast, jasmine, xit */
define(function (require, exports, module) {
'use strict';
@@ -38,9 +38,7 @@ define(function (require, exports, module) {
FileViewController, // loaded from brackets.test
EditorManager, // loaded from brackets.test
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
- FileUtils = require("file/FileUtils"),
- StringUtils = require("utils/StringUtils"),
- Editor = require("editor/Editor");
+ FileUtils = require("file/FileUtils");
describe("DocumentCommandHandlers", function () {
@@ -691,7 +689,6 @@ define(function (require, exports, module) {
});
// confirm file contents
- var actualContent = null, error = -1;
runs(function () {
promise = FileUtils.readAsText(FileSystem.getFileForPath(filePath))
.done(function (actualText) {
diff --git a/test/spec/DocumentManager-test.js b/test/spec/DocumentManager-test.js
index 022c9cf725c..9d21668147e 100644
--- a/test/spec/DocumentManager-test.js
+++ b/test/spec/DocumentManager-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, describe, beforeEach, afterEach, it, runs, waits, waitsFor, expect, brackets, waitsForDone, spyOn, beforeFirst, afterLast, jasmine */
+/*global define, describe, beforeEach, afterEach, it, runs, expect, waitsForDone, beforeFirst, afterLast, jasmine */
define(function (require, exports, module) {
'use strict';
diff --git a/test/spec/DragAndDrop-test.js b/test/spec/DragAndDrop-test.js
index befc5bac65c..3051a275208 100644
--- a/test/spec/DragAndDrop-test.js
+++ b/test/spec/DragAndDrop-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, describe, beforeEach, afterEach, it, runs, expect, brackets, waitsForDone, beforeFirst, afterLast */
+/*global define, describe, beforeEach, afterEach, it, runs, expect, waitsForDone, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/Editor-test.js b/test/spec/Editor-test.js
index 2acf4107516..9c5189c0676 100644
--- a/test/spec/Editor-test.js
+++ b/test/spec/Editor-test.js
@@ -23,14 +23,12 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define: false, describe: false, it: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, $: false, jasmine: false */
+/*global define, describe, it, expect, beforeEach, afterEach, $, jasmine */
define(function (require, exports, module) {
'use strict';
var Editor = require("editor/Editor").Editor,
- EditorManager = require("editor/EditorManager"),
- KeyEvent = require("utils/KeyEvent"),
LanguageManager = require("language/LanguageManager"),
PreferencesManager = require("preferences/PreferencesManager"),
SpecRunnerUtils = require("spec/SpecRunnerUtils");
@@ -958,7 +956,6 @@ define(function (require, exports, module) {
});
function checkSoftTab(sel, dir, command, expectedSel, expectedText) {
- var input, endPos;
expectedText = expectedText || myEditor.document.getText();
if (Array.isArray(sel)) {
@@ -1613,8 +1610,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelection({line: 2, ch: 9}, {line: 2, ch: 9}); // should add three spaces to get to column 12
myEditor._handleTabKey();
@@ -1630,8 +1626,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelection({line: 2, ch: 5}, {line: 2, ch: 5});
myEditor._handleTabKey();
@@ -1647,8 +1642,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelection({line: 2, ch: 9}, {line: 2, ch: 14}); // should add three spaces to get to column 12
myEditor._handleTabKey();
@@ -1664,8 +1658,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelection({line: 2, ch: 5}, {line: 2, ch: 8});
myEditor._handleTabKey();
@@ -1690,8 +1683,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelections([{start: {line: 0, ch: 9}, end: {line: 0, ch: 9}, primary: true},
{start: {line: 2, ch: 6}, end: {line: 3, ch: 3}}]);
@@ -1711,8 +1703,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelections([{start: {line: 0, ch: 6}, end: {line: 0, ch: 6}, primary: true},
{start: {line: 2, ch: 3}, end: {line: 3, ch: 1}}]);
@@ -1732,8 +1723,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelections([{start: {line: 0, ch: 3}, end: {line: 0, ch: 3}},
{start: {line: 2, ch: 6}, end: {line: 2, ch: 6}},
@@ -1755,8 +1745,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelections([{start: {line: 0, ch: 3}, end: {line: 0, ch: 3}},
{start: {line: 2, ch: 6}, end: {line: 2, ch: 6}},
@@ -1778,8 +1767,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelections([{start: {line: 0, ch: 3}, end: {line: 0, ch: 6}},
{start: {line: 2, ch: 6}, end: {line: 2, ch: 9}},
@@ -1801,8 +1789,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelections([{start: {line: 0, ch: 3}, end: {line: 0, ch: 6}},
{start: {line: 2, ch: 6}, end: {line: 2, ch: 9}},
@@ -1824,8 +1811,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelections([{start: {line: 1, ch: 4}, end: {line: 1, ch: 4}, primary: true}, // should not move
{start: {line: 2, ch: 4}, end: {line: 2, ch: 4}}]); // should get indented and move
@@ -1844,8 +1830,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelections([{start: {line: 1, ch: 1}, end: {line: 1, ch: 1}, primary: true}, // should not move
{start: {line: 2, ch: 1}, end: {line: 2, ch: 1}}]); // should get indented and move
@@ -1864,8 +1849,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" +
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelections([{start: {line: 1, ch: 2}, end: {line: 1, ch: 2}, primary: true}, // should not move
{start: {line: 2, ch: 2}, end: {line: 2, ch: 2}}]); // should get indented and move
@@ -1883,8 +1867,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\tindentme();\n" +
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelections([{start: {line: 1, ch: 0}, end: {line: 1, ch: 0}, primary: true}, // should not move
{start: {line: 2, ch: 0}, end: {line: 2, ch: 0}}]); // should get indented and move
@@ -1902,8 +1885,7 @@ define(function (require, exports, module) {
" if (bar) {\n" +
" indentme();\n" + // indent already correct
" }\n" +
- "}",
- i;
+ "}";
makeEditor(content);
myEditor.setSelections([{start: {line: 1, ch: 4}, end: {line: 1, ch: 4}},
{start: {line: 2, ch: 8}, end: {line: 2, ch: 8}}]);
@@ -1922,8 +1904,7 @@ define(function (require, exports, module) {
"\tif (bar) {\n" +
"\t\tindentme();\n" + // indent already correct
"\t}\n" +
- "}",
- i;
+ "}";
makeEditor(content, true);
myEditor.setSelections([{start: {line: 1, ch: 1}, end: {line: 1, ch: 1}},
{start: {line: 2, ch: 2}, end: {line: 2, ch: 2}}]);
diff --git a/test/spec/EditorCommandHandlers-test.js b/test/spec/EditorCommandHandlers-test.js
index 849539f2abf..0407712a344 100644
--- a/test/spec/EditorCommandHandlers-test.js
+++ b/test/spec/EditorCommandHandlers-test.js
@@ -22,14 +22,12 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, waits, runs, $, waitsForDone, beforeFirst, afterLast */
+/*global define, describe, it, expect, beforeEach, afterEach, runs, waitsForDone, beforeFirst, afterLast */
define(function (require, exports, module) {
'use strict';
- var Editor = require("editor/Editor").Editor,
- EditorManager = require("editor/EditorManager"),
- EditorCommandHandlers = require("editor/EditorCommandHandlers"),
+ var EditorManager = require("editor/EditorManager"),
Commands = require("command/Commands"),
CommandManager = require("command/CommandManager"),
LanguageManager = require("language/LanguageManager"),
@@ -509,7 +507,7 @@ define(function (require, exports, module) {
myEditor.setSelections([{start: {line: 1, ch: 0}, end: {line: 1, ch: 0}},
{start: {line: 3, ch: 0}, end: {line: 3, ch: 6}}]);
- var lines = defaultContent.split("\n"), i;
+ var lines = defaultContent.split("\n");
lines[1] = "// function bar() {";
lines[3] = "// a();";
var expectedText = lines.join("\n");
diff --git a/test/spec/EditorManager-test.js b/test/spec/EditorManager-test.js
index dbe47fd3534..647389bcab2 100644
--- a/test/spec/EditorManager-test.js
+++ b/test/spec/EditorManager-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, spyOn, expect, beforeEach, afterEach, waitsFor, runs, $ */
+/*global define, describe, it, spyOn, expect, beforeEach, afterEach, $ */
define(function (require, exports, module) {
'use strict';
diff --git a/test/spec/EditorOptionHandlers-test.js b/test/spec/EditorOptionHandlers-test.js
index 38db17db961..6d7009be5a7 100644
--- a/test/spec/EditorOptionHandlers-test.js
+++ b/test/spec/EditorOptionHandlers-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, brackets, waitsForDone, beforeFirst, afterLast */
+/*global define, $, describe, afterEach, it, runs, expect, waitsForDone, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/ExtensionInstallation-test.js b/test/spec/ExtensionInstallation-test.js
index 32a5d4db23d..d094a2b9038 100644
--- a/test/spec/ExtensionInstallation-test.js
+++ b/test/spec/ExtensionInstallation-test.js
@@ -24,8 +24,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true,
indent: 4, maxerr: 50 */
-/*global define, describe, it, xit, expect, beforeFirst, afterLast, beforeEach, afterEach, waits,
-waitsFor, runs, $, brackets, waitsForDone */
+/*global define, describe, it, expect, beforeFirst, afterLast, beforeEach, afterEach, waitsFor, runs, $, waitsForDone */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/ExtensionManager-test.js b/test/spec/ExtensionManager-test.js
index 5fec9fc6055..e450511cbdb 100644
--- a/test/spec/ExtensionManager-test.js
+++ b/test/spec/ExtensionManager-test.js
@@ -24,8 +24,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true,
indent: 4, maxerr: 50, regexp: true */
-/*global define, describe, it, xit, expect, beforeEach, afterEach,
-waitsFor, runs, $, brackets, waitsForDone, spyOn, jasmine */
+/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone, spyOn, jasmine */
/*unittests: ExtensionManager*/
define(function (require, exports, module) {
@@ -757,8 +756,7 @@ define(function (require, exports, module) {
});
it("should set flag to keep local files for new installs", function () {
- var id = "mock-extension",
- filename = "/path/to/downloaded/file.zip",
+ var filename = "/path/to/downloaded/file.zip",
file = FileSystem.getFileForPath(filename),
result;
@@ -791,7 +789,6 @@ define(function (require, exports, module) {
file = FileSystem.getFileForPath(filename),
result,
dialogDeferred = new $.Deferred(),
- updatePromise,
$mockDlg,
didClose;
diff --git a/test/spec/ExtensionUtils-test.js b/test/spec/ExtensionUtils-test.js
index 96a5026d7b8..fe089bc395e 100644
--- a/test/spec/ExtensionUtils-test.js
+++ b/test/spec/ExtensionUtils-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, waitsForDone, waitsForFail, beforeFirst, afterLast */
+/*global $, define, describe, it, expect, runs, waitsForDone, waitsForFail, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/FileFilters-test.js b/test/spec/FileFilters-test.js
index ec7abc1df59..b4241ca7b61 100644
--- a/test/spec/FileFilters-test.js
+++ b/test/spec/FileFilters-test.js
@@ -30,7 +30,6 @@ define(function (require, exports, module) {
var FileFilters = require("search/FileFilters"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
Dialogs = require("widgets/Dialogs"),
- Commands = require("command/Commands"),
KeyEvent = require("utils/KeyEvent"),
PreferencesManager = require("preferences/PreferencesManager"),
Strings = require("strings"),
diff --git a/test/spec/FileSystem-test.js b/test/spec/FileSystem-test.js
index d8511aa0180..7b322e77e2e 100644
--- a/test/spec/FileSystem-test.js
+++ b/test/spec/FileSystem-test.js
@@ -895,9 +895,6 @@ define(function (require, exports, module) {
// Used for various tests below where two write operations (to two different files) overlap in various ways
function dualWrite(cb1Delay, cb2Delay) {
- var testFile1 = fileSystem.getFileForPath("/file1.txt"),
- testFile2 = fileSystem.getFileForPath("/file2.txt");
-
runs(function () {
var write1Done = false, change1Done = false;
var write2Done = false, change2Done = false;
@@ -1073,7 +1070,6 @@ define(function (require, exports, module) {
it("should verify blind writes", function () {
var file = fileSystem.getFileForPath(filename),
cb1 = writeCallback(),
- cb2 = writeCallback(),
newFileContent = "Computer programming is an exact science",
checkedContent = file._contents = fileSystem._impl._model.readFile(filename); // avoids having to use a callback
@@ -1412,8 +1408,7 @@ define(function (require, exports, module) {
var file,
cb0 = readCallback(),
cb1 = errorCallback(),
- cb2 = readCallback(),
- savedHash;
+ cb2 = readCallback();
// confirm watched and empty cached data
runs(function () {
@@ -1462,8 +1457,7 @@ define(function (require, exports, module) {
it("should unwatch when watchers go offline", function () {
var file,
cb0 = readCallback(),
- cb1 = readCallback(),
- savedHash;
+ cb1 = readCallback();
// confirm watched and empty cached data
runs(function () {
@@ -1654,8 +1648,7 @@ define(function (require, exports, module) {
it("should fire change event after rapid delete-add pair", function () {
var dirname = "/subdir/",
filename = "/subdir/file3.txt",
- dir,
- newfile;
+ dir;
runs(function () {
// Delay watcher change notifications so that the FS doesn't get a chance to
diff --git a/test/spec/FileUtils-test.js b/test/spec/FileUtils-test.js
index e0cd9612c18..5d744043c03 100644
--- a/test/spec/FileUtils-test.js
+++ b/test/spec/FileUtils-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, window, $, jasmine, brackets */
+/*global define, describe, it, expect, beforeEach, afterEach, brackets */
/*unittests: FileUtils*/
define(function (require, exports, module) {
diff --git a/test/spec/FindInFiles-test.js b/test/spec/FindInFiles-test.js
index f4fd9e95049..ca0fd19b133 100644
--- a/test/spec/FindInFiles-test.js
+++ b/test/spec/FindInFiles-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
-/*global define, describe, it, expect, beforeFirst, afterLast, beforeEach, afterEach, waits, waitsFor, waitsForDone, runs, window, jasmine, spyOn */
+/*global define, describe, it, expect, beforeFirst, afterLast, beforeEach, afterEach, waits, waitsFor, waitsForDone, runs, spyOn */
define(function (require, exports, module) {
"use strict";
@@ -30,7 +30,6 @@ define(function (require, exports, module) {
var Commands = require("command/Commands"),
KeyEvent = require("utils/KeyEvent"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
- FileSystem = require("filesystem/FileSystem"),
FileSystemError = require("filesystem/FileSystemError"),
FileUtils = require("file/FileUtils"),
FindUtils = require("search/FindUtils"),
@@ -904,8 +903,7 @@ define(function (require, exports, module) {
waitsForDone(CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, { fullPath: fullTestPath("foo.html") }));
});
runs(function () {
- var doc = DocumentManager.getOpenDocumentForPath(fullTestPath("foo.html")),
- i;
+ var doc = DocumentManager.getOpenDocumentForPath(fullTestPath("foo.html"));
expect(doc).toBeTruthy();
// Replace all matches and check that the entire file was removed from the results list.
diff --git a/test/spec/FindReplace-test.js b/test/spec/FindReplace-test.js
index c712ca4d84c..a8701caf4f7 100644
--- a/test/spec/FindReplace-test.js
+++ b/test/spec/FindReplace-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, $, it, expect, beforeFirst, afterLast, beforeEach, afterEach, waits, waitsFor, waitsForDone, runs, window, jasmine, spyOn */
+/*global define, describe, $, it, expect, beforeFirst, afterLast, beforeEach, afterEach, waitsFor, waitsForDone, runs, jasmine */
/*unittests: FindReplace*/
define(function (require, exports, module) {
@@ -33,8 +33,7 @@ define(function (require, exports, module) {
KeyEvent = require("utils/KeyEvent"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
StringUtils = require("utils/StringUtils"),
- Strings,
- _ = require("thirdparty/lodash");
+ Strings;
var defaultContent = "/* Test comment */\n" +
"define(function (require, exports, module) {\n" +
@@ -298,7 +297,6 @@ define(function (require, exports, module) {
this.category = "integration";
var LINE_FIRST_REQUIRE = 2;
- var LINE_AFTER_REQUIRES = 5;
var CH_REQUIRE_START = 14;
var CH_REQUIRE_PAREN = CH_REQUIRE_START + "require".length;
diff --git a/test/spec/HTMLInstrumentation-test.js b/test/spec/HTMLInstrumentation-test.js
index a1b8d93a60b..bca08890dcf 100644
--- a/test/spec/HTMLInstrumentation-test.js
+++ b/test/spec/HTMLInstrumentation-test.js
@@ -23,22 +23,20 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50, evil: true */
-/*global define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, spyOn, xit, xdescribe, jasmine, Node */
+/*global define, $, describe, beforeEach, afterEach, it, runs, expect, spyOn, jasmine, Node */
/*unittests: HTML Instrumentation*/
define(function (require, exports, module) {
"use strict";
// Load dependent modules
- var FileUtils = require("file/FileUtils"),
- HTMLInstrumentation = require("language/HTMLInstrumentation"),
+ var HTMLInstrumentation = require("language/HTMLInstrumentation"),
HTMLSimpleDOM = require("language/HTMLSimpleDOM"),
RemoteFunctions = require("text!LiveDevelopment/Agents/RemoteFunctions.js"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
WellFormedDoc = require("text!spec/HTMLInstrumentation-test-files/wellformed.html"),
NotWellFormedDoc = require("text!spec/HTMLInstrumentation-test-files/omitEndTags.html"),
- InvalidHTMLDoc = require("text!spec/HTMLInstrumentation-test-files/invalidHTML.html"),
- BigDoc = require("text!spec/HTMLInstrumentation-test-files/REC-widgets-20121127.html");
+ InvalidHTMLDoc = require("text!spec/HTMLInstrumentation-test-files/invalidHTML.html");
RemoteFunctions = eval("(" + RemoteFunctions.trim() + ")()");
@@ -62,7 +60,6 @@ define(function (require, exports, module) {
}
function removeDescendentsFromNodeMap(nodeMap, node) {
- var mappedNode = nodeMap[node.tagID];
delete nodeMap[node.tagID];
if (node.children) {
node.children.forEach(function (child) {
@@ -294,23 +291,7 @@ define(function (require, exports, module) {
return true;
}
});
-
- // This style of setting __proto__ is purely to keep JSLint happy :(
- var proto = '__proto__';
-
- /**
- * Adds the domFeatures defined above to a SimpleDOM node and all of its children.
- * This works by changing the __proto__ property of the node.
- *
- * @param {Object} node SimpleDOM node to augment
- */
- function addDOMFeatures(node) {
- node[proto] = domFeatures;
- if (node.children) {
- node.children.forEach(addDOMFeatures);
- }
- }
-
+
/**
* Creates a deep clone of a SimpleDOM tree, adding the domFeatures as it goes
* along.
@@ -910,14 +891,7 @@ define(function (require, exports, module) {
});
});
});
-
- // Log useful information when debugging a test.
- function debuggingDump(result, previousDOM) {
- console.log("Old DOM", HTMLSimpleDOM._dumpDOM(previousDOM));
- console.log("New DOM", HTMLSimpleDOM._dumpDOM(result.dom));
- console.log("Edits", JSON.stringify(result.edits, null, 2));
- }
-
+
describe("HTML Instrumentation in dirty files", function () {
var changeList, offsets;
@@ -1573,7 +1547,6 @@ define(function (require, exports, module) {
setupEditor("{{0}}some text{{1}}
", true);
runs(function () {
var previousDOM = HTMLSimpleDOM.build(editor.document.getText()),
- tagID = previousDOM.tagID,
result;
HTMLInstrumentation._markTextFromDOM(editor, previousDOM);
@@ -1620,7 +1593,6 @@ define(function (require, exports, module) {
setupEditor("");
runs(function () {
var previousDOM = HTMLSimpleDOM.build(editor.document.getText()),
- tagID,
result;
// Nothing to mark since it's currently an empty document.
@@ -1658,7 +1630,6 @@ define(function (require, exports, module) {
setupEditor("{{0}}", true);
runs(function () {
var previousDOM = HTMLSimpleDOM.build(editor.document.getText()),
- tagID,
result;
HTMLInstrumentation._markTextFromDOM(editor, previousDOM);
@@ -1691,7 +1662,6 @@ define(function (require, exports, module) {
setupEditor("{{0}}", true);
runs(function () {
var previousDOM = HTMLSimpleDOM.build(editor.document.getText()),
- tagID,
result;
HTMLInstrumentation._markTextFromDOM(editor, previousDOM);
@@ -1987,8 +1957,7 @@ define(function (require, exports, module) {
var newDOM = result.dom;
var newElement = newDOM.children[3].children[7].children[3],
parent = newElement.parent,
- parentID = parent.tagID,
- afterID = parent.children[2].tagID;
+ parentID = parent.tagID;
expect(result.edits.length).toBe(2);
expect(result.edits[0]).toEqual({
diff --git a/test/spec/HTMLSimpleDOM-test.js b/test/spec/HTMLSimpleDOM-test.js
index 01df9f0dedb..24548f46178 100644
--- a/test/spec/HTMLSimpleDOM-test.js
+++ b/test/spec/HTMLSimpleDOM-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50, evil: true */
-/*global define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, spyOn, xit, xdescribe, jasmine, Node */
+/*global define, describe, it, expect, jasmine */
/*unittests: HTML SimpleDOM*/
define(function (require, exports, module) {
diff --git a/test/spec/HTMLTokenizer-test.js b/test/spec/HTMLTokenizer-test.js
index bd6ad03609b..306d8d8a9f5 100644
--- a/test/spec/HTMLTokenizer-test.js
+++ b/test/spec/HTMLTokenizer-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global define, $, describe, beforeEach, afterEach, it, runs, waitsFor, expect, spyOn, xdescribe, jasmine */
+/*global define, describe, it, expect */
/*unittests: HTML Tokenizer*/
define(function (require, exports, module) {
@@ -427,4 +427,4 @@ define(function (require, exports, module) {
});
});
});
-});
\ No newline at end of file
+});
diff --git a/test/spec/InlineEditorProviders-test.js b/test/spec/InlineEditorProviders-test.js
index ed7b272faf8..0c59ff874e5 100644
--- a/test/spec/InlineEditorProviders-test.js
+++ b/test/spec/InlineEditorProviders-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waits, waitsFor, waitsForDone, waitsForFail, runs, $, brackets, beforeFirst, afterLast */
+/*global define, describe, it, xit, expect, beforeEach, afterEach, waits, waitsFor, waitsForDone, waitsForFail, runs, $, beforeFirst, afterLast */
define(function (require, exports, module) {
'use strict';
@@ -483,8 +483,7 @@ define(function (require, exports, module) {
runs(function () {
var hostEditor = EditorManager.getCurrentFullEditor(),
- inlineWidget = hostEditor.getInlineWidgets()[0],
- inlinePos = inlineWidget.editor.getCursorPos();
+ inlineWidget = hostEditor.getInlineWidgets()[0];
// verify inline widget
expect(hostEditor.getInlineWidgets().length).toBe(1);
@@ -669,7 +668,7 @@ define(function (require, exports, module) {
});
it("should scroll cursor into view and position message popover inside right edge of window", function () {
- var $popover, scrollPos, editor,
+ var $popover, editor,
openFile = "test1.html";
runs(function () {
@@ -772,8 +771,7 @@ define(function (require, exports, module) {
it("should save changes in the inline editor", function () {
initInlineTest("test1.html", 1);
- var saved = false,
- err = false,
+ var err = false,
hostEditor,
inlineEditor,
newText = "\n/* jasmine was here */",
@@ -916,8 +914,7 @@ define(function (require, exports, module) {
it("should close inline editor when file deleted on disk", function () {
// Create an expendable CSS file
- var fileToWrite,
- savedTempCSSFile = false;
+ var fileToWrite;
runs(function () {
// Important: must create file using test window's FS so that it sees the new file right away
@@ -1398,8 +1395,6 @@ define(function (require, exports, module) {
});
it("should close inline if the contents of the full editor are all deleted", function () {
- var newInlineText = "/* jasmine was inline */\n";
-
// verify inline is open
expect(hostEditor.getInlineWidgets().length).toBe(1);
diff --git a/test/spec/InstallExtensionDialog-test.js b/test/spec/InstallExtensionDialog-test.js
index d353af34d25..21a6d9f7ea7 100644
--- a/test/spec/InstallExtensionDialog-test.js
+++ b/test/spec/InstallExtensionDialog-test.js
@@ -22,7 +22,7 @@
*/
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waits, waitsFor, runs, $, waitsForDone, spyOn, jasmine, beforeFirst, afterLast, brackets */
+/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, $, spyOn, beforeFirst, afterLast, brackets */
/*unittests: Install Extension Dialog*/
define(function (require, exports, module) {
@@ -30,12 +30,11 @@ define(function (require, exports, module) {
var SpecRunnerUtils = require("spec/SpecRunnerUtils"),
KeyEvent = require("utils/KeyEvent"),
- NativeApp = require("utils/NativeApp"),
FileSystem,
Strings;
describe("Install Extension Dialog", function () {
- var testWindow, dialog, fields, goodInstaller, badInstaller, closed,
+ var testWindow, dialog, fields, closed,
url = "http://brackets.io/extensions/myextension.zip";
this.category = "integration";
@@ -209,8 +208,8 @@ define(function (require, exports, module) {
});
it("should disable the ok button while installing", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
expect(fields.$okButton.prop("disabled")).toBe(true);
@@ -218,8 +217,8 @@ define(function (require, exports, module) {
});
it("should hide the url field and 'browse extensions' button while installing", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
expect(fields.$url.is(":visible")).toBe(false);
@@ -262,8 +261,8 @@ define(function (require, exports, module) {
});
it("should disable the cancel button while cancellation is processed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -272,8 +271,8 @@ define(function (require, exports, module) {
});
it("should ignore the Esc key while cancellation is processed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -283,8 +282,8 @@ define(function (require, exports, module) {
});
it("should ignore the Enter key while cancellation is processed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -294,8 +293,8 @@ define(function (require, exports, module) {
});
it("should re-enable the ok button and hide cancel button after install succeeds", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve(successfulResult);
@@ -304,7 +303,7 @@ define(function (require, exports, module) {
});
it("should re-enable the ok button and hide cancel button after install succeeds synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
expect(fields.$okButton.prop("disabled")).toBe(false);
@@ -312,8 +311,8 @@ define(function (require, exports, module) {
});
it("should re-enable the ok button and hide cancel button after install fails", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.reject();
@@ -322,7 +321,7 @@ define(function (require, exports, module) {
});
it("should re-enable the ok button and hide cancel button after install fails synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
expect(fields.$okButton.prop("disabled")).toBe(false);
@@ -330,8 +329,8 @@ define(function (require, exports, module) {
});
it("should re-enable the ok button and hide cancel button after install finishes canceling", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -341,8 +340,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if ok button clicked after install succeeds", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve(successfulResult);
@@ -351,7 +350,7 @@ define(function (require, exports, module) {
});
it("should close the dialog if ok button clicked after install succeeds synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
fields.$okButton.click();
@@ -359,8 +358,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if Enter pressed after install succeeds", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve(successfulResult);
@@ -369,7 +368,7 @@ define(function (require, exports, module) {
});
it("should close the dialog if Enter pressed after install succeeds synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
SpecRunnerUtils.simulateKeyEvent(KeyEvent.DOM_VK_RETURN, "keydown", fields.$dlg[0]);
@@ -377,8 +376,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if Esc pressed after install succeeds", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve(successfulResult);
@@ -387,7 +386,7 @@ define(function (require, exports, module) {
});
it("should close the dialog if Esc pressed after install succeeds synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
SpecRunnerUtils.simulateKeyEvent(KeyEvent.DOM_VK_ESCAPE, "keyup", fields.$dlg[0]);
@@ -395,8 +394,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if ok button clicked after install fails", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.reject();
@@ -405,7 +404,7 @@ define(function (require, exports, module) {
});
it("should close the dialog if ok button clicked after install fails synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
fields.$okButton.click();
@@ -413,8 +412,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if Enter pressed after install fails", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.reject();
@@ -423,7 +422,7 @@ define(function (require, exports, module) {
});
it("should close the dialog if Enter pressed after install fails synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
SpecRunnerUtils.simulateKeyEvent(KeyEvent.DOM_VK_RETURN, "keydown", fields.$dlg[0]);
@@ -431,8 +430,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if Esc pressed after install fails", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.reject();
@@ -441,7 +440,7 @@ define(function (require, exports, module) {
});
it("should close the dialog if Esc pressed after install fails synchronously", function () {
- var installer = makeInstaller(true);
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
SpecRunnerUtils.simulateKeyEvent(KeyEvent.DOM_VK_ESCAPE, "keyup", fields.$dlg[0]);
@@ -449,8 +448,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if ok button clicked after install finishes canceling", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -460,8 +459,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if Enter pressed after install finishes canceling", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(true);
+ var deferred = new $.Deferred();
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -471,8 +470,8 @@ define(function (require, exports, module) {
});
it("should close the dialog if Esc pressed after install finishes canceling", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(true);
+ var deferred = new $.Deferred();
+ makeInstaller(true);
setUrl();
fields.$okButton.click();
fields.$cancelButton.click();
@@ -485,8 +484,8 @@ define(function (require, exports, module) {
// Cancellation timing
it("should time out and re-enable close button if cancel doesn't complete quickly", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -501,8 +500,8 @@ define(function (require, exports, module) {
});
it("should close when clicking Close button after timing out if cancel doesn't complete quickly", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -518,8 +517,8 @@ define(function (require, exports, module) {
});
it("should close when hitting Enter after timing out if cancel doesn't complete quickly", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -535,8 +534,8 @@ define(function (require, exports, module) {
});
it("should close when hitting Esc after timing out if cancel doesn't complete quickly", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -553,8 +552,8 @@ define(function (require, exports, module) {
// Cancelation vs. successful install race conditions
it("should keep close button enabled and not throw an exception if install succeeds quickly after cancelation", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -565,8 +564,8 @@ define(function (require, exports, module) {
});
});
it("should keep close button enabled and not throw an exception if install succeeds slowly after cancelation", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -580,8 +579,8 @@ define(function (require, exports, module) {
});
});
it("should stay closed and not throw an exception if install succeeds after cancelation & force close", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -598,8 +597,8 @@ define(function (require, exports, module) {
// Cancelation vs. failed install race conditions
it("should keep close button enabled and not throw an exception if install fails quickly after cancelation", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -610,8 +609,8 @@ define(function (require, exports, module) {
});
});
it("should keep close button enabled and not throw an exception if install fails slowly after cancelation", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -625,8 +624,8 @@ define(function (require, exports, module) {
});
});
it("should stay closed and not throw an exception if install fails after cancelation & force close", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -643,8 +642,8 @@ define(function (require, exports, module) {
// Cancelation actually suceeding
it("should keep close button enabled and not throw an exception if install cancelation completes quickly after cancelation", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -655,8 +654,8 @@ define(function (require, exports, module) {
});
});
it("should keep close button enabled and not throw an exception if install cancelation completes slowly after cancelation", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -670,8 +669,8 @@ define(function (require, exports, module) {
});
});
it("should stay closed and not throw an exception if install cancelation completes after cancelation & force close", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
runs(function () {
setUrl();
dialog._cancelTimeout = 50;
@@ -692,8 +691,8 @@ define(function (require, exports, module) {
});
it("should display a warning message if the extension is already installed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve({
@@ -708,8 +707,8 @@ define(function (require, exports, module) {
});
it("should display a warning message if the same version is already installed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve({
@@ -724,8 +723,8 @@ define(function (require, exports, module) {
});
it("should display a warning message if an older version is already installed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
deferred.resolve({
@@ -744,8 +743,8 @@ define(function (require, exports, module) {
});
it("should delete the downloaded file if the warning message is cancelled", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
var packageFilename = "/path/to/downloaded/package.zip",
@@ -761,8 +760,8 @@ define(function (require, exports, module) {
});
it("should pass the installation result if the warning message is confirmed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
var packageFilename = "/path/to/downloaded/package.zip",
@@ -784,8 +783,8 @@ define(function (require, exports, module) {
});
it("should pass installation result when update is needed", function () {
- var deferred = new $.Deferred(),
- installer = makeInstaller(null, deferred);
+ var deferred = new $.Deferred();
+ makeInstaller(null, deferred);
setUrl();
fields.$okButton.click();
var packageFilename = "/path/to/downloaded/package.zip";
diff --git a/test/spec/JSUtils-test.js b/test/spec/JSUtils-test.js
index 76d42502349..eb5c4b5502d 100644
--- a/test/spec/JSUtils-test.js
+++ b/test/spec/JSUtils-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone */
+/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, waitsForDone */
define(function (require, exports, module) {
'use strict';
@@ -38,7 +38,6 @@ define(function (require, exports, module) {
SpecRunnerUtils = require("spec/SpecRunnerUtils");
var testPath = SpecRunnerUtils.getTestPath("/spec/JSUtils-test-files"),
- testWindow,
doneLoading = false;
// Verifies whether one of the results returned by JSUtils.findAllMatchingFunctionsInText()
diff --git a/test/spec/KeyBindingManager-test.js b/test/spec/KeyBindingManager-test.js
index a9743d12b71..74ac946d163 100644
--- a/test/spec/KeyBindingManager-test.js
+++ b/test/spec/KeyBindingManager-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, afterEach, it, xit, runs, waitsFor, expect, brackets, $ */
+/*global define, describe, beforeEach, afterEach, it, expect, brackets */
/*unittests: KeyBindingManager */
define(function (require, exports, module) {
@@ -490,4 +490,4 @@ define(function (require, exports, module) {
});
});
-});
\ No newline at end of file
+});
diff --git a/test/spec/LanguageManager-test.js b/test/spec/LanguageManager-test.js
index 0a89f90b5ea..dfd58e7b36c 100644
--- a/test/spec/LanguageManager-test.js
+++ b/test/spec/LanguageManager-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, describe, jasmine, beforeEach, afterEach, it, runs, waitsFor, expect, waitsForDone, waitsForFail, spyOn */
+/*global define, $, describe, jasmine, beforeEach, afterEach, it, runs, waitsFor, expect, waitsForDone, spyOn */
/*unittests: LanguageManager */
define(function (require, exports, module) {
@@ -32,11 +32,8 @@ define(function (require, exports, module) {
// Load dependent modules
var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror"),
LanguageManager = require("language/LanguageManager"),
- DocumentManager = require("document/DocumentManager"),
- PathUtils = require("thirdparty/path-utils/path-utils.min"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
- PreferencesManager = require("preferences/PreferencesManager"),
- FileSystem = require("filesystem/FileSystem");
+ PreferencesManager = require("preferences/PreferencesManager");
describe("LanguageManager", function () {
@@ -649,8 +646,7 @@ define(function (require, exports, module) {
var unknown,
doc,
spy,
- modifiedLanguage,
- promise;
+ modifiedLanguage;
// Create a foo script file
doc = SpecRunnerUtils.createMockActiveDocument({ filename: "/test.foo" });
@@ -690,8 +686,7 @@ define(function (require, exports, module) {
phpLang = LanguageManager.getLanguage("php"),
doc,
modifiedLanguage,
- spy,
- promise;
+ spy;
doc = SpecRunnerUtils.createMockActiveDocument({ filename: "/test.foo2" });
@@ -732,8 +727,7 @@ define(function (require, exports, module) {
phpLang = LanguageManager.getLanguage("php"),
doc,
modifiedLanguage,
- spy,
- promise;
+ spy;
doc = SpecRunnerUtils.createMockActiveDocument({ filename: "/test.foo3" });
diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js
index 5daaf2454a9..1cce8af0930 100644
--- a/test/spec/LiveDevelopment-test.js
+++ b/test/spec/LiveDevelopment-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global brackets, $, define, describe, it, xit, expect, beforeEach, afterEach, waits, waitsFor, waitsForDone, waitsForFail, runs, spyOn, jasmine, beforeFirst, afterLast */
+/*global brackets, $, define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, waitsForDone, waitsForFail, runs, spyOn, jasmine, beforeFirst, afterLast */
define(function (require, exports, module) {
'use strict';
@@ -44,7 +44,6 @@ define(function (require, exports, module) {
Dialogs,
NativeApp,
LiveDevelopment,
- LiveDevServerManager,
Inspector,
DOMAgent,
DocumentManager,
@@ -692,7 +691,6 @@ define(function (require, exports, module) {
browserCssText,
origHtmlText,
updatedHtmlText,
- browserHtmlText,
htmlDoc,
loadEventPromise;
@@ -817,9 +815,7 @@ define(function (require, exports, module) {
}
xit("should report STATUS_SYNC_ERROR when HTML syntax is invalid", function () {
- var doc,
- originalText,
- text;
+ var doc;
_openSimpleHTML();
diff --git a/test/spec/LowLevelFileIO-test.js b/test/spec/LowLevelFileIO-test.js
index 550b681b70b..b077d277c0a 100644
--- a/test/spec/LowLevelFileIO-test.js
+++ b/test/spec/LowLevelFileIO-test.js
@@ -632,8 +632,7 @@ define(function (require, exports, module) {
});
it("should remove a directory", function () {
- var isDirectory,
- delDirName = baseDir + "/unlink_dir",
+ var delDirName = baseDir + "/unlink_dir",
cb = errSpy(),
statCB = statSpy(),
unlinkCB = errSpy();
@@ -729,7 +728,7 @@ define(function (require, exports, module) {
});
describe("rename", function () {
- var error, complete;
+ var complete;
it("should rename a file", function () {
var oldName = baseDir + "/file_one.txt",
@@ -876,7 +875,7 @@ define(function (require, exports, module) {
});
describe("copyFile", function () {
- var error, complete;
+ var complete;
it("should copy a file", function () {
var fileName = baseDir + "/file_one.txt",
@@ -961,8 +960,6 @@ define(function (require, exports, module) {
});
describe("moveToTrash", function () {
- var error, complete, isDirectory;
-
it("should move a file to the trash", function () {
var newFileName = baseDir + "/brackets_unittests_delete_me.txt",
writeFileCB = errSpy(),
diff --git a/test/spec/Menu-test.js b/test/spec/Menu-test.js
index 923c2650ff4..b60f5d00830 100644
--- a/test/spec/Menu-test.js
+++ b/test/spec/Menu-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, brackets, $, beforeFirst, afterLast */
+/*global define, describe, it, expect, runs, $, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
@@ -182,7 +182,7 @@ define(function (require, exports, module) {
var openEvent = false;
var cmenu = Menus.registerContextMenu("test-cmenu51");
CommandManager.register("Brackets Test Command Custom 51", "Menu-test.command51", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command51");
+ cmenu.addMenuItem("Menu-test.command51");
testWindow.$(cmenu).on("beforeContextMenuOpen", function () {
openEvent = true;
@@ -222,7 +222,7 @@ define(function (require, exports, module) {
runs(function () {
var cmenu = Menus.registerContextMenu("test-cmenu52");
CommandManager.register("Brackets Test Command Custom 52", "Menu-test.command52", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command52");
+ cmenu.addMenuItem("Menu-test.command52");
var winWidth = $(testWindow).width();
var winHeight = $(testWindow).height();
@@ -247,7 +247,7 @@ define(function (require, exports, module) {
it("close context menu", function () {
var cmenu = Menus.registerContextMenu("test-cmenu53");
CommandManager.register("Brackets Test Command Custom 53", "Menu-test.command53", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command53");
+ cmenu.addMenuItem("Menu-test.command53");
cmenu.open({ pageX: 0, pageY: 0 });
@@ -266,7 +266,7 @@ define(function (require, exports, module) {
it("close context menu using Esc key", function () {
var cmenu = Menus.registerContextMenu("test-cmenu54");
CommandManager.register("Brackets Test Command Custom 54", "Menu-test.command54", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command54");
+ cmenu.addMenuItem("Menu-test.command54");
cmenu.open({ pageX: 0, pageY: 0 });
@@ -286,7 +286,7 @@ define(function (require, exports, module) {
it("check for context menu to have the right status", function () {
var cmenu = Menus.registerContextMenu("test-cmenu55");
CommandManager.register("Brackets Test Command Custom 55", "Menu-test.command55", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command55");
+ cmenu.addMenuItem("Menu-test.command55");
cmenu.open({pageX: 0, pageY: 0});
@@ -787,7 +787,7 @@ define(function (require, exports, module) {
var menuId = "menu-custom-removeMenuDivider-4";
var menu = Menus.addMenu("Custom", menuId);
var menuItemId = "menu-test-removeMenuDivider1";
- var menuItem = menu.addMenuItem(menuItemId);
+ menu.addMenuItem(menuItemId);
menu.removeMenuDivider(menuItemId);
expect(menu).toBeTruthy(); // Verify that we got this far...
@@ -953,7 +953,7 @@ define(function (require, exports, module) {
var openEvent = false;
var cmenu = Menus.registerContextMenu("test-cmenu51");
CommandManager.register("Brackets Test Command Custom 51", "Menu-test.command51", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command51");
+ cmenu.addMenuItem("Menu-test.command51");
testWindow.$(cmenu).on("beforeContextMenuOpen", function () {
openEvent = true;
@@ -993,7 +993,7 @@ define(function (require, exports, module) {
runs(function () {
var cmenu = Menus.registerContextMenu("test-cmenu52");
CommandManager.register("Brackets Test Command Custom 52", "Menu-test.command52", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command52");
+ cmenu.addMenuItem("Menu-test.command52");
var winWidth = $(testWindow).width();
var winHeight = $(testWindow).height();
@@ -1018,7 +1018,7 @@ define(function (require, exports, module) {
it("close context menu", function () {
var cmenu = Menus.registerContextMenu("test-cmenu53");
CommandManager.register("Brackets Test Command Custom 53", "Menu-test.command53", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command53");
+ cmenu.addMenuItem("Menu-test.command53");
cmenu.open({pageX: 0, pageY: 0});
@@ -1037,7 +1037,7 @@ define(function (require, exports, module) {
it("close context menu using Esc key", function () {
var cmenu = Menus.registerContextMenu("test-cmenu54");
CommandManager.register("Brackets Test Command Custom 54", "Menu-test.command54", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command54");
+ cmenu.addMenuItem("Menu-test.command54");
cmenu.open({pageX: 0, pageY: 0});
@@ -1058,7 +1058,7 @@ define(function (require, exports, module) {
it("check for context menu to have the right status", function () {
var cmenu = Menus.registerContextMenu("test-cmenu55");
CommandManager.register("Brackets Test Command Custom 55", "Menu-test.command55", function () {});
- var menuItem = cmenu.addMenuItem("Menu-test.command55");
+ cmenu.addMenuItem("Menu-test.command55");
cmenu.open({pageX: 0, pageY: 0});
diff --git a/test/spec/MockFileSystemImpl.js b/test/spec/MockFileSystemImpl.js
index b833bb564a6..96f657e212d 100644
--- a/test/spec/MockFileSystemImpl.js
+++ b/test/spec/MockFileSystemImpl.js
@@ -28,7 +28,6 @@ define(function (require, exports, module) {
"use strict";
var FileSystemError = require("filesystem/FileSystemError"),
- FileSystemStats = require("filesystem/FileSystemStats"),
MockFileSystemModel = require("./MockFileSystemModel");
// A sychronous model of a file system
diff --git a/test/spec/MultiRangeInlineEditor-test.js b/test/spec/MultiRangeInlineEditor-test.js
index c951616419f..eea8ab358c4 100644
--- a/test/spec/MultiRangeInlineEditor-test.js
+++ b/test/spec/MultiRangeInlineEditor-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define: false, describe: false, it: false, xit: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, $: false, HTMLElement: false, beforeFirst: false, afterLast: false, waitsForDone: false */
+/*global define, describe, it, expect, beforeEach, afterEach, runs, $, HTMLElement, beforeFirst, afterLast, waitsForDone */
define(function (require, exports, module) {
'use strict';
@@ -31,8 +31,6 @@ define(function (require, exports, module) {
var MultiRangeInlineEditor = require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor,
InlineTextEditor = require("editor/InlineTextEditor").InlineTextEditor,
InlineWidget = require("editor/InlineWidget").InlineWidget,
- Editor = require("editor/Editor").Editor,
- EditorManager = require("editor/EditorManager"),
SpecRunnerUtils = require("spec/SpecRunnerUtils"),
Commands = require("command/Commands");
diff --git a/test/spec/NativeMenu-test.js b/test/spec/NativeMenu-test.js
index 19801522dcd..947547f2b7c 100644
--- a/test/spec/NativeMenu-test.js
+++ b/test/spec/NativeMenu-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define: false, describe: false, it: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, waitsForDone: false, runs: false, brackets: false */
+/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, brackets */
define(function (require, exports, module) {
'use strict';
diff --git a/test/spec/NodeConnection-test.js b/test/spec/NodeConnection-test.js
index 7e487afc660..061a0c24aec 100644
--- a/test/spec/NodeConnection-test.js
+++ b/test/spec/NodeConnection-test.js
@@ -24,8 +24,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true,
indent: 4, maxerr: 50 */
-/*global define, describe, it, xit, expect, beforeEach, afterEach, waits,
-waitsFor, runs, $, brackets, waitsForDone, ArrayBuffer, DataView, jasmine */
+/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, $, ArrayBuffer, DataView, jasmine */
define(function (require, exports, module) {
"use strict";
@@ -195,7 +194,6 @@ define(function (require, exports, module) {
it("should receive events", function () {
var connection = createConnection();
- var eventMessages = [];
var spy = jasmine.createSpy();
$(connection).one(
"test:eventOne",
diff --git a/test/spec/PhantomHelper.js b/test/spec/PhantomHelper.js
index 1224f6efe5d..afd7d487d5a 100644
--- a/test/spec/PhantomHelper.js
+++ b/test/spec/PhantomHelper.js
@@ -22,7 +22,6 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define */
// Polyfill for Phantom.js
@@ -51,4 +50,4 @@
return fBound;
};
}
-}());
\ No newline at end of file
+}());
diff --git a/test/spec/PreferencesBase-test.js b/test/spec/PreferencesBase-test.js
index 821ecac0aad..9df2ee52744 100644
--- a/test/spec/PreferencesBase-test.js
+++ b/test/spec/PreferencesBase-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast, spyOn, brackets */
+/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst */
/*unittests: Preferences Base*/
define(function (require, exports, module) {
@@ -62,16 +62,6 @@ define(function (require, exports, module) {
});
describe("Path Layer", function () {
- var data = {
- spaceUnits: 4,
- useTabChar: false,
- path: {
- "*.html": {
- spaceUnits: 2
- }
- }
- };
-
it("handles a variety of glob patterns", function () {
var data = {
"**.html": {
@@ -195,9 +185,7 @@ define(function (require, exports, module) {
spaceUnits: 3
}
};
-
- var originalData = _.clone(data, true);
-
+
var layer = new PreferencesBase.PathLayer("/.brackets.json");
expect(layer.set(data, "spaceUnits", 11, {
diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js
index 67d0dba345d..546a5b757bd 100644
--- a/test/spec/PreferencesManager-test.js
+++ b/test/spec/PreferencesManager-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, beforeFirst, afterLast, spyOn, waitsForDone */
+/*global define, describe, it, expect, beforeEach, runs, beforeFirst, afterLast, spyOn, waitsForDone */
define(function (require, exports, module) {
'use strict';
@@ -89,7 +89,6 @@ define(function (require, exports, module) {
it("should throw errors for invalid values", function () {
var store = new PreferenceStorage(CLIENT_ID, {"foo": 42});
- var error = null;
expect(store.getValue("foo")).toBe(42);
// function data is not valid JSON
diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js
index 86c1842c8dc..2997133afb9 100644
--- a/test/spec/ProjectManager-test.js
+++ b/test/spec/ProjectManager-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, jasmine, define, require, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, waitsForDone, beforeFirst, afterLast */
+/*global define, describe, it, expect, afterEach, waitsFor, runs, waitsForDone, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
@@ -32,7 +32,6 @@ define(function (require, exports, module) {
CommandManager, // Load from brackets.test
FileSystem, // Load from brackets.test
Dialogs = require("widgets/Dialogs"),
- DefaultDialogs = require("widgets/DefaultDialogs"),
Commands = require("command/Commands"),
FileSystemError = require("filesystem/FileSystemError"),
SpecRunnerUtils = require("spec/SpecRunnerUtils");
@@ -297,8 +296,7 @@ define(function (require, exports, module) {
rootFolderEntry = FileSystem.getDirectoryForPath(rootFolderName),
error,
stat,
- promise,
- entry;
+ promise;
// Delete the root folder and all files/folders in it.
runs(function () {
diff --git a/test/spec/QuickOpen-test.js b/test/spec/QuickOpen-test.js
index 21c88b4806f..7c1d6356456 100644
--- a/test/spec/QuickOpen-test.js
+++ b/test/spec/QuickOpen-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, window */
+/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs */
/*unittests: QuickOpen*/
define(function (require, exports, module) {
@@ -72,9 +72,6 @@ define(function (require, exports, module) {
function expectSearchBarOpen() {
expect(getSearchBar()[0]).toBeDefined();
}
- function expectSearchBarClosed() {
- expect(getSearchBar()[0]).not.toBeDefined();
- }
function enterSearchText(str, timeoutLength) {
timeoutLength = timeoutLength || 10;
@@ -105,8 +102,7 @@ define(function (require, exports, module) {
*/
function getQuickOpenTest(quickOpenQuery, gotoLineQuery, file, line, col) {
return function () {
- var err = false,
- editor,
+ var editor,
$scroller;
SpecRunnerUtils.loadProjectInTestWindow(testPath);
@@ -197,4 +193,4 @@ define(function (require, exports, module) {
it("can directly open a file in a given line and column, centering that line on the screen",
getQuickOpenTest("lines:150,20", null, "lotsOfLines.html", 150, 20));
});
-});
\ No newline at end of file
+});
diff --git a/test/spec/RemoteFunctions-test.js b/test/spec/RemoteFunctions-test.js
index 3be19a17905..5d1ec66a06c 100644
--- a/test/spec/RemoteFunctions-test.js
+++ b/test/spec/RemoteFunctions-test.js
@@ -22,13 +22,12 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, evil: true */
-/*global $, define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, window */
+/*global $, define, describe, it, xit, expect, beforeEach, afterEach, window */
define(function (require, exports, module) {
'use strict';
- var RemoteFunctions = require("text!LiveDevelopment/Agents/RemoteFunctions.js"),
- SpecRunnerUtils = require("spec/SpecRunnerUtils");
+ var RemoteFunctions = require("text!LiveDevelopment/Agents/RemoteFunctions.js");
// "load" RemoteFunctions
RemoteFunctions = eval("(" + RemoteFunctions.trim() + ")()");
@@ -771,4 +770,4 @@ define(function (require, exports, module) {
});
});
-});
\ No newline at end of file
+});
diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js
index ba9cbc0eb0a..9853ff394be 100644
--- a/test/spec/SpecRunnerUtils.js
+++ b/test/spec/SpecRunnerUtils.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
-/*global define, $, brackets, jasmine, describe, it, expect, beforeEach, afterEach, waitsFor, waits, waitsForDone, runs */
+/*global define, $, brackets, jasmine, expect, beforeEach, waitsFor, waitsForDone, runs */
define(function (require, exports, module) {
'use strict';
@@ -38,14 +38,12 @@ define(function (require, exports, module) {
PanelManager = require("view/PanelManager"),
ExtensionLoader = require("utils/ExtensionLoader"),
UrlParams = require("utils/UrlParams").UrlParams,
- LanguageManager = require("language/LanguageManager"),
- PreferencesBase = require("preferences/PreferencesBase");
+ LanguageManager = require("language/LanguageManager");
var TEST_PREFERENCES_KEY = "com.adobe.brackets.test.preferences",
EDITOR_USE_TABS = false,
EDITOR_SPACE_UNITS = 4,
OPEN_TAG = "{{",
- CLOSE_TAG = "}}",
RE_MARKER = /\{\{(\d+)\}\}/g,
absPathPrefix = (brackets.platform === "win" ? "c:/" : "/"),
_testSuites = {},
@@ -234,7 +232,7 @@ define(function (require, exports, module) {
var deferred = new $.Deferred();
runs(function () {
- var dir = _getFileSystem().getDirectoryForPath(getTempDirectory()).create(function (err) {
+ _getFileSystem().getDirectoryForPath(getTempDirectory()).create(function (err) {
if (err && err !== FileSystemError.ALREADY_EXISTS) {
deferred.reject(err);
} else {
@@ -247,8 +245,7 @@ define(function (require, exports, module) {
}
function _resetPermissionsOnSpecialTempFolders() {
- var i,
- folders = [],
+ var folders = [],
baseDir = getTempDirectory(),
promise;
@@ -698,28 +695,6 @@ define(function (require, exports, module) {
return arg;
}
- /**
- * Parses offsets from a file using offset markup (e.g. "{{1}}" for offset 1).
- * @param {!File} entry File to open
- * @return {$.Promise} A promise resolved with a record that contains parsed offsets,
- * the file text without offset markup, the original file content, and the corresponding
- * file entry.
- */
- function parseOffsetsFromFile(entry) {
- var result = new $.Deferred();
-
- FileUtils.readAsText(entry).done(function (text) {
- var info = parseOffsetsFromText(text);
- info.fileEntry = entry;
-
- result.resolve(info);
- }).fail(function (err) {
- result.reject(err);
- });
-
- return result.promise();
- }
-
/**
* Opens project relative file paths in the test window
* @param {!(Array.|string)} paths Project relative file path(s) to open
diff --git a/test/spec/StringMatch-test.js b/test/spec/StringMatch-test.js
index 27300b84e14..73498b3ded1 100644
--- a/test/spec/StringMatch-test.js
+++ b/test/spec/StringMatch-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define: false, require: false, describe: false, it: false, xit: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, jasmine: false */
+/*global define, describe, it, expect, beforeEach, afterEach, jasmine */
/*unittests: StringMatch */
define(function (require, exports, module) {
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
index 09dee2feb5e..dd06d299585 100644
--- a/test/spec/ThemeManager-test.js
+++ b/test/spec/ThemeManager-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, it, runs, expect, waitsForDone, beforeFirst, afterLast */
+/*global define, describe, it, expect, waitsForDone */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/UpdateNotification-test.js b/test/spec/UpdateNotification-test.js
index 4db5f1f7a48..fac6045e09e 100644
--- a/test/spec/UpdateNotification-test.js
+++ b/test/spec/UpdateNotification-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
-/*global define, $, brackets, describe, it, expect, beforeEach, beforeFirst, afterEach, waitsFor, waits, waitsForDone, waitsForFail, spyOn, runs */
+/*global define, $, describe, it, expect, beforeEach, afterEach, waitsForDone, waitsForFail, spyOn, runs */
define(function (require, exports, module) {
"use strict";
@@ -217,7 +217,7 @@ define(function (require, exports, module) {
];
function setupAjaxSpy(defaultUpdateUrl) {
- var jq = spyOn(testWindow.$, "ajax").andCallFake(function (req) {
+ spyOn(testWindow.$, "ajax").andCallFake(function (req) {
var d = new $.Deferred();
testWindow.setTimeout(function () {
diff --git a/test/spec/ValidationUtils-test.js b/test/spec/ValidationUtils-test.js
index 44630da5ffa..81c2c4be5e8 100644
--- a/test/spec/ValidationUtils-test.js
+++ b/test/spec/ValidationUtils-test.js
@@ -23,7 +23,7 @@
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, runs */
+/*global define, describe, it, expect */
define(function (require, exports, module) {
'use strict';
diff --git a/test/spec/ViewCommandHandlers-test.js b/test/spec/ViewCommandHandlers-test.js
index a0bdcc90d32..2215bd9d128 100644
--- a/test/spec/ViewCommandHandlers-test.js
+++ b/test/spec/ViewCommandHandlers-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, it, runs, expect, waitsForDone, beforeFirst, afterLast */
+/*global define, describe, it, runs, expect, waitsForDone, beforeFirst, afterLast */
define(function (require, exports, module) {
"use strict";
diff --git a/test/spec/ViewUtils-test.js b/test/spec/ViewUtils-test.js
index 1be366f4c11..5193e58c7d1 100644
--- a/test/spec/ViewUtils-test.js
+++ b/test/spec/ViewUtils-test.js
@@ -22,7 +22,7 @@
*/
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define: false, describe: false, $: false, beforeEach: false, afterEach: false, it: false, expect: false, brackets: false */
+/*global define, describe, $, beforeEach, afterEach, it, expect */
/*unittests: ViewUtils*/
define(function (require, exports, module) {
diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js
index 60779601a2d..12ed6d35492 100644
--- a/test/spec/WorkingSetView-test.js
+++ b/test/spec/WorkingSetView-test.js
@@ -284,7 +284,6 @@ define(function (require, exports, module) {
// Now close last opened file to hide the directories again
DocumentManager.getCurrentDocument()._markClean(); // so we can close without a save dialog
- var didClose = false, gotError = false;
waitsForDone(CommandManager.execute(Commands.FILE_CLOSE), "timeout on FILE_CLOSE", 1000);
// there should be no more directories shown
@@ -328,4 +327,4 @@ define(function (require, exports, module) {
});
});
-});
\ No newline at end of file
+});