فهرست منبع

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

* 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
Hugo Häggmark 6 سال پیش
والد
کامیت
db32c7dcf5
2فایلهای تغییر یافته به همراه10 افزوده شده و 5 حذف شده
  1. 6 3
      .circleci/config.yml
  2. 4 2
      public/app/features/datasources/settings/DataSourceSettingsPage.tsx

+ 6 - 3
.circleci/config.yml

@@ -73,7 +73,7 @@ jobs:
   end-to-end-test:
       docker:
         - image: circleci/node:8-browsers
-        - image: grafana/grafana:master
+        - image: grafana/grafana-dev:master-$CIRCLE_SHA1
       steps:
           - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
           - checkout
@@ -629,7 +629,7 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
             - build-oss-msi
-          filters: *filter-only-master
+          filters: *filter-only-master 
       - grafana-docker-master:
           requires:
             - build-all
@@ -662,7 +662,10 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-master
-
+      - end-to-end-test:
+          requires:
+            - grafana-docker-master
+          filters: *filter-only-master
   release:
     jobs:
       - build-all:

+ 4 - 2
public/app/features/datasources/settings/DataSourceSettingsPage.tsx

@@ -276,7 +276,7 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
 
         <div className="gf-form-group">
           {testingMessage && (
-            <div className={`alert-${testingStatus} alert`}>
+            <div className={`alert-${testingStatus} alert`} aria-label="Datasource settings page Alert">
               <div className="alert-icon">
                 {testingStatus === 'error' ? (
                   <i className="fa fa-exclamation-triangle" />
@@ -285,7 +285,9 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
                 )}
               </div>
               <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>
           )}