Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 64 deletions

diff --git a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
deleted file mode 100644
index 45444166a50..00000000000
--- a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
+++ /dev/null
@@ -1,60 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`IDE pipeline stage renders stage details & icon 1`] = `
-<div
-  class="ide-stage card gl-mt-3"
->
-  <div
-    class="card-header"
-  >
-    <ci-icon-stub
-      cssclasses=""
-      size="24"
-      status="[object Object]"
-    />
-     
-    <strong
-      class="gl-ml-3 text-truncate"
-      data-container="body"
-    >
-      
-      build
-    
-    </strong>
-     
-    <div
-      class="gl-mr-3 gl-ml-2"
-    >
-      <gl-badge-stub
-        size="md"
-        variant="muted"
-      >
-        4
-      </gl-badge-stub>
-    </div>
-     
-    <gl-icon-stub
-      class="ide-stage-collapse-icon"
-      name="chevron-lg-down"
-      size="16"
-    />
-  </div>
-   
-  <div
-    class="card-body p-0"
-  >
-    <item-stub
-      job="[object Object]"
-    />
-    <item-stub
-      job="[object Object]"
-    />
-    <item-stub
-      job="[object Object]"
-    />
-    <item-stub
-      job="[object Object]"
-    />
-  </div>
-</div>
-`;
diff --git a/spec/frontend/ide/components/jobs/stage_spec.js b/spec/frontend/ide/components/jobs/stage_spec.js
index 1d5e5743a4d..52fbff2f497 100644
--- a/spec/frontend/ide/components/jobs/stage_spec.js
+++ b/spec/frontend/ide/components/jobs/stage_spec.js
@@ -18,8 +18,9 @@ describe('IDE pipeline stage', () => {
     },
   };
 
-  const findHeader = () => wrapper.findComponent({ ref: 'cardHeader' });
-  const findJobList = () => wrapper.findComponent({ ref: 'jobList' });
+  const findHeader = () => wrapper.find('[data-testid="card-header"]');
+  const findJobList = () => wrapper.find('[data-testid="job-list"]');
+  const findStageTitle = () => wrapper.find('[data-testid="stage-title"]');
 
   const createComponent = (props) => {
     wrapper = shallowMount(Stage, {
@@ -65,9 +66,9 @@ describe('IDE pipeline stage', () => {
     expect(wrapper.emitted().clickViewLog[0][0]).toBe(job);
   });
 
-  it('renders stage details & icon', () => {
+  it('renders stage title', () => {
     createComponent();
-    expect(wrapper.element).toMatchSnapshot();
+    expect(findStageTitle().isVisible()).toBe(true);
   });
 
   describe('when collapsed', () => {