Action methods in GitTabController

Author: smashwilson

lib/controllers/git-tab-controller.js

@@ -3,7 +3,6 @@ import path from 'path';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {TextBuffer} from 'atom';
-import {CompositeDisposable} from 'event-kit';
 
 import GitTabView from '../views/git-tab-view';
 import UserStore from '../models/user-store';
@@ -87,11 +86,6 @@ export default class GitTabController extends React.Component {
       login: this.props.loginModel,
       config: this.props.config,
     });
-
-    this.subs = new CompositeDisposable(
-      this.usernameBuffer.onDidStopChanging(this.setUsername),
-      this.emailBuffer.onDidStopChanging(this.setEmail),
-    );
   }
 
   static getDerivedStateFromProps(props, state) {
@@ -142,6 +136,8 @@ export default class GitTabController extends React.Component {
 
         toggleIdentityEditor={this.toggleIdentityEditor}
         closeIdentityEditor={this.closeIdentityEditor}
+        setLocalIdentity={this.setLocalIdentity}
+        setGlobalIdentity={this.setGlobalIdentity}
         openInitializeDialog={this.props.openInitializeDialog}
         openFiles={this.props.openFiles}
         discardWorkDirChangesForPaths={this.props.discardWorkDirChangesForPaths}
@@ -371,18 +367,17 @@ export default class GitTabController extends React.Component {
 
   closeIdentityEditor = () => this.setState({editingIdentity: false})
 
-  setUsername = () => {
-    const newUsername = this.usernameBuffer.getText();
-    if (newUsername !== this.props.username) {
-      this.props.repository.setConfig('user.name', newUsername, {global: true});
-    }
-  }
+  setLocalIdentity = () => this.setIdentity({});
 
-  setEmail = () => {
+  setGlobalIdentity = () => this.setIdentity({global: true});
+
+  async setIdentity(options) {
+    const newUsername = this.usernameBuffer.getText();
     const newEmail = this.emailBuffer.getText();
-    if (newEmail !== this.props.email) {
-      this.props.repository.setConfig('user.email', newEmail, {global: true});
-    }
+
+    await this.props.repository.setConfig('user.name', newUsername, options);
+    await this.props.repository.setConfig('user.email', newEmail, options);
+    this.closeIdentityEditor();
   }
 
   restoreFocus() {

test/controllers/git-tab-controller.test.js

@@ -230,6 +230,36 @@ describe('GitTabController', function() {
       assert.strictEqual(wrapper.find('GitTabView').prop('emailBuffer'), emailBuffer);
       assert.strictEqual(emailBuffer.getText(), '[email protected]');
     });
+
+    it('sets repository-local identity', async function() {
+      const repository = await buildRepository(await cloneRepository('three-files'));
+      const setConfig = sinon.stub(repository, 'setConfig');
+
+      const wrapper = mount(await buildApp(repository));
+
+      wrapper.find('GitTabView').prop('usernameBuffer').setText('changed');
+      wrapper.find('GitTabView').prop('emailBuffer').setText('[email protected]');
+
+      await wrapper.find('GitTabView').prop('setLocalIdentity')();
+
+      assert.isTrue(setConfig.calledWith('user.name', 'changed', {}));
+      assert.isTrue(setConfig.calledWith('user.email', '[email protected]', {}));
+    });
+
+    it('sets account-global identity', async function() {
+      const repository = await buildRepository(await cloneRepository('three-files'));
+      const setConfig = sinon.stub(repository, 'setConfig');
+
+      const wrapper = mount(await buildApp(repository));
+
+      wrapper.find('GitTabView').prop('usernameBuffer').setText('changed');
+      wrapper.find('GitTabView').prop('emailBuffer').setText('[email protected]');
+
+      await wrapper.find('GitTabView').prop('setGlobalIdentity')();
+
+      assert.isTrue(setConfig.calledWith('user.name', 'changed', {global: true}));
+      assert.isTrue(setConfig.calledWith('user.email', '[email protected]', {global: true}));
+    });
   });
 
   describe('abortMerge()', function() {