Skip to content

Commit

Permalink
Fix for x-pack maps functional test to remove the unloading of data (#…
Browse files Browse the repository at this point in the history
…83856)

* fixes #74449

* fixing maps tests -small fix to remove unloading of data for the subsequent tests to pass

* changes to how we  load/unload data

* modified index.js file again to fit the needs

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
  • Loading branch information
rashmivkulkarni and kibanamachine committed Nov 23, 2020
1 parent 61fb7eb commit ac1cf7d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';

export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const security = getService('security');
const PageObjects = getPageObjects(['common', 'error', 'maps', 'settings', 'security']);
const appsMenu = getService('appsMenu');
Expand All @@ -17,13 +16,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const savedQueryManagementComponent = getService('savedQueryManagementComponent');

describe('maps security feature controls', () => {
before(async () => {
await esArchiver.loadIfNeeded('maps/data');
await esArchiver.load('maps/kibana');
});

after(async () => {
await esArchiver.unload('maps/kibana');
// logout, so the other tests don't accidentally run as the custom users we're testing below
await PageObjects.security.forceLogout();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,18 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';

export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const spacesService = getService('spaces');
const PageObjects = getPageObjects(['common', 'maps', 'security']);
const appsMenu = getService('appsMenu');

// FLAKY: https://github.com/elastic/kibana/issues/38414
describe.skip('spaces feature controls', () => {
before(async () => {
await esArchiver.loadIfNeeded('maps/data');
await esArchiver.load('maps/kibana');
PageObjects.maps.setBasePath('/s/custom_space');
});

after(async () => {
await esArchiver.unload('maps/kibana');
await PageObjects.security.forceLogout();
PageObjects.maps.setBasePath('');
});

Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/maps/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function ({ loadTestFile, getService }) {
await esArchiver.unload('maps/kibana');
});

describe('', function () {
describe('', async function () {
this.tags('ciGroup9');
loadTestFile(require.resolve('./documents_source'));
loadTestFile(require.resolve('./blended_vector_layer'));
Expand Down

0 comments on commit ac1cf7d

Please sign in to comment.