From 2d586af74d271cf456998f14b29617a55e3c8978 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 14 May 2020 15:18:20 +0000
Subject: [PATCH 1/5] Update dependency @gitlab/ui to v14.10.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2d9b820b57f9ca..fd63688531aa59 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@babel/preset-env": "^7.8.4",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.127.0",
-    "@gitlab/ui": "14.5.0",
+    "@gitlab/ui": "14.10.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.2-2",
     "@sentry/browser": "^5.10.2",
diff --git a/yarn.lock b/yarn.lock
index 52119a27543aa6..6db48ca780801b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -787,10 +787,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz#1f7ffdffe44d6a82b372535f93d78f3a895d1960"
   integrity sha512-Uv52DqkG2KwCB0VRlXUEHFZxJ/7Ql0t1YTdzICpXmDjltuUBrysFcdmWPVO6PgXQxk2ahryNsUjSOziMYTeSiw==
 
-"@gitlab/ui@14.5.0":
-  version "14.5.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.5.0.tgz#6fed9a5b435884fe69e499578469c8b144726c90"
-  integrity sha512-7OarJzyyeRpFRmShN7c2GBPpahBDbmOSk10ATisannbX/h9i+Z83MQ8ZDqYbM8qeRIfG/BVsnLjC8M7aSsBlPQ==
+"@gitlab/ui@14.10.0":
+  version "14.10.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.10.0.tgz#39c04d62c914fcefe96c7ec32fdf31b1f98f1119"
+  integrity sha512-k9w6z3/QBeUas++cH5BaozjxY4fVu+AggjGoh9QMKN5hpiGTiTPx5aQJIlOv8UX/kpUmgc4pHSWAbw30YVGGFw==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"
-- 
GitLab


From b2d102157aac1e2836247e7e7f798267b95efc48 Mon Sep 17 00:00:00 2001
From: Sarah GP <sarah.groff.palermo@gmail.com>
Date: Thu, 14 May 2020 18:44:51 +0200
Subject: [PATCH 2/5] Update failing snapshot

---
 .../__snapshots__/path_navigation_spec.js.snap       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap b/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap
index 472699a6b025df..99f2a6844129dd 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap
@@ -2,8 +2,8 @@
 
 exports[`PathNavigation matches snapshot 1`] = `
 <div
-  background-color="#fafafa"
   class="gl-path-nav"
+  data-testid="gl-path-nav"
 >
   <span
     class="gl-path-fade gl-path-fade-left"
@@ -21,7 +21,7 @@ exports[`PathNavigation matches snapshot 1`] = `
       </svg>
     </button>
   </span>
-   
+
   <ul
     class="gl-path-nav-list"
   >
@@ -32,7 +32,7 @@ exports[`PathNavigation matches snapshot 1`] = `
         class="gl-path-button gl-path-active-item-indigo"
       >
         <!---->
-        
+
         Issue
         <!---->
       </button>
@@ -44,7 +44,7 @@ exports[`PathNavigation matches snapshot 1`] = `
         class="gl-path-button"
       >
         <!---->
-        
+
         Plan
         <!---->
       </button>
@@ -56,13 +56,13 @@ exports[`PathNavigation matches snapshot 1`] = `
         class="gl-path-button"
       >
         <!---->
-        
+
         Code
         <!---->
       </button>
     </li>
   </ul>
-   
+
   <span
     class="gl-path-fade gl-path-fade-right"
     style="display: none;"
-- 
GitLab


From 51d79e15736d067d43aebcb16c10853a2e4013f2 Mon Sep 17 00:00:00 2001
From: Sarah GP <sarah.groff.palermo@gmail.com>
Date: Thu, 14 May 2020 19:49:22 +0200
Subject: [PATCH 3/5] Update failing snapshot

---
 .../issues_analytics/components/issues_analytics.vue   |  2 +-
 .../features/clusters/cluster_health_dashboard_spec.rb |  2 +-
 .../__snapshots__/path_navigation_spec.js.snap         | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue b/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
index 3204c4a10584b9..50dfd065e6729b 100644
--- a/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
+++ b/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
@@ -157,7 +157,7 @@ export default {
         @created="onCreated"
       />
       <div class="d-flex">
-        <gl-chart-legend v-if="chart" :chart="chart" :series-info="seriesInfo" />
+        <gl-chart-legend v-if="chart" :chart="chart" :series-info="seriesInfo" class="js-chart-legend" />
         <div class="issues-analytics-legend">
           <span>{{ s__('IssuesAnalytics|Total:') }} {{ seriesTotal }}</span>
           <span>&#8226;</span>
diff --git a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
index ab6fd60afaf554..2fb3599a88c697 100644
--- a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
+++ b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
@@ -78,7 +78,7 @@
         expect(page).to have_css('.prometheus-graph')
         expect(page).to have_css('.prometheus-graph-title')
         expect(page).to have_css('[_echarts_instance_]')
-        expect(page).to have_css('.gl-legend')
+        expect(page).to have_css('.js-chart-legend')
       end
     end
 
diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap b/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap
index 99f2a6844129dd..102cb4d6f22b7f 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/path_navigation_spec.js.snap
@@ -21,7 +21,7 @@ exports[`PathNavigation matches snapshot 1`] = `
       </svg>
     </button>
   </span>
-
+   
   <ul
     class="gl-path-nav-list"
   >
@@ -32,7 +32,7 @@ exports[`PathNavigation matches snapshot 1`] = `
         class="gl-path-button gl-path-active-item-indigo"
       >
         <!---->
-
+        
         Issue
         <!---->
       </button>
@@ -44,7 +44,7 @@ exports[`PathNavigation matches snapshot 1`] = `
         class="gl-path-button"
       >
         <!---->
-
+        
         Plan
         <!---->
       </button>
@@ -56,13 +56,13 @@ exports[`PathNavigation matches snapshot 1`] = `
         class="gl-path-button"
       >
         <!---->
-
+        
         Code
         <!---->
       </button>
     </li>
   </ul>
-
+   
   <span
     class="gl-path-fade gl-path-fade-right"
     style="display: none;"
-- 
GitLab


From 02a65e829337645a83c313e8bf05fa7468e0cb94 Mon Sep 17 00:00:00 2001
From: Sarah GP <sarah.groff.palermo@gmail.com>
Date: Thu, 14 May 2020 20:22:47 +0200
Subject: [PATCH 4/5] Fix tests for a third time

---
 .../javascripts/monitoring/components/dashboard_panel.vue       | 1 +
 .../issues_analytics/components/issues_analytics.vue            | 2 +-
 ee/spec/features/clusters/cluster_health_dashboard_spec.rb      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
index 48825fda5c807d..f65d1f6fee695a 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
@@ -374,6 +374,7 @@ export default {
       :graph-data="graphData"
       v-bind="$attrs"
       v-on="$listeners"
+      class="js-basic-chart"
     />
     <component
       :is="timeSeriesChartComponent"
diff --git a/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue b/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
index 50dfd065e6729b..3204c4a10584b9 100644
--- a/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
+++ b/ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue
@@ -157,7 +157,7 @@ export default {
         @created="onCreated"
       />
       <div class="d-flex">
-        <gl-chart-legend v-if="chart" :chart="chart" :series-info="seriesInfo" class="js-chart-legend" />
+        <gl-chart-legend v-if="chart" :chart="chart" :series-info="seriesInfo" />
         <div class="issues-analytics-legend">
           <span>{{ s__('IssuesAnalytics|Total:') }} {{ seriesTotal }}</span>
           <span>&#8226;</span>
diff --git a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
index 2fb3599a88c697..3b128e08c96d16 100644
--- a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
+++ b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
@@ -78,7 +78,7 @@
         expect(page).to have_css('.prometheus-graph')
         expect(page).to have_css('.prometheus-graph-title')
         expect(page).to have_css('[_echarts_instance_]')
-        expect(page).to have_css('.js-chart-legend')
+        expect(page).to have_css('.js-basic-chart')
       end
     end
 
-- 
GitLab


From c2c98b56a533efbe1a41f77cba3c7f23e1d109e6 Mon Sep 17 00:00:00 2001
From: Frederic Caplette <fcaplette@gitlab.com>
Date: Thu, 14 May 2020 16:29:59 -0400
Subject: [PATCH 5/5] Use new CSS selector in dashboard specs

This is a temporary fix as using css classes to target
elements in tests is flaky. We will need to find a proper
solution once we have fix this problem.
---
 .../javascripts/monitoring/components/dashboard_panel.vue       | 1 -
 ee/spec/features/clusters/cluster_health_dashboard_spec.rb      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
index f65d1f6fee695a..48825fda5c807d 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
@@ -374,7 +374,6 @@ export default {
       :graph-data="graphData"
       v-bind="$attrs"
       v-on="$listeners"
-      class="js-basic-chart"
     />
     <component
       :is="timeSeriesChartComponent"
diff --git a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
index 3b128e08c96d16..e3070d27bda6a3 100644
--- a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
+++ b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
@@ -78,7 +78,7 @@
         expect(page).to have_css('.prometheus-graph')
         expect(page).to have_css('.prometheus-graph-title')
         expect(page).to have_css('[_echarts_instance_]')
-        expect(page).to have_css('.js-basic-chart')
+        expect(page).to have_css('.gl-legend-inline')
       end
     end
 
-- 
GitLab