Merge branch '31189-pipelines-error-state' into 'master'

Guarantee only one state is shown at a time

Closes #31189

See merge request !10835

1 files changed, 6 insertions, 1 deletions

diff --git a/spec/javascripts/commit/pipelines/pipelines_spec.js b/spec/javascripts/commit/pipelines/pipelines_spec.js
index 8cac3cad232..ad31448f81c 100644
--- a/spec/javascripts/commit/pipelines/pipelines_spec.js
+++ b/spec/javascripts/commit/pipelines/pipelines_spec.js
@@ -36,6 +36,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
         setTimeout(() => {
           expect(this.component.$el.querySelector('.empty-state')).toBeDefined();
           expect(this.component.$el.querySelector('.realtime-loading')).toBe(null);
+          expect(this.component.$el.querySelector('.js-pipelines-error-state')).toBe(null);
           done();
         }, 1);
       });
@@ -67,6 +68,8 @@ describe('Pipelines table in Commits and Merge requests', () => {
         setTimeout(() => {
           expect(this.component.$el.querySelectorAll('table > tbody > tr').length).toEqual(1);
           expect(this.component.$el.querySelector('.realtime-loading')).toBe(null);
+          expect(this.component.$el.querySelector('.empty-state')).toBe(null);
+          expect(this.component.$el.querySelector('.js-pipelines-error-state')).toBe(null);
           done();
         }, 0);
       });
@@ -95,10 +98,12 @@ describe('Pipelines table in Commits and Merge requests', () => {
       this.component.$destroy();
     });
 
-    it('should render empty state', function (done) {
+    it('should render error state', function (done) {
       setTimeout(() => {
         expect(this.component.$el.querySelector('.js-pipelines-error-state')).toBeDefined();
         expect(this.component.$el.querySelector('.realtime-loading')).toBe(null);
+        expect(this.component.$el.querySelector('.js-empty-state')).toBe(null);
+        expect(this.component.$el.querySelector('table')).toBe(null);
         done();
       }, 0);
     });