added test for cherrypicking a stash commit

jdgarcia · jdgarcia · commit c1c48523eb37 · 2015-06-01T13:19:17.000-07:00
diff --git a/test/tests/cherrypick.js b/test/tests/cherrypick.js
@@ -72,7 +72,10 @@ describe("Cherrypick", function() {
       theirSignature: theirSignature,
 
       ourFileName: ourFileName,
-      theirFileName: theirFileName
+      theirFileName: theirFileName,
+
+      ourFileContent: ourFileContent,
+      theirFileContent: theirFileContent
     };
 
     return Promise.all([
@@ -228,4 +231,67 @@ describe("Cherrypick", function() {
           repoInfo.theirFileName + " should exist");
       });
   });
+
+  it("can cherrypick a stash to apply it", function() {
+    var repo = this.repository;
+    var workDirPath = repo.workdir();
+    var repoInfo;
+    var cherrypickOid;
+
+    var addedContent = "\nIt makes things E-Z!";
+
+    return setupBranches(repo, true)
+      .then(function(info) {
+        repoInfo = info;
+
+        return repo.getStatus();
+      })
+      .then(function(statuses) {
+        assert.equal(statuses.length, 0);
+
+        return fse.writeFile(path.join(workDirPath, repoInfo.ourFileName),
+          repoInfo.ourFileContent + addedContent);
+      })
+      .then(function() {
+        return repo.getStatus();
+      })
+      .then(function(statuses) {
+        assert.equal(statuses.length, 1);
+
+        return NodeGit.Stash.save(repo, repoInfo.ourSignature, "our stash", 0);
+      })
+      .then(function(oid) {
+        cherrypickOid = oid;
+
+        return fse.readFile(path.join(workDirPath, repoInfo.ourFileName));
+      })
+      .then(function(fileContent) {
+        assert.equal(fileContent, repoInfo.ourFileContent);
+
+        return repo.getStatus();
+      })
+      .then(function(statuses) {
+        assert.equal(statuses.length, 0);
+
+        return repo.getCommit(cherrypickOid);
+      })
+      .then(function(commit) {
+        var opts = {
+          mainline: 1
+        };
+
+        return Cherrypick.cherrypick(repo, commit, opts);
+      })
+      .then(function() {
+        return repo.getStatus();
+      })
+      .then(function(statuses) {
+        assert.equal(statuses.length, 1);
+
+        return fse.readFile(path.join(workDirPath, repoInfo.ourFileName));
+      })
+      .then(function(fileContent) {
+        assert.equal(fileContent, repoInfo.ourFileContent + addedContent);
+      });
+  });
 });
