Fix Travis failure

adobe · Sep 4, 2014 · 5215db1 · 5215db1
1 parent 5c44c87
commit 5215db1
Show file tree

Hide file tree

Showing 71 changed files with 239 additions and 418 deletions.
diff --git 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
@@ -23,15 +23,14 @@
 
 
 /*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";
 
     // 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -22,21 +22,19 @@
  */
 
 /*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";
 
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 = $('<span class="badge badge-success" style="display:none"/>'),
             $badgeFailed = $('<span class="badge badge-important" style="display:none"/>'),
             $anchor = $('<a href="?spec=' + encodeURIComponent(suiteName) + '">' + suiteName + '</a>').append($badgeAll).append($badgePassed).append($badgeFailed),
-            $listItem = $('<li/>').append($anchor),
-            self = this,
-            active;
+            $listItem = $('<li/>').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
@@ -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
@@ -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;
-});
+});
diff --git 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;
-});
+});