From 4d2cb86a628dd2f76779835f2813ad5830a00913 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 25 Mar 2021 16:01:44 -0400
Subject: [PATCH 1/4] fix: Trigger zoomin using keyboard shortcut

---
 ui/desktop/CHANGELOG.md             | 5 +++++
 ui/desktop/electron-app/src/menu.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/CHANGELOG.md b/ui/desktop/CHANGELOG.md
index 4c0e99d5c..a85bc4a48 100644
--- a/ui/desktop/CHANGELOG.md
+++ b/ui/desktop/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Canonical reference for changes, improvements, and bugfixes for Boundary Desktop.
 
+## Next
+
+### Changes
+
+- Trigger zoom-in menu option on keyboard shortcut.
 
 ## v1.0.0-beta [CLI 0.1.8] (2021.03.10)
 
diff --git a/ui/desktop/electron-app/src/menu.js b/ui/desktop/electron-app/src/menu.js
index 4a863826f..b4170ace7 100644
--- a/ui/desktop/electron-app/src/menu.js
+++ b/ui/desktop/electron-app/src/menu.js
@@ -49,7 +49,7 @@ const generateMenuTemplate = () => {
         { role: 'reload' },
         { type: 'separator' },
         { role: 'resetZoom' },
-        { role: 'zoomIn' },
+        { role: 'zoomIn', accelerator: 'CommandOrControl+=' },
         { role: 'zoomOut' },
         { type: 'separator' },
         { role: 'togglefullscreen' },

From 83ab375829a97e6dcac223737eef899b6e872f66 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 25 Mar 2021 16:19:59 -0400
Subject: [PATCH 2/4] test: Remove mock in failing origin test in desktop

---
 ui/desktop/tests/acceptance/origin-test.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/desktop/tests/acceptance/origin-test.js b/ui/desktop/tests/acceptance/origin-test.js
index 4d7469c45..ac596acac 100644
--- a/ui/desktop/tests/acceptance/origin-test.js
+++ b/ui/desktop/tests/acceptance/origin-test.js
@@ -178,12 +178,15 @@ module('Acceptance | origin', function (hooks) {
   });
 
   test('can reset origin before authentication', async function (assert) {
-    assert.expect(4);
-    assert.notOk(mockIPC.origin);
+    assert.expect(3);
     await visit(urls.origin);
+    await a11yAudit();
     await fillIn('[name="host"]', window.location.origin);
     await click('[type="submit"]');
-    assert.equal(mockIPC.origin, window.location.origin);
+    assert.equal(
+      this.owner.lookup('controller:origin').origin,
+      window.location.origin
+    );
     assert.equal(currentURL(), urls.authenticate.methods.global);
     await click('.change-origin a');
     assert.equal(currentURL(), urls.origin);

From 28ec1008a072e81b084c0cec119f561d2de0bd85 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 25 Mar 2021 16:36:02 -0400
Subject: [PATCH 3/4] Revert "test: Remove mock in failing origin test in
 desktop"

This reverts commit 83ab375829a97e6dcac223737eef899b6e872f66.
---
 ui/desktop/tests/acceptance/origin-test.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ui/desktop/tests/acceptance/origin-test.js b/ui/desktop/tests/acceptance/origin-test.js
index ac596acac..4d7469c45 100644
--- a/ui/desktop/tests/acceptance/origin-test.js
+++ b/ui/desktop/tests/acceptance/origin-test.js
@@ -178,15 +178,12 @@ module('Acceptance | origin', function (hooks) {
   });
 
   test('can reset origin before authentication', async function (assert) {
-    assert.expect(3);
+    assert.expect(4);
+    assert.notOk(mockIPC.origin);
     await visit(urls.origin);
-    await a11yAudit();
     await fillIn('[name="host"]', window.location.origin);
     await click('[type="submit"]');
-    assert.equal(
-      this.owner.lookup('controller:origin').origin,
-      window.location.origin
-    );
+    assert.equal(mockIPC.origin, window.location.origin);
     assert.equal(currentURL(), urls.authenticate.methods.global);
     await click('.change-origin a');
     assert.equal(currentURL(), urls.origin);

From 682bb14037504612998c51e1539bed266ca6b74a Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 25 Mar 2021 16:38:32 -0400
Subject: [PATCH 4/4] docs: Add pr link to changelog

---
 ui/desktop/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/desktop/CHANGELOG.md b/ui/desktop/CHANGELOG.md
index a85bc4a48..34bb51bf9 100644
--- a/ui/desktop/CHANGELOG.md
+++ b/ui/desktop/CHANGELOG.md
@@ -4,9 +4,9 @@ Canonical reference for changes, improvements, and bugfixes for Boundary Desktop
 
 ## Next
 
-### Changes
+### Bug Fixes
 
-- Trigger zoom-in menu option on keyboard shortcut.
+- ui: Trigger zoom-in menu option on keyboard shortcut. ([PR](https://github.com/hashicorp/boundary-ui/pull/505))
 
 ## v1.0.0-beta [CLI 0.1.8] (2021.03.10)