Remove focused tests, add await to exec calls

daviwil · daviwil · commit 06c00b52e4f8 · 2018-01-17T17:07:19.000-08:00
diff --git a/test/controllers/file-patch-controller.test.js b/test/controllers/file-patch-controller.test.js
@@ -325,8 +325,8 @@ describe('FilePatchController', function() {
         const workingDirPath = await cloneRepository('symlinks');
         const repository = await buildRepository(workingDirPath);
 
-          // correctly handle symlinks on Windows
-        repository.git.exec(['config', 'core.symlinks', 'true']);
+        // correctly handle symlinks on Windows
+        await repository.git.exec(['config', 'core.symlinks', 'true']);
 
         const deletedSymlinkAddedFilePath = 'symlink.txt';
         fs.unlinkSync(path.join(workingDirPath, deletedSymlinkAddedFilePath));
@@ -389,23 +389,17 @@ describe('FilePatchController', function() {
         assert.autocrlfEqual(await repository.readFileFromIndex(deletedFileAddedSymlinkPath), 'foo\n\n');
       });
 
-      it.only('stages symlink change when staging added lines that depend on change', async function() {
+      it('stages symlink change when staging added lines that depend on change', async function() {
         const workingDirPath = await cloneRepository('symlinks');
         const repository = await buildRepository(workingDirPath);
 
         // correctly handle symlinks on Windows
-        repository.git.exec(['config', 'core.symlinks', 'true']);
+        await repository.git.exec(['config', 'core.symlinks', 'true']);
 
         const deletedSymlinkAddedFilePath = 'symlink.txt';
         fs.unlinkSync(path.join(workingDirPath, deletedSymlinkAddedFilePath));
         fs.writeFileSync(path.join(workingDirPath, deletedSymlinkAddedFilePath), 'qux\nfoo\nbar\nbaz\nzoo\n', 'utf8');
-
-        console.log(workingDirPath);
-        debugger;
-        // cd into directory and view in atom. do hunks show up?
-
-        // try adding 'initialStagingStatus: 'unstaged''
-
+        
         const component = createComponent(repository, deletedSymlinkAddedFilePath);
         const wrapper = mount(React.cloneElement(component, {filePath: deletedSymlinkAddedFilePath}));
 
@@ -493,7 +487,7 @@ describe('FilePatchController', function() {
         const workingDirPath = await cloneRepository('symlinks');
         const repository = await buildRepository(workingDirPath);
 
-        repository.git.exec(['config', 'core.symlinks', 'true']);
+        await repository.git.exec(['config', 'core.symlinks', 'true']);
 
         const deletedSymlinkAddedFilePath = 'symlink.txt';
         fs.unlinkSync(path.join(workingDirPath, deletedSymlinkAddedFilePath));
diff --git a/test/models/file-patch.test.js b/test/models/file-patch.test.js
@@ -292,27 +292,16 @@ describe('FilePatch', function() {
     });
 
     describe('typechange file patches', function() {
-      it.only('handles typechange patches for a symlink replaced with a file', async function() {
+      it('handles typechange patches for a symlink replaced with a file', async function() {
         const workdirPath = await cloneRepository('symlinks');
         const repository = await buildRepository(workdirPath);
 
-        repository.git.exec(['config', 'core.symlinks', 'true']);
+        await repository.git.exec(['config', 'core.symlinks', 'true']);
 
         const deletedSymlinkAddedFilePath = 'symlink.txt';
         fs.unlinkSync(path.join(workdirPath, deletedSymlinkAddedFilePath));
         fs.writeFileSync(path.join(workdirPath, deletedSymlinkAddedFilePath), 'qux\nfoo\nbar\n', 'utf8');
 
-        console.log(workdirPath);
-        debugger;
-        // cd into folder and see what diff looks like
-          // if not then perhaps symlinks are not being treated correctly on windows.
-            // is mode changing correctly? should we manually change it?
-            // should we ignore test? is it even relevant?
-          // if it matches below there's app logic error
-            // file isn't being marked as deleted
-            // header for patch added is missing entirely
-            // check toString method
-
         const patch = await repository.getFilePatchForPath(deletedSymlinkAddedFilePath);
         assert.equal(patch.toString(), dedent`
           diff --git a/symlink.txt b/symlink.txt
