Merge pull request atom#1888 from atom/vy/fall-back-gitlog-users

vanessayuenn · web-flow · commit fda1aa069e05 · 2019-01-08T13:42:17.000+01:00
mentionable users fall back
diff --git a/lib/models/user-store.js b/lib/models/user-store.js
@@ -100,10 +100,16 @@ export default class UserStore {
     this.setCommitter(data.committer);
     const githubRemotes = Array.from(data.remotes).filter(remote => remote.isGithubRepo());
 
-    if (githubRemotes.length === 0) {
-      this.addUsers(data.authors, source.GITLOG);
-    } else {
+    if (githubRemotes.length > 0) {
       await this.loadUsersFromGraphQL(githubRemotes);
+    } else {
+      this.addUsers(data.authors, source.GITLOG);
+    }
+
+    // if for whatever reason, no committers can be added, fall back to
+    // using git log committers as the last resort
+    if (this.allUsers.size === 0) {
+      this.addUsers(data.authors, source.GITLOG);
     }
   }
 
diff --git a/test/models/user-store.test.js b/test/models/user-store.test.js
@@ -97,6 +97,21 @@ describe('UserStore', function() {
     assert.deepEqual(store.committer, new Author(FAKE_USER.email, FAKE_USER.name));
   });
 
+  it('falls back to local git users and committers if loadMentionableUsers cannot load any user for whatever reason', async function() {
+    const workdirPath = await cloneRepository('multiple-commits');
+    const repository = await buildRepository(workdirPath);
+
+    store = new UserStore({repository, config});
+    sinon.stub(store, 'loadMentionableUsers').returns(undefined);
+
+    await store.loadUsers();
+    await nextUpdatePromise();
+
+    assert.deepEqual(store.getUsers(), [
+      new Author('kuychaco@github.com', 'Katrina Uychaco'),
+    ]);
+  });
+
   it('loads store with mentionable users from the GitHub API in a repo with a GitHub remote', async function() {
     await login.setToken('https://api.github.com', '1234');
 
@@ -223,12 +238,12 @@ describe('UserStore', function() {
     const workdirPath = await cloneRepository('multiple-commits');
     const repository = await buildRepository(workdirPath);
     store = new UserStore({repository, config});
+    sinon.spy(store, 'addUsers');
     await assert.async.lengthOf(store.getUsers(), 1);
+    await assert.async.equal(store.addUsers.callCount, 1);
 
-    sinon.spy(store, 'addUsers');
     // make a commit with FAKE_USER as committer
     await repository.commit('made a new commit', {allowEmpty: true});
-    await assert.async.equal(store.addUsers.callCount, 1);
 
     // verify that FAKE_USER is in commit history
     const lastCommit = await repository.getLastCommit();
