From f89effafb5972786b1a1f43034283ce356bc0c37 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Mon, 4 May 2020 14:54:43 -0400
Subject: [PATCH] Bug 1831131: Fix Cluster Dashboard test

Update Channel will no longer be set in CI. Don't fail the test if it's
`Not available`.

See https://github.com/openshift/release/pull/8631
---
 .../dashboards/cluster-dashboard.scenario.ts  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/frontend/integration-tests/tests/dashboards/cluster-dashboard.scenario.ts b/frontend/integration-tests/tests/dashboards/cluster-dashboard.scenario.ts
index 02bed2dabd0..64232709914 100644
--- a/frontend/integration-tests/tests/dashboards/cluster-dashboard.scenario.ts
+++ b/frontend/integration-tests/tests/dashboards/cluster-dashboard.scenario.ts
@@ -20,21 +20,26 @@ describe('Cluster Dashboard', () => {
   describe('Details Card', () => {
     it('has all fields populated', async () => {
       expect(clusterDashboardView.detailsCard.isDisplayed()).toBe(true);
+      const expectedItems = [
+        'Cluster API Address',
+        'Cluster ID',
+        'Provider',
+        'OpenShift Version',
+        'Update Channel',
+      ];
       const items = clusterDashboardView.detailsCardList.$$('dt');
       const values = clusterDashboardView.detailsCardList.$$('dd');
-
-      expect(items.count()).toBe(5);
-      expect(values.count()).toBe(5);
-      expect(items.get(0).getText()).toEqual('Cluster API Address');
-      expect(items.get(1).getText()).toEqual('Cluster ID');
-      expect(items.get(2).getText()).toEqual('Provider');
-      expect(items.get(3).getText()).toEqual('OpenShift Version');
-      expect(items.get(4).getText()).toEqual('Update Channel');
-      for (let i = 0; i < 5; i++) {
+      expect(items.count()).toBe(expectedItems.length);
+      expect(values.count()).toBe(expectedItems.length);
+      expectedItems.forEach((label: string, i: number) => {
+        expect(items.get(i).getText()).toBe(label);
         const text = values.get(i).getText();
         expect(text.length).not.toBe(0);
-        expect(text).not.toBe('Not available');
-      }
+        // `Update Channel` is expected to be `Not available` in CI.
+        if (label !== 'Update Channel') {
+          expect(text).not.toBe('Not available');
+        }
+      });
     });
     it('has View settings link', () => {
       const link = clusterDashboardView.detailsCard.$('[href="/settings/cluster/"]');