commit 9a70d98f8d83d59f47d86723bef5e02d4289523d
author Wyatt Allen <wyatta@google.com> Fri Jan 27 12:02:10 2017 -0800
committer Wyatt Allen <wyatta@google.com> Fri Jan 27 22:57:35 2017 +0000
tree 5dd51a0fc7eab519c69d5c2d76be2b26da048e33
parent a553fe687d1aad8ae8c4828338284c950cfbb61c

Fix action sort comparator and test

Change-Id: I0af2ce63ff6b638ad95521b0ce42c2c7ce2c1878

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

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 331c3c5..8a52e33 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
@@ -700,10 +700,10 @@
       }
 
       // Change actions appear before revision actions.
-      if (actionA.__type === 'change' && actionB.__type === 'revision') {
-        return -1;
-      } else if (actionA.__type === 'revision' && actionB.__type === 'change') {
+     if (actionA.__type === 'change' && actionB.__type === 'revision') {
         return 1;
+      } else if (actionA.__type === 'revision' && actionB.__type === 'change') {
+        return -1;
       }
 
       // Otherwise, sort by the button label.

polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.html

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 dbdf00f..b855dcc 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
@@ -203,13 +203,17 @@
 
     test('_actionComparator sort order', function() {
       var actions = [
-        {label: '123', type: 'change', __key: 'review'},
-        {label: 'abc',type: 'revision'},
-        {label: 'abc',type: 'change'},
-        {label: 'def', type: 'change'},
-        {label: 'def', type: 'change',__primary: true},
+        {label: '123', __type: 'change', __key: 'review'},
+        {label: 'abc', __type: 'revision'},
+        {label: 'abc', __type: 'change'},
+        {label: 'def', __type: 'change'},
+        {label: 'def', __type: 'change', __primary: true},
       ];
-      var result = actions.slice().sort(element._actionComparator);
+
+      var result = actions.slice()
+      result.reverse();
+      result.sort(element._actionComparator);
+
       assert.deepEqual(result, actions);
     });