fixed some issues mentioned in the review

- added some forgotten waitsForDone() calls
- added a missing test case for dynamic-project-6
- check document and if it doesn't have a masterEditor before adding the document to the workspace
- removed the waits() call after invalidating the FileIndexManager
- re-enabled the message dialog if no suitable document was found for Live Preview

Author: ingorichter

src/LiveDevelopment/LiveDevelopment.js

@@ -1165,7 +1165,9 @@ define(function LiveDevelopment(require, exports, module) {
         _getInitialDocFromCurrent().done(function (doc) {
             var prepareServerPromise = (doc && _prepareServer(doc)) || new $.Deferred().reject();
 
-            DocumentManager.addToWorkingSet(doc.file);
+            if (doc && !doc._masterEditor) {
+                DocumentManager.addToWorkingSet(doc.file);
+            }
 
             // wait for server (StaticServer, Base URL or file:)
             prepareServerPromise

test/spec/LiveDevelopment-test.js

@@ -1004,9 +1004,7 @@ define(function (require, exports, module) {
 
         function loadFileAndUpdateFileIndex(fileToLoadIntoEditor) {
             runs(function () {
-                // TODO: check if this is really necessary
                 FileIndexManager.markDirty();
-                waits(2000);
                 waitsForDone(SpecRunnerUtils.openProjectFiles([fileToLoadIntoEditor]), "SpecRunnerUtils.openProjectFiles " + fileToLoadIntoEditor);
             });
         }
@@ -1029,6 +1027,8 @@ define(function (require, exports, module) {
                     promise.done(function (doc) {
                         document = doc;
                     });
+
+                    waitsForDone(promise);
                 });
 
                 runs(function () {
@@ -1199,6 +1199,8 @@ define(function (require, exports, module) {
                     promise.done(function (doc) {
                         document = doc;
                     });
+
+                    waitsForDone(promise);
                 });
 
                 runs(function () {
@@ -1305,6 +1307,30 @@ define(function (require, exports, module) {
                     expect(document.file.fullPath).toBe(testPath + "/dynamic-project-5/" + indexFile);
                 });
             });
+
+            it("should not find any HTML page", function () {
+                var promise,
+                    document;
+                var cssFile = "top2/test.css";
+                
+                SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-6");
+                loadFileAndUpdateFileIndex(cssFile);
+                
+                runs(function () {
+                    ProjectManager.setBaseUrl("http://localhost:6666/");
+                    promise = LiveDevelopment._getInitialDocFromCurrent();
+
+                    promise.done(function (doc) {
+                        document = doc;
+                    });
+
+                    waitsForDone(promise);
+                });
+
+                runs(function () {
+                    expect(document).toBe(null);
+                });
+            });
         });
     });
 });