Merge pull request #1711 from MimiDumpling/mimi-fix-commit

Fixed merged commit text

Author: Tilde Ann Thurium

lib/views/timeline-items/merged-event-view.js

@@ -27,7 +27,7 @@ export class BareMergedEventView extends React.Component {
         <Octicon className="pre-timeline-item-icon" icon="git-merge" />
         {actor && <img className="author-avatar" src={actor.avatarUrl} alt={actor.login} title={actor.login} />}
         <span className="merged-event-header">
-          <span className="username">{actor ? actor.login : 'someone'}</span> merged
+          <span className="username">{actor ? actor.login : 'someone'}</span> merged{' '}
           {this.renderCommit()} into
           {' '}<span className="merge-ref">{mergeRefName}</span> on <Timeago time={createdAt} />
         </span>

test/views/timeline-items/merged-event-view.test.js

@@ -60,4 +60,11 @@ describe('MergedEventView', function() {
     assert.strictEqual(wrapper.find('.username').text(), 'someone');
     assert.isFalse(wrapper.find('.sha').exists());
   });
+
+  it('renders a space between merged and commit', function() {
+    const wrapper = shallow(buildApp({}));
+    const text = wrapper.find('.merged-event-header').text();
+
+    assert.isTrue(text.includes('merged commit'));
+  });
 });