Merge branch 'fix-save-data-source-cypress-test' into 'main'

Fix save data source cypress test

See merge request !63

CHANGELOG.md

@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
+## [1.6.3-bb.1] - 2023-10-27
+### Changed
+- Add additional constant output to cypress test for save/test tempo data source
+
 ## [1.6.3-bb.0] - 2023-10-19
 ### Changed
 - Bumped chart version to 1.6.3

README.md

 # tempo
 
-![Version: 1.6.3-bb.0](https://img.shields.io/badge/Version-1.6.3--bb.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+![Version: 1.6.3-bb.1](https://img.shields.io/badge/Version-1.6.3--bb.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 

chart/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.6.3-bb.0
+version: 1.6.3-bb.1
 appVersion: 2.2.3
 engine: gotpl
 home: https://grafana.net

chart/tests/cypress/e2e/tempo-health.cy.js

@@ -43,6 +43,10 @@ describe('Tempo Test', function () {
       // Visit the datasources page
       cy.visit(`${Cypress.env('grafana_url')}/connections/datasources`);
 
+      // Set constant for output options to save/test data source
+      const saveOutputOptions = ['Data source is working', 'Data source successfully connected']
+      const saveOutput = new RegExp(`${saveOutputOptions.join('|')}`, 'g')
+
       // Enter 'tempo' in the search field and
       cy.get('input[placeholder="Search by name or type"]').type('tempo');
       // Click on the tempo datasource
@@ -50,7 +54,7 @@ describe('Tempo Test', function () {
       // Click on the 'Save & test` button
       cy.get('button[type="submit"]').click();
       // Check to ensure the data source is working
-      cy.get('.p-t-2').contains('Data source is working', { timeout: 10000 });
+      cy.get('.p-t-2').contains(saveOutput, { timeout: 10000 });
     });
 
     after(function () {