Fix spaces test flakyness (#100605)

elastic · May 26, 2021 · 570025c · 570025c
1 parent 181ef83
commit 570025c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -71,9 +71,6 @@ export class NavControlPopover extends Component<Props, State> {
 
   public render() {
     const button = this.getActiveSpaceButton();
-    if (!button) {
-      return null;
-    }
 
     let element: React.ReactNode;
     if (!this.state.loading && this.state.spaces.length < 2) {
@@ -102,7 +99,7 @@ export class NavControlPopover extends Component<Props, State> {
     return (
       <EuiPopover
         id={'spcMenuPopover'}
-        data-test-subj={`spacesNavSelector`}
+        data-test-subj={`${this.state.loading ? 'spacesNavSelectorLoading' : 'spacesNavSelector'}`}
         button={button}
         isOpen={this.state.showSpaceSelector}
         closePopover={this.closeSpaceSelector}

diff --git a/x-pack/test/functional/apps/spaces/spaces_selection.ts b/x-pack/test/functional/apps/spaces/spaces_selection.ts
@@ -22,8 +22,7 @@ export default function spaceSelectorFunctionalTests({
     'spaceSelector',
   ]);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/99581
-  describe.skip('Spaces', function () {
+  describe('Spaces', function () {
     this.tags('includeFirefox');
     describe('Space Selector', () => {
       before(async () => {