fix: live preview integ test failures

Author: abose

src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js

@@ -82,8 +82,6 @@ define(function (require, exports, module) {
 
         this._clearErrorDisplay();
         this._detachFromEditor();
-
-        $(window).off(`focus.LiveDocument-${this.doc.file.fullPath}`);
     };
 
     /**

test/spec/LiveDevelopmentMultiBrowser-test.js

@@ -925,20 +925,18 @@ define(function (require, exports, module) {
 
         it("focus test: should html live previews never take focus from editor", async function () {
             // this test may fail if the test window doesn't have focus
-            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["simple1.html"]),
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["inline-style.html"]),
                 "SpecRunnerUtils.openProjectFiles simple1.html");
 
             await waitsForLiveDevelopmentToOpen();
-            await _editFileAndVerifyLivePreview("simple1.html", { line: 11, ch: 45 }, 'hello world ',
-                "testId", "Brackets is hello world awesome!");
 
             let iFrame = testWindow.document.getElementById("panel-live-preview-frame");
-            expect(iFrame.src.endsWith("simple1.html")).toBeTrue();
+            expect(iFrame.src.endsWith("inline-style.html")).toBeTrue();
             iFrame.focus(); // live preview has focus but it can take html focus, the live preview has to
             // delegate focus to editor explicitly in case of html files.
             expect(testWindow.document.activeElement).toEqual(iFrame);
             // for html, it can take focus, but clicking on any non- text elemnt will make it loose focus to editor
-            await forRemoteExec(`document.getElementById("testId2").click()`);
+            await forRemoteExec(`document.getElementById("testId").click()`);
             await awaits(500);
             const activeElement = testWindow.document.activeElement;
             const editorHolder = testWindow.document.getElementById("editor-holder");
@@ -1006,8 +1004,6 @@ define(function (require, exports, module) {
                 "SpecRunnerUtils.openProjectFiles simple1.html");
 
             await waitsForLiveDevelopmentToOpen();
-            await _editFileAndVerifyLivePreview("simple1.html", { line: 11, ch: 45 }, 'hello world ',
-                "testId", "Brackets is hello world awesome!");
 
             let iFrame = testWindow.document.getElementById("panel-live-preview-frame");
             expect(iFrame.src.endsWith("simple1.html")).toBeTrue();
@@ -1042,8 +1038,6 @@ define(function (require, exports, module) {
                 "SpecRunnerUtils.openProjectFiles simple1.html");
 
             await waitsForLiveDevelopmentToOpen();
-            await _editFileAndVerifyLivePreview("simple1.html", { line: 11, ch: 45 }, 'hello world ',
-                "testId", "Brackets is hello world awesome!");
 
             let iFrame = testWindow.document.getElementById("panel-live-preview-frame");
             expect(iFrame.src.endsWith("simple1.html")).toBeTrue();
@@ -1604,24 +1598,24 @@ define(function (require, exports, module) {
         }, 30000);
 
         it("should beautify and undo not corrupt live preview", async function () {
-            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["simple1.html"]),
-                "SpecRunnerUtils.openProjectFiles simple1.html");
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["simple2.html"]),
+                "SpecRunnerUtils.openProjectFiles simple2.html");
 
             await waitsForLiveDevelopmentToOpen();
-            await _editFileAndVerifyLivePreview("simple1.html", { line: 11, ch: 45 }, 'hello world ',
-                "testId", "Brackets is hello world awesome!");
+            await _editFileAndVerifyLivePreview("simple2.html", { line: 11, ch: 45 }, 'hello world ',
+                "simpId", "Brackets is hello world awesome!");
 
             let editor = EditorManager.getActiveEditor();
             await BeautificationManager.beautifyEditor(editor);
-            await _editFileAndVerifyLivePreview("simple1.html", { line: 11, ch: 73 }, 'yo',
-                "testId", "Brackets is hello world awesome!yo");
+            await _editFileAndVerifyLivePreview("simple2.html", { line: 11, ch: 73 }, 'yo',
+                "simpId", "Brackets is hello world awesome!yo");
 
             await awaitsForDone(CommandManager.execute(Commands.EDIT_UNDO), "undo");
             await awaitsForDone(CommandManager.execute(Commands.EDIT_UNDO), "undo");
             await awaitsForDone(CommandManager.execute(Commands.EDIT_UNDO), "undo");
 
-            await _editFileAndVerifyLivePreview("simple1.html", { line: 11, ch: 45 }, 'hello world ',
-                "testId", "Brackets is hello world awesome!");
+            await _editFileAndVerifyLivePreview("simple2.html", { line: 11, ch: 45 }, 'hello world ',
+                "simpId", "Brackets is hello world awesome!");
 
             await endPreviewSession();
         }, 30000);