Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for x-pack maps functional test to remove the unloading of data #83856

Merged
merged 17 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f3fc995
fixes https://github.com/elastic/kibana/issues/74449
rashmivkulkarni Oct 20, 2020
9d21418
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Oct 21, 2020
03a2e82
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 4, 2020
e64b884
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 5, 2020
9b19a7d
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 10, 2020
6fc4f27
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 10, 2020
c74c815
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 17, 2020
ad381f3
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 17, 2020
bea7253
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 18, 2020
bfa0694
Merge branch 'master' of github.com:elastic/kibana
rashmivkulkarni Nov 19, 2020
b3fd1e2
fixing maps tests -small fix to remove unloading of data for the subs…
rashmivkulkarni Nov 19, 2020
5c66059
Merge branch 'master' into maps_fix
kibanamachine Nov 19, 2020
b6b1a2d
changes to how we load/unload data
rashmivkulkarni Nov 19, 2020
7a2a6b2
Merge branch 'maps_fix' of github.com:rasroh/kibana into maps_fix
rashmivkulkarni Nov 19, 2020
1f5c788
Merge branch 'master' of github.com:elastic/kibana into maps_fix
rashmivkulkarni Nov 20, 2020
183ae81
modified index.js file again to fit the needs
rashmivkulkarni Nov 20, 2020
f85387f
Merge branch 'master' into maps_fix
kibanamachine Nov 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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