Test for Index.conflictAdd

dkoontz · dkoontz · commit 26ab62b1d8b2 · 2016-03-02T16:34:19.000-07:00
diff --git a/test/tests/index.js b/test/tests/index.js
@@ -9,6 +9,7 @@ var writeFile = promisify(function(filename, data, callback) {
 });
 
 describe("Index", function() {
+  var IndexUtils = require("../utils/index_setup");
   var RepoUtils = require("../utils/repository_setup");
   var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
@@ -307,4 +308,52 @@ describe("Index", function() {
         return Promise.all(promises);
       });
   });
+
+  it("can add a conflict to the index", function() {
+    var repo;
+    var repoPath = path.join(__dirname, "..", "repos", "index");
+    var ourBranchName = "ours";
+    var theirBranchName = "theirs";
+    var fileName = "testFile.txt";
+    var ancestorIndexEntry;
+    var ourIndexEntry;
+    var theirIndexEntry;
+
+    return RepoUtils.createRepository(repoPath)
+      .then(function(_repo) {
+        repo = _repo;
+        return IndexUtils.createConflict(
+          repo,
+          ourBranchName,
+          theirBranchName,
+          fileName
+        );
+      })
+      .then(function(indexEntries) {
+        // Store all indexEntries for conflict
+        ancestorIndexEntry = indexEntries.ancestor_out;
+        ourIndexEntry = indexEntries.our_out;
+        theirIndexEntry = indexEntries.their_out;
+
+        // Stage conflicted file
+        return RepoUtils.addFileToIndex(repo, fileName);
+      })
+      .then(function() {
+        return repo.openIndex();
+      })
+      .then(function(index) {
+        assert.ok(!index.hasConflicts());
+        return index.conflictAdd(
+          ancestorIndexEntry,
+          ourIndexEntry,
+          theirIndexEntry
+        );
+      })
+      .then(function() {
+        return repo.openIndex();
+      })
+      .then(function(index) {
+        assert(index.hasConflicts());
+      });
+  });
 });
diff --git a/test/utils/index_setup.js b/test/utils/index_setup.js
@@ -0,0 +1,105 @@
+var assert = require("assert");
+var NodeGit = require("../../");
+var path = require("path");
+var promisify = require("promisify-node");
+var fse = promisify(require("fs-extra"));
+var RepoUtils = require("../utils/repository_setup");
+
+var IndexSetup = {
+  createConflict: function createConflict(
+    repository,
+    _ourBranchName,
+    _theirBranchName,
+    _fileName
+  ) {
+    var fileName = _fileName || "everyonesFile.txt";
+
+    var ourBranchName = _ourBranchName || "ours";
+    var theirBranchName = _theirBranchName || "theirs";
+
+    var baseFileContent = "How do you feel about Toll Roads?\n";
+    var ourFileContent = "I like Toll Roads. I have an EZ-Pass!\n";
+    var theirFileContent = "I'm skeptical about Toll Roads\n";
+
+    var ourSignature = NodeGit.Signature.create
+          ("Ron Paul", "RonPaul@TollRoadsRBest.info", 123456789, 60);
+    var theirSignature = NodeGit.Signature.create
+          ("Greg Abbott", "Gregggg@IllTollYourFace.us", 123456789, 60);
+
+    var ourCommit;
+    var ourBranch;
+    var theirBranch;
+
+    return fse.writeFile(
+      path.join(repository.workdir(), fileName),
+      baseFileContent
+    )
+      .then(function() {
+        return RepoUtils.addFileToIndex(repository, fileName);
+      })
+      .then(function(oid) {
+        return repository.createCommit("HEAD", ourSignature,
+          ourSignature, "initial commit", oid, []);
+      })
+      .then(function(commitOid) {
+        return repository.getCommit(commitOid).then(function(commit) {
+          ourCommit = commit;
+        }).then(function() {
+          console.log("after creating base commit");
+          return repository.createBranch(ourBranchName, commitOid)
+            .then(function(branch) {
+              console.log("after creating our branch");
+              ourBranch = branch;
+              return repository.createBranch(theirBranchName, commitOid);
+            });
+        });
+      })
+      .then(function(branch) {
+        console.log("after creating their commit");
+
+        theirBranch = branch;
+        return fse.writeFile(path.join(repository.workdir(), fileName),
+          baseFileContent + theirFileContent);
+      })
+      .then(function() {
+        return RepoUtils.addFileToIndex(repository, fileName);
+      })
+      .then(function(oid) {
+        return repository.createCommit(theirBranch.name(), theirSignature,
+          theirSignature, "they made a commit", oid, [ourCommit]);
+      })
+      .then(function(commitOid) {
+        return fse.writeFile(path.join(repository.workdir(), fileName),
+          baseFileContent + ourFileContent);
+      })
+      .then(function() {
+        return RepoUtils.addFileToIndex(repository, fileName);
+      })
+      .then(function(oid) {
+        return repository.createCommit(ourBranch.name(), ourSignature,
+            ourSignature, "we made a commit", oid, [ourCommit]);
+      })
+      .then(function(commitOid) {
+        var opts = {
+          checkoutStrategy: NodeGit.Checkout.STRATEGY.FORCE
+        };
+
+        return NodeGit.Checkout.head(repository, opts);
+      })
+      .then(function() {
+        return repository.mergeBranches(ourBranchName, theirBranchName);
+      })
+      .then(function(commit) {
+        assert.fail(commit, undefined,
+          "The index should have been thrown due to merge conflicts");
+      })
+      .catch(function(index) {
+        assert.ok(index);
+        assert.ok(index.hasConflicts());
+
+        return index.conflictGet(fileName);
+      });
+  }
+};
+
+module.exports = IndexSetup;
