Merge pull request #5915 from adobe/jasonsanjose/specrunner-copy

Implement copy with npm module fs-extra

Author: ingorichter

test/SpecRunner.js

@@ -80,7 +80,6 @@ define(function (require, exports, module) {
     var selectedSuites,
         params                  = new UrlParams(),
         reporter,
-        _nodeConnectionDeferred = new $.Deferred(),
         reporterView,
         _writeResults           = new $.Deferred(),
         _writeResultsPromise    = _writeResults.promise(),
@@ -275,39 +274,6 @@ define(function (require, exports, module) {
     }
 
     function init() {
-        // Start up the node connection, which is held in the
-        // _nodeConnectionDeferred module variable. (Use
-        // _nodeConnectionDeferred.done() to access it.
-        
-        // This is in SpecRunner rather than SpecRunnerUtils because the hope
-        // is to hook up jasmine-node tests in this test runner.
-        
-        // TODO: duplicates code from StaticServer
-        // TODO: can this be done lazily?
-        
-        var connectionTimeout = setTimeout(function () {
-            console.error("[SpecRunner] Timed out while trying to connect to node");
-            _nodeConnectionDeferred.reject();
-        }, NODE_CONNECTION_TIMEOUT);
-        
-        var _nodeConnection = new NodeConnection();
-        _nodeConnection.connect(true).then(function () {
-            var domainPath = FileUtils.getNativeBracketsDirectoryPath() + "/" + FileUtils.getNativeModuleDirectoryPath(module) + "/../test/node/TestingDomain";
-            
-            _nodeConnection.loadDomains(domainPath, true)
-                .then(
-                    function () {
-                        clearTimeout(connectionTimeout);
-                        _nodeConnectionDeferred.resolve(_nodeConnection);
-                    },
-                    function () { // Failed to connect
-                        console.error("[SpecRunner] Failed to connect to node", arguments);
-                        clearTimeout(connectionTimeout);
-                        _nodeConnectionDeferred.reject();
-                    }
-                );
-        });
-
         selectedSuites = (params.get("suite") || localStorage.getItem("SpecRunner.suite") || "unit").split(",");
 
         // Create a top-level filter to show/hide performance and extensions tests
@@ -410,19 +376,29 @@ define(function (require, exports, module) {
         }, true);
     }
 
-    /**
-     * Allows access to the deferred that manages the node connection for tests.
-     *
-     * @return {jQuery.Deferred} The deferred that manages the node connection
-     */
-    function getNodeConnectionDeferred() {
-        return _nodeConnectionDeferred;
+    function connectToTestDomain() {
+        var _nodeConnectionDeferred = new $.Deferred(),
+            _nodeConnection = new NodeConnection();
+
+        _nodeConnection.connect(true).then(function () {
+            var domainPath = FileUtils.getNativeBracketsDirectoryPath() + "/" + FileUtils.getNativeModuleDirectoryPath(module) + "/../test/node/TestingDomain";
+            
+            _nodeConnection.loadDomains(domainPath, true)
+                .then(init, function () {
+                    // Failed to connect
+                    console.error("[SpecRunner] Failed to connect to node", arguments);
+                    
+                    var container = $('<div class="container-fluid">');
+                    container.append('<div class="alert alert-error">Failed to connect to Node</div>');
+                    
+                    $(window.document.body).append(container);
+                });
+        });
+
+        Async.withTimeout(_nodeConnectionDeferred.promise(), NODE_CONNECTION_TIMEOUT);
+        
+        brackets.testing = { nodeConnection: _nodeConnection };
     }
 
-    // this is used by SpecRunnerUtils
-    brackets.testing = {
-        getNodeConnectionDeferred: getNodeConnectionDeferred
-    };
-    
-    init();
+    connectToTestDomain();
 });

test/node/TestingDomain.js

@@ -49,6 +49,25 @@ function init(domainManager) {
             description: "path to the directory to remove"
         }]
     );
+    domainManager.registerCommand(
+        "testing",
+        "copy",
+        fs.copy,
+        true,
+        "Copy a file or directory. The directory can have contents. Like cp -r.",
+        [
+            {
+                name: "src",
+                type: "string",
+                description: "directory source to copy"
+            },
+            {
+                name: "dest",
+                type: "string",
+                description: "destination directory"
+            }
+        ]
+    );
 }
 
 exports.init = init;

test/spec/LiveDevelopment-test.js

@@ -547,7 +547,7 @@ define(function (require, exports, module) {
 
             // copy files to temp directory
             runs(function () {
-                waitsForDone(SpecRunnerUtils.copyPath(testPath, tempDir), "copy temp files");
+                waitsForDone(SpecRunnerUtils.copy(testPath, tempDir), "copy temp files");
             });
 
             // open project

test/spec/LowLevelFileIO-test.js

@@ -96,7 +96,7 @@ define(function (require, exports, module) {
             runs(function () {
                 // create the test folder and init the test files
                 var testFiles = SpecRunnerUtils.getTestPath("/spec/LowLevelFileIO-test-files");
-                waitsForDone(SpecRunnerUtils.copyPath(testFiles, baseDir), "copy temp files");
+                waitsForDone(SpecRunnerUtils.copy(testFiles, baseDir), "copy temp files");
             });
             runs(function () {
                 // Pre-test setup - set permissions on special directories 

test/spec/SpecRunnerUtils.js

@@ -54,7 +54,6 @@ define(function (require, exports, module) {
         _rootSuite              = { id: "__brackets__" },
         _unitTestReporter;
 
-    
     /**
      * Delete a path
      * @param {string} fullPath
@@ -110,35 +109,30 @@ define(function (require, exports, module) {
         return deferred.promise();
     }
 
+    function testDomain() {
+        return brackets.testing.nodeConnection.domains.testing;
+    }
+    
     /**
      * Remove a directory (recursively) or file
      *
      * @param {!string} path Path to remove
      * @return {$.Promise} Resolved when the path is removed, rejected if there was a problem
      */
     function remove(path) {
-        var d = new $.Deferred();
-        var nodeDeferred = brackets.testing.getNodeConnectionDeferred();
-        nodeDeferred
-            .done(function (connection) {
-                if (connection.connected()) {
-                    connection.domains.testing.remove(path)
-                        .done(function () {
-                            d.resolve();
-                        })
-                        .fail(function () {
-                            d.reject();
-                        });
-                } else {
-                    d.reject();
-                }
-            })
-            .fail(function () {
-                d.reject();
-            });
-        return d.promise();
+        return testDomain().remove(path);
+    }
+    
+    /**
+     * Copy a directory (recursively) or file
+     *
+     * @param {!string}     src     Path to copy
+     * @param {!string}     dest    Destination directory
+     * @return {$.Promise} Resolved when the path is copied, rejected if there was a problem
+     */
+    function copy(src, dest) {
+        return testDomain().copy(src, dest);
     }
-        
 
     /**
      * Resolves a path string to a File or Directory
@@ -1248,6 +1242,7 @@ define(function (require, exports, module) {
 
     exports.chmod                           = chmod;
     exports.remove                          = remove;
+    exports.copy                            = copy;
     exports.getTestRoot                     = getTestRoot;
     exports.getTestPath                     = getTestPath;
     exports.getTempDirectory                = getTempDirectory;