Fix for issue #376: Only create browser session if matching test files

dkl-ppi · Nov 22, 2013 · 2e3f84b · 2e3f84b
1 parent c72cfda
commit 2e3f84b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/lib/runners/browser.js b/lib/runners/browser.js
@@ -210,7 +210,8 @@ var testRun = {
                 }
 
                 runner.setSlaves(slaves);
-                var hookError = this.extensionHook("testRun", runner, sessionClient);
+                var hookError = this.extensionHook("testRun",
+                    runner, sessionClient);
 
                 if (hookError) {
                     this.endSession(sessionClient);
@@ -227,18 +228,23 @@ var testRun = {
                 // Temporary, ramp provides a Buffer for the message
                 error.message = error.message.toString();
                 return callback(error);
-            }.bind(this));
+            }.bind(this)
+        );
     },
 
     startSession: function (client, callback) {
         return function (resourceSet) {
             if (this.aborted) { return callback(); }
+            if (resourceSet.loadPath.paths().length === 3) {
+                return this.done();
+            }
             this.logger.info("Creating browser session");
 
             resourceSet.addResource({
                 path: "/buster/configure-test-run.js",
                 content: "buster.configureTestRun(" + JSON.stringify({
-                    failOnNoAssertions: opt(this.options, "failOnNoAssertions", true),
+                    failOnNoAssertions: opt(this.options,
+                        "failOnNoAssertions", true),
                     autoRun: opt(this.config.options, "autoRun", true),
                     captureConsole: opt(this.options, "captureConsole", true),
                     filters: opt(this.options, "filters", undefined)

diff --git a/test/runners/browser-test.js b/test/runners/browser-test.js
@@ -114,6 +114,21 @@ buster.testCase("Browser runner", {
             refute.called(this.serverClient.createSession);
         },
 
+        "not if no matching test files": function () {
+            var resourceSet = [
+                { path: '/buster/bundle-0.7.js', cacheable: true},
+                { path: '/buster/compat-0.7.js', cacheable: true},
+                { path: '/buster/capture-server-wiring.js', cacheable: true}
+            ];
+            this.config.resolve.returns(when(resourceSet));
+
+            this.runner.run(this.config, {
+                cacheable: true
+            });
+
+            refute.called(this.serverClient.createSession);
+        },
+
         "//with configured resource set": function (done) {
             this.config.resolve.returns(when([42]));