Merge branch 'master' into sm-message

simurai · web-flow · commit 72ce1f4e40c8 · 2017-06-28T11:19:31.000+09:00
diff --git a/lib/controllers/commit-view-controller.js b/lib/controllers/commit-view-controller.js
@@ -206,9 +206,10 @@ export default class CommitViewController {
 
   closeAllOpenCommitMessageEditors() {
     this.props.workspace.getPanes().forEach(pane => {
-      pane.getItems().forEach(item => {
+      pane.getItems().forEach(async item => {
         if (item && item.getPath && item.getPath() === this.getCommitMessagePath()) {
-          if (!pane.destroyItem(item)) {
+          const destroyed = await pane.destroyItem(item);
+          if (!destroyed) {
             pane.activateItem(item);
           }
         }
diff --git a/test/controllers/commit-view-controller.test.js b/test/controllers/commit-view-controller.test.js
@@ -160,7 +160,7 @@ describe('CommitViewController', function() {
         assert.equal(editor.getText(), 'message in box');
 
         editor.setText('message in editor');
-        editor.save();
+        await editor.save();
 
         commandRegistry.dispatch(atomEnvironment.views.getView(editor), 'pane:split-right-and-copy-active-item');
         await assert.async.notEqual(workspace.getActiveTextEditor(), editor);
@@ -237,7 +237,7 @@ describe('CommitViewController', function() {
         assert.equal(editor.getPath(), controller.getCommitMessagePath());
 
         editor.setText('message in editor');
-        editor.save();
+        await editor.save();
         commandRegistry.dispatch(atomEnvironment.views.getView(workspace), 'github:commit');
 
         await assert.async.equal((await repository.getLastCommit()).getMessage(), 'message in editor');
diff --git a/test/models/workspace-change-observer.test.js b/test/models/workspace-change-observer.test.js
@@ -60,7 +60,7 @@ describe('WorkspaceChangeObserver', function() {
     await changeObserver.start();
 
     editor.setText('change');
-    editor.save();
+    await editor.save();
     await until(() => changeSpy.calledOnce);
 
     changeSpy.reset();
@@ -86,7 +86,7 @@ describe('WorkspaceChangeObserver', function() {
       editor.getBuffer().setPath(path.join(workdirPath, 'renamed-path.txt'));
 
       editor.setText('change');
-      editor.save();
+      await editor.save();
       await assert.async.isTrue(changeSpy.calledWith([{
         directory: workdirPath,
         file: 'renamed-path.txt',

Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,10 @@ export default class CommitViewController {`
`206`	`206`
`207`	`207`	`closeAllOpenCommitMessageEditors() {`
`208`	`208`	`this.props.workspace.getPanes().forEach(pane => {`
`209`		`- pane.getItems().forEach(item => {`
	`209`	`+ pane.getItems().forEach(async item => {`
`210`	`210`	`if (item && item.getPath && item.getPath() === this.getCommitMessagePath()) {`
`211`		`- if (!pane.destroyItem(item)) {`
	`211`	`+ const destroyed = await pane.destroyItem(item);`
	`212`	`+ if (!destroyed) {`
`212`	`213`	`pane.activateItem(item);`
`213`	`214`	`}`
`214`	`215`	`}`