Merge commit 'bb4f4d0fdaae509cafd467364947717f0c70cb4d' into pflynn/fix-LiveDevMultiBrowser-loop

peterflynn · peterflynn · commit 19122c933edc · 2014-12-17T09:19:02.000-08:00
* commit 'bb4f4d0fdaae509cafd467364947717f0c70cb4d':
  LiveDevMultiBrowser should properly search parent directories for an index.html.
diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js
@@ -417,7 +417,7 @@ define(function (require, exports, module) {
                 // We found no good match
                 if (i === -1) {
                     // traverse the directory tree up one level
-                    containingFolder = FileUtils.getDirectoryPath(containingFolder);
+                    containingFolder = FileUtils.getDirectoryPath(FileUtils.stripTrailingSlash(containingFolder));
                     // Are we still inside the project?
                     if (containingFolder.indexOf(projectRoot) === -1) {
                         stillInProjectTree = false;
diff --git a/test/spec/LiveDevelopment-MultiBrowser-test-files/index.html b/test/spec/LiveDevelopment-MultiBrowser-test-files/index.html
@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <title>Test</title>
+        <link rel="stylesheet" href="sub/test.css" />
+    </head>
+    <body>
+        <h1>Hello</h1>
+    </body>
+</html>
diff --git a/test/spec/LiveDevelopment-MultiBrowser-test-files/sub/test.css b/test/spec/LiveDevelopment-MultiBrowser-test-files/sub/test.css
@@ -0,0 +1,3 @@
+body { background-color: red;}
+
+h1 { color: blue; }
diff --git a/test/spec/LiveDevelopmentMultiBrowser-test.js b/test/spec/LiveDevelopmentMultiBrowser-test.js
@@ -102,6 +102,18 @@ define(function (require, exports, module) {
                 });
             });
             
+            it("should find an index.html in a parent directory", function () {
+                runs(function () {
+                    waitsForDone(SpecRunnerUtils.openProjectFiles(["sub/test.css"]), "SpecRunnerUtils.openProjectFiles sub/test.css", 1000);
+                });
+
+                waitsForLiveDevelopmentToOpen();
+
+                runs(function () {
+                    expect(LiveDevelopment._getCurrentLiveDoc().doc.url).toMatch(/\/index\.html$/);
+                });
+            });
+
             it("should send all external stylesheets as related docs on start-up", function () {
                 var liveDoc;
                 runs(function () {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+body { background-color: red;}`
	`2`	`+`
	`3`	`+h1 { color: blue; }`