Merge branch '1109-directory'

Author: shakyShane

lib/server/static-server.js

@@ -26,7 +26,7 @@ module.exports = function createServer (bs, scripts) {
          * Add directory Middleware if given in server.directory
          */
         .update("middleware", function (mw) {
-            if (!server.has("directory")) {
+            if (!server.get("directory")) {
                 return mw;
             }
 

test/specs/e2e/server/e2e.server.dirs.js

@@ -150,3 +150,30 @@ describe("E2E server test with base dir array option + directory", function () {
             });
     });
 });
+
+describe("E2E server test with base dir array = false", function () {
+
+    it("should ignore the directory option if a falsey value was given", function (done) {
+        browserSync.reset();
+
+        var config = {
+            server: {
+                baseDir: ["test", "app"],
+                directory: false
+            },
+            logLevel: "silent",
+            open:      false
+        };
+
+        browserSync.init(config, function (err, bs) {
+            request(bs.server)
+                .get("/")
+                .set("accept", "text/html")
+                .expect(200)
+                .end(function (err, res) {
+                    assert.notInclude(res.text, "listing directory /");
+                    done();
+                });
+        });
+    });
+});