Merge "Clear cherrypick branch field when cancelling dialog"
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
index 4f9a09d..d059c71 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
@@ -302,6 +302,7 @@
this._showActionDialog(this.$.confirmRebase);
break;
case RevisionActions.CHERRYPICK:
+ this.$.confirmCherrypick.branch = '';
this._showActionDialog(this.$.confirmCherrypick);
break;
case RevisionActions.SUBMIT:
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html
index 83d5bdc..9b566ff 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html
@@ -223,8 +223,9 @@
});
test('works', function() {
- var rebaseButton = element.$$('gr-button[data-action-key="rebase"]');
- MockInteractions.tap(rebaseButton);
+ var cherryPickButton =
+ element.$$('gr-button[data-action-key="cherrypick"]');
+ MockInteractions.tap(cherryPickButton);
var action = {
__key: 'cherrypick',
__type: 'revision',
@@ -252,6 +253,25 @@
}
]);
});
+
+ test('branch name cleared when re-open cherrypick', function() {
+ var cherryPickButton =
+ element.$$('gr-button[data-action-key="cherrypick"]');
+ var action = {
+ __key: 'cherrypick',
+ __type: 'revision',
+ __primary: false,
+ enabled: true,
+ label: 'Cherry Pick',
+ method: 'POST',
+ title: 'Cherry pick change to a different branch',
+ };
+ var emptyBranchName = '';
+ element.$.confirmCherrypick.branch = 'master';
+
+ MockInteractions.tap(cherryPickButton);
+ assert.equal(element.$.confirmCherrypick.branch, emptyBranchName);
+ });
});
test('custom actions', function(done) {
