Skip to content

Commit

Permalink
adapt the functional suite
Browse files Browse the repository at this point in the history
  • Loading branch information
@pgayvallet
pgayvallet committed Jul 5, 2022
1 parent d387df2 commit 1edc80d
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 49 deletions.
16 changes: 7 additions & 9 deletions x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,24 @@ import { FtrProviderContext } from '../ftr_provider_context';

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'security', 'savedObjects', 'tagManagement']);
const tagManagementPage = PageObjects.tagManagement;

// FLAKY: https://github.com/elastic/kibana/issues/135348
describe.skip('table bulk actions', () => {
describe('table bulk actions', () => {
beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
await tagManagementPage.navigateTo();
});
afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
});

// FLAKY: https://github.com/elastic/kibana/issues/135347
describe.skip('bulk delete', () => {
describe('bulk delete', () => {
it('deletes multiple tags', async () => {
await tagManagementPage.selectTagByName('tag-1');
await tagManagementPage.selectTagByName('tag-3');
Expand Down
11 changes: 6 additions & 5 deletions x-pack/test/saved_object_tagging/functional/tests/create.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrProviderContext } from '../ftr_provider_context';

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'security', 'savedObjects', 'tagManagement']);

const tagManagementPage = PageObjects.tagManagement;
Expand All @@ -20,15 +20,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

before(async () => {
tagModal = tagManagementPage.tagModal;
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
await tagManagementPage.navigateTo();
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
await kibanaServer.savedObjects.clean({ types: ['tag'] });
});

afterEach(async () => {
Expand Down
10 changes: 6 additions & 4 deletions x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const listingTable = getService('listingTable');
const testSubjects = getService('testSubjects');
const find = getService('find');
Expand Down Expand Up @@ -38,17 +39,18 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

describe('dashboard integration', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard/data.json'
);
await esArchiver.loadIfNeeded(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
);
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard/data.json'
);
await kibanaServer.savedObjects.clean({ types: ['tag'] });
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
);
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/saved_object_tagging/functional/tests/edit.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrProviderContext } from '../ftr_provider_context';

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'security', 'savedObjects', 'tagManagement']);

const tagManagementPage = PageObjects.tagManagement;
Expand All @@ -20,14 +20,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

before(async () => {
tagModal = tagManagementPage.tagModal;
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
await tagManagementPage.navigateTo();
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
});

Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/saved_object_tagging/functional/tests/feature_control.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ interface FeatureControlUserSuite {

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'security', 'savedObjects', 'tagManagement']);
const tagManagementPage = PageObjects.tagManagement;

Expand Down Expand Up @@ -89,13 +89,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

describe('feature controls', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
});

Expand Down
13 changes: 6 additions & 7 deletions x-pack/test/saved_object_tagging/functional/tests/listing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@ import { FtrProviderContext } from '../ftr_provider_context';

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'security', 'savedObjects', 'tagManagement']);
const tagManagementPage = PageObjects.tagManagement;

// Failing: See https://github.com/elastic/kibana/issues/90578
describe.skip('table listing', () => {
describe('table listing', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
await tagManagementPage.navigateTo();
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/data.json'
);
});

Expand Down
11 changes: 8 additions & 3 deletions x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrProviderContext } from '../ftr_provider_context';

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const listingTable = getService('listingTable');
const testSubjects = getService('testSubjects');
const find = getService('find');
Expand All @@ -37,10 +37,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
// Failing: See https://github.com/elastic/kibana/issues/89073
describe.skip('maps integration', () => {
before(async () => {
await esArchiver.load('x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps');
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps/data.json'
);
});
after(async () => {
await esArchiver.unload('x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps');
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps/data.json'
);
await kibanaServer.savedObjects.clean({ types: ['tag'] });
});

describe('listing', () => {
Expand Down
13 changes: 6 additions & 7 deletions x-pack/test/saved_object_tagging/functional/tests/som_integration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrProviderContext } from '../ftr_provider_context';

// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const testSubjects = getService('testSubjects');
const find = getService('find');
const PageObjects = getPageObjects(['settings', 'tagManagement', 'savedObjects', 'common']);
Expand All @@ -36,16 +36,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
await testSubjects.click('savedObjectSearchBar');
};

// FLAKY: https://github.com/elastic/kibana/issues/115320
describe.skip('saved objects management integration', () => {
describe('saved objects management integration', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management/data.json'
);
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management/data.json'
);
});

Expand Down
10 changes: 6 additions & 4 deletions x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
// eslint-disable-next-line import/no-default-export
export default function ({ getPageObjects, getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const listingTable = getService('listingTable');
const testSubjects = getService('testSubjects');
const find = getService('find');
Expand Down Expand Up @@ -49,17 +50,18 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
// Failing: See https://github.com/elastic/kibana/issues/89958
describe.skip('visualize integration', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize/data.json'
);
await esArchiver.loadIfNeeded(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
);
});
after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize/data.json'
);
await kibanaServer.savedObjects.clean({ types: ['tag'] });
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
);
Expand Down

0 comments on commit 1edc80d

Please sign in to comment.