test(e2e): clean up tests thanks to Eriks feedback

jackw · Mar 1, 2024 · a99bc54 · a99bc54
1 parent b677077
commit a99bc54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/components/TrafficLightPanel.tsx b/src/components/TrafficLightPanel.tsx
@@ -44,15 +44,15 @@ export function TrafficLightPanel({
 
  if (status === LightsDataResultStatus.nodata) {
  return (
- <div style={styles.centeredContent}>
+ <div data-testid="feedback-message-container" style={styles.centeredContent}>
  <h4>The query returned no data.</h4>
  </div>
  );
  }
 
  if (status === LightsDataResultStatus.unsupported) {
  return (
- <div style={styles.centeredContent}>
+ <div data-testid="feedback-message-container" style={styles.centeredContent}>
  <h4>This data format is unsupported.</h4>
  </div>
  );

diff --git a/tests/traffic-light.spec.ts b/tests/traffic-light.spec.ts
@@ -13,7 +13,7 @@ test('Panel displays a traffic light when thresholds are correctly set', async (
  await panelEditPage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).click();
  await page.keyboard.insertText(`time, value
 10000000000, 100`);
- await panelEditPage.getByTestIdOrAriaLabel('Refresh dashboard').click();
+ panelEditPage.refreshPanel();
  const trafficLightPanel = await page.getByTestId('heywesty-traffic-light');
  await expect(trafficLightPanel).toBeVisible();
  await expect(trafficLightPanel.getByTestId('traffic-light-go')).toBeVisible();
@@ -23,14 +23,14 @@ test('Panel displays a traffic light when thresholds are correctly set', async (
  await page.keyboard.press('Backspace');
  await page.keyboard.insertText(`time, value
 10000000000, 85`);
- await panelEditPage.getByTestIdOrAriaLabel('Refresh dashboard').click();
+ panelEditPage.refreshPanel();
  await expect(trafficLightPanel.getByTestId('traffic-light-ready')).toBeVisible();
 
  await panelEditPage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).click();
  await page.keyboard.press('Control+A');
  await page.keyboard.press('Backspace');
  await page.keyboard.insertText(`time, value
 10000000000, 50`);
- await panelEditPage.getByTestIdOrAriaLabel('Refresh dashboard').click();
+ panelEditPage.refreshPanel();
  await expect(trafficLightPanel.getByTestId('traffic-light-stop')).toBeVisible();
 });
diff --git a/tests/unsupported-state.spec.ts b/tests/unsupported-state.spec.ts
@@ -11,10 +11,10 @@ test('Panel displays threshold assistant when thresholds incorrectly set', async
  await expect(thresholdsAssistant).toBeVisible();
  const invalidThresholds = await thresholdsAssistant.getByText('Threshold not configured');
 
- await expect(await invalidThresholds.count()).toBe(1);
+ await expect(await invalidThresholds).toHaveCount(1);
  await page.getByRole('button', { name: /Remove Threshold 1/i }).click();
 
- await expect(await invalidThresholds.count()).toBe(2);
+ await expect(await invalidThresholds).toHaveCount(2);
  await page.getByRole('button', { name: /add Threshold/i }).click();
  await page.getByRole('button', { name: /add Threshold/i }).click();
 
@@ -32,8 +32,7 @@ test('Panel displays no data message when no data is returned', async ({ panelEd
  await page.keyboard.press('Enter');
 
  await expect(panelEditPage.getVisualizationName()).toHaveText('Traffic Light');
- const noDataMessage = await page.getByText('The query returned no data.');
- await expect(noDataMessage).toBeVisible();
+ await expect(await page.getByTestId('feedback-message-container')).toHaveText('The query returned no data.');
  await expect(page.getByTestId('heywesty-traffic-light')).not.toBeVisible();
 });
 
@@ -56,7 +55,6 @@ test('Panel displays unsupported message when data format is unsupported', async
  await panelEditPage.getByTestIdOrAriaLabel('Refresh dashboard').click();
 
  await expect(panelEditPage.getVisualizationName()).toHaveText('Traffic Light');
- const unsupportedMessage = await page.getByText('This data format is unsupported.');
- await expect(unsupportedMessage).toBeVisible();
+ await expect(await page.getByTestId('feedback-message-container')).toHaveText('This data format is unsupported.');
  await expect(page.getByTestId('heywesty-traffic-light')).not.toBeVisible();
 });