public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Enables end-to-end tests in build-master workflow (#17268)

Browse Source 
* Fix: Adds back necessary aria-labels for e2e tests

* Build: Adds end-to-end-tests job to build-master workflow

* Build: Changes grafana image used
This commit is contained in:
Hugo Häggmark
2019-05-27 12:22:43 +02:00
committed by GitHub
parent 5358c5fe6b
commit db32c7dcf5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+6 -3
View File
@@ -73,7 +73,7 @@ jobs:
end-to-end-test: end-to-end-test:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8-browsers
- image: grafana/grafana:master - image: grafana/grafana-dev:master-$CIRCLE_SHA1
steps: steps:
- run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
- checkout - checkout
@@ -629,7 +629,7 @@ workflows:
- mysql-integration-test - mysql-integration-test
- postgres-integration-test - postgres-integration-test
- build-oss-msi - build-oss-msi
filters: *filter-only-master filters: *filter-only-master
- grafana-docker-master: - grafana-docker-master:
requires: requires:
- build-all - build-all
@@ -662,7 +662,10 @@ workflows:
- mysql-integration-test - mysql-integration-test
- postgres-integration-test - postgres-integration-test
filters: *filter-only-master filters: *filter-only-master
- end-to-end-test:
requires:
- grafana-docker-master
filters: *filter-only-master
release: release:
jobs: jobs:
- build-all: - build-all:
public/app/features/datasources/settings/DataSourceSettingsPage.tsx
+4 -2
View File
@@ -276,7 +276,7 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
<div className="gf-form-group"> <div className="gf-form-group">
{testingMessage && ( {testingMessage && (
<div className={`alert-${testingStatus} alert`}> <div className={`alert-${testingStatus} alert`} aria-label="Datasource settings page Alert">
<div className="alert-icon"> <div className="alert-icon">
{testingStatus === 'error' ? ( {testingStatus === 'error' ? (
<i className="fa fa-exclamation-triangle" /> <i className="fa fa-exclamation-triangle" />
@@ -285,7 +285,9 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
)} )}
</div> </div>
<div className="alert-body"> <div className="alert-body">
<div className="alert-title">{testingMessage}</div> <div className="alert-title" aria-label="Datasource settings page Alert message">
{testingMessage}
</div>
</div> </div>
</div> </div>
)} )}