unit test condition moved to stubbable acceptance test

hashicorp · Nov 2, 2024 · 22dc7db · 22dc7db
1 parent 9f4abff
commit 22dc7db
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss
@@ -142,7 +142,7 @@ $secondaryNavbarHeight: 4.5rem;
     display: flex;
     align-items: center;
 
-    &.is-region {
+    &.single-region {
       display: block;
       padding: 0;
       font-size: 1em;

diff --git a/ui/app/templates/components/region-switcher.hbs b/ui/app/templates/components/region-switcher.hbs
@@ -22,7 +22,7 @@
     </PowerSelect>
   </span>
 {{else if this.system.hasNonDefaultRegion}}
-  <div class="navbar-item is-region">
+  <div class="navbar-item single-region">
     <span>Region: </span>{{this.system.activeRegion}}
   </div>
 {{/if}}
diff --git a/ui/tests/acceptance/regions-test.js b/ui/tests/acceptance/regions-test.js
@@ -36,21 +36,23 @@ module('Acceptance | regions (only one)', function (hooks) {
     await a11yAudit(assert);
   });
 
-  test('when there is only one region, the region switcher is not shown in the nav bar and the region is not in the page title', async function (assert) {
+  test('when there is only one region, and it is the default one, the region switcher is not shown in the nav bar and the region is not in the page title', async function (assert) {
     server.create('region', { id: 'global' });
 
     await JobsList.visit();
 
     assert.notOk(Layout.navbar.regionSwitcher.isPresent, 'No region switcher');
+    assert.notOk(Layout.navbar.singleRegion.isPresent, 'No single region');
     assert.ok(document.title.includes('Jobs'));
   });
 
-  test('when the only region is not named "global", the region switcher still is not shown', async function (assert) {
+  test('when the only region is not named "global", the region switcher still is not shown, but the single region name is', async function (assert) {
     server.create('region', { id: 'some-region' });
 
     await JobsList.visit();
 
     assert.notOk(Layout.navbar.regionSwitcher.isPresent, 'No region switcher');
+    assert.ok(Layout.navbar.singleRegion.isPresent, 'Single region');
   });
 
   test('pages do not include the region query param', async function (assert) {

diff --git a/ui/tests/pages/layout.js b/ui/tests/pages/layout.js
@@ -28,6 +28,11 @@ export default create({
       }),
     },
 
+    singleRegion: {
+      scope: '.single-region',
+      text: text(),
+    },
+
     search: {
       scope: '[data-test-search-parent]',
 

diff --git a/ui/tests/unit/components/region-switcher-test.js b/ui/tests/unit/components/region-switcher-test.js