commit 371f534383d2d1308806d8b636aa44800a25543a
author Kasper Nilsson <kaspern@google.com> Wed Nov 01 13:08:30 2017 -0700
committer Kasper Nilsson <kaspern@google.com> Fri Nov 03 10:47:08 2017 -0700
tree 0fe7c06e71aafa7c4ebb69c050e65f85a4a4bbe0
parent 344dbd603afc586922e394c623424d81cab0079f

Trim trailing whitespace from commit message edits

Bug: Issue 7194
Change-Id: I87c8dbc62daffc2b10d9e25ee518c081ac31b67d

polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js

diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index c658e8d..ab10f86 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -39,6 +39,8 @@
 
   const REPLY_REFIT_DEBOUNCE_INTERVAL_MS = 500;
 
+  const TRAILING_WHITESPACE_REGEX = /[ \t]+$/gm;
+
   Polymer({
     is: 'gr-change-view',
 
@@ -305,7 +307,8 @@
     },
 
     _handleCommitMessageSave(e) {
-      const message = e.detail.content;
+      // Trim trailing whitespace from each line.
+      const message = e.detail.content.replace(TRAILING_WHITESPACE_REGEX, '');
 
       this.$.jsAPI.handleCommitMessage(this._change, message);
 

polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html

diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index b23a568..93282b0 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -644,6 +644,22 @@
           _change));
     });
 
+    test('_handleCommitMessageSave trims trailing whitespace', () => {
+      const putStub = sandbox.stub(element.$.restAPI, 'putChangeCommitMessage')
+          .returns(Promise.resolve({}));
+
+      const mockEvent = content => { return {detail: {content}}; };
+
+      element._handleCommitMessageSave(mockEvent('test \n  test '));
+      assert.equal(putStub.lastCall.args[1], 'test\n  test');
+
+      element._handleCommitMessageSave(mockEvent('  test\ntest'));
+      assert.equal(putStub.lastCall.args[1], '  test\ntest');
+
+      element._handleCommitMessageSave(mockEvent('\n\n\n\n\n\n\n\n'));
+      assert.equal(putStub.lastCall.args[1], '\n\n\n\n\n\n\n\n');
+    });
+
     test('_computeChangeIdCommitMessageError', () => {
       let commitMessage =
         'Change-Id: I4ce18b2395bca69d7a9aa48bf4554faa56282483';