Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 3 deletions

diff --git a/spec/frontend/members/components/modals/leave_modal_spec.js b/spec/frontend/members/components/modals/leave_modal_spec.js
index ea9eb7bf923..1dc913e5c78 100644
--- a/spec/frontend/members/components/modals/leave_modal_spec.js
+++ b/spec/frontend/members/components/modals/leave_modal_spec.js
@@ -99,10 +99,14 @@ describe('LeaveModal', () => {
       });
     });
 
-    it("does NOT display oncall schedules list when member's user is NOT a part of on-call schedules ", () => {
+    it("does NOT display oncall schedules list when member's user is NOT a part of on-call schedules ", async () => {
+      wrapper.destroy();
+
       const memberWithoutOncallSchedules = cloneDeep(member);
-      delete (memberWithoutOncallSchedules, 'user.oncallSchedules');
+      delete memberWithoutOncallSchedules.user.oncallSchedules;
       createComponent({ member: memberWithoutOncallSchedules });
+      await nextTick();
+
       expect(findOncallSchedulesList().exists()).toBe(false);
     });
   });
diff --git a/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap b/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap
index f4f9cc288f9..87eaabf4e98 100644
--- a/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap
+++ b/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap
@@ -9,7 +9,6 @@ exports[`MemoryGraph Render chart should draw container with chart 1`] = `
     data="Nov 12 2019 19:17:33,2.87,Nov 12 2019 19:18:33,2.78,Nov 12 2019 19:19:33,2.78,Nov 12 2019 19:20:33,3.01"
     height="25"
     tooltiplabel="MB"
-    variant="gray900"
   />
 </div>
 `;