maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Using forceLogout *almost* everywhere (#52922)

Browse source 
* Changing usages of .logout() to .forceLogout()

* Using `.logout` from within the security login page test
This commit is contained in:
Brandon Kobel 2019-12-13 10:09:38 -05:00 committed by GitHub
parent 8d8da48ac8
commit c8912199d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x-pack/test/accessibility/apps/login_page.ts
View file

@ -17,7 +17,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
describe('Login Page', () => {
before(async () => {
await esArchiver.load('empty_kibana');
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
after(async () => {
@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
});
afterEach(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('meets a11y requirements', async () => {

4
x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
View file

@ -46,7 +46,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'global_advanced_settings_all_user',
'global_advanced_settings_all_user-password',
@ -62,7 +62,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_advanced_settings_all_role'),
security.user.delete('global_advanced_settings_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});

4
x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
View file

@ -45,7 +45,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'global_canvas_all_user',
@ -60,7 +60,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_canvas_all_role'),
security.user.delete('global_canvas_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});

8
x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
View file

@ -110,11 +110,11 @@ export default function ({ getService, getPageObjects }) {
});
after('logout', async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('shows only the dashboard app link', async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('dashuser', '123456');
const appLinks = await appsMenu.readLinks();
@ -194,7 +194,7 @@ export default function ({ getService, getPageObjects }) {
});
it('is loaded for a user who is assigned a non-dashboard mode role', async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('mixeduser', '123456');
if (await appsMenu.linkExists('Management')) {
@ -203,7 +203,7 @@ export default function ({ getService, getPageObjects }) {
});
it('is not loaded for a user who is assigned a superuser role', async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('mysuperuser', '123456');
if (!await appsMenu.linkExists('Management')) {

4
x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
View file

@ -33,14 +33,14 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await esArchiver.loadIfNeeded('logstash_functional');
// ensure we're logged out so we can login as the appropriate users
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
after(async () => {
await esArchiver.unload('discover/feature_controls/security');
// logout, so the other tests don't accidentally run as the custom users we're testing below
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
describe('global discover all privileges', () => {

4
x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
View file

@ -46,7 +46,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'global_index_patterns_all_user',
@ -64,7 +64,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_index_patterns_all_role'),
security.user.delete('global_index_patterns_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});

4
x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts
View file

@ -29,7 +29,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
// ensure we're logged out so we can login as the appropriate users
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
after(async () => {
@ -37,7 +37,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await security.role.delete('global_all_role');
// logout, so the other tests don't accidentally run as the custom users we're testing below
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
describe('machine_learning_user', () => {

4
x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
View file

@ -49,7 +49,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('global_maps_all_user', 'global_maps_all_user-password', {
expectSpaceSelector: false,
@ -60,7 +60,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_maps_all_role'),
security.user.delete('global_maps_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});

2
x-pack/test/functional/apps/monitoring/_get_lifecycle_methods.js
View file

@ -35,7 +35,7 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
},
async tearDown() {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.user.delete('basic_monitoring_user');
return esArchiver.unload(_archive);
}

2
x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
View file

@ -21,7 +21,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
after(async () => {
await esArchiver.unload('empty_kibana');
await PageObjects.common.navigateToApp('home');
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
describe('space with no features disabled', () => {

12
x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
View file

@ -44,7 +44,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('global_all_user', 'global_all_user-password', {
expectSpaceSelector: false,
@ -55,7 +55,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_all_role'),
security.user.delete('global_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});
@ -162,7 +162,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('global_som_read_user', 'global_som_read_user-password', {
expectSpaceSelector: false,
@ -173,7 +173,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_som_read_role'),
security.user.delete('global_som_read_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});
@ -281,7 +281,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'global_visualize_all_user',
@ -296,7 +296,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_visualize_all_role'),
security.user.delete('global_visualize_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});

4
x-pack/test/functional/apps/security/doc_level_security_roles.js
View file

@ -66,7 +66,7 @@ export default function ({ getService, getPageObjects }) {
});
it('user East should only see EAST doc', async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('userEast', 'changeme');
await PageObjects.common.navigateToApp('discover');
await retry.try(async () => {
@ -77,7 +77,7 @@ export default function ({ getService, getPageObjects }) {
expect(rowData).to.be('name:ABC Company region:EAST _id:doc1 _type: - _index:dlstest _score:0');
});
after('logout', async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
});
}

6
x-pack/test/functional/apps/security/field_level_security.js
View file

@ -89,7 +89,7 @@ export default function ({ getService, getPageObjects }) {
});
it('user customer1 should see ssn', async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('customer1', 'changeme');
await PageObjects.common.navigateToApp('discover');
await retry.tryForTime(10000, async () => {
@ -102,7 +102,7 @@ export default function ({ getService, getPageObjects }) {
});
it('user customer2 should not see ssn', async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('customer2', 'changeme');
await PageObjects.common.navigateToApp('discover');
await retry.tryForTime(10000, async () => {
@ -114,7 +114,7 @@ export default function ({ getService, getPageObjects }) {
});
after(async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
});

6
x-pack/test/functional/apps/security/rbac_phase1.js
View file

@ -79,7 +79,7 @@ export default function ({ getService, getPageObjects }) {
expect(user.roles).to.eql(['rbac_read']);
expect(user.fullname).to.eql('kibanareadonlyFirst kibanareadonlyLast');
expect(user.reserved).to.be(false);
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
@ -100,11 +100,11 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.timePicker.setDefaultAbsoluteRange();
await PageObjects.visualize.waitForVisualization();
await PageObjects.visualize.saveVisualizationExpectSuccess(vizName1);
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
after(async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
});

4
x-pack/test/functional/apps/security/secure_roles_perm.js
View file

@ -60,7 +60,7 @@ export default function ({ getService, getPageObjects }) {
expect(users.Rashmi.roles).to.eql(['logstash_reader', 'kibana_user']);
expect(users.Rashmi.fullname).to.eql('RashmiFirst RashmiLast');
expect(users.Rashmi.reserved).to.be(false);
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('Rashmi', 'changeme');
});
@ -83,7 +83,7 @@ export default function ({ getService, getPageObjects }) {
});
after(async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
});

4
x-pack/test/functional/apps/security/security.js
View file

@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }) {
describe('Login Page', () => {
before(async () => {
await esArchiver.load('empty_kibana');
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
after(async () => {
@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }) {
});
afterEach(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('can login', async () => {

6
x-pack/test/functional/apps/security/user_email.js
View file

@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) {
expect(users.newuser.fullname).to.eql('newuserFirst newuserLast');
expect(users.newuser.email).to.eql('newuser@myEmail.com');
expect(users.newuser.reserved).to.be(false);
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('login as new user and verify email', async function () {
@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }) {
it('click changepassword link, change the password and re-login', async function () {
await PageObjects.accountSetting.verifyAccountSettings('newuser@myEmail.com', 'newuser');
await PageObjects.accountSetting.changePassword('changeme', 'mechange');
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
@ -51,7 +51,7 @@ export default function ({ getService, getPageObjects }) {
});
after(async function () {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
});
}

2
x-pack/test/functional/apps/spaces/enter_space.ts
View file

@ -19,7 +19,7 @@ export default function enterSpaceFunctonalTests({
after(async () => await esArchiver.unload('spaces/enter_space'));
afterEach(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('allows user to navigate to different spaces, respecting the configured default route', async () => {

8
x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
View file

@ -39,7 +39,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('global_all_user', 'global_all_user-password', {
expectSpaceSelector: false,
@ -50,7 +50,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('global_all_role'),
security.user.delete('global_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});
@ -111,7 +111,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'default_space_all_user',
@ -126,7 +126,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
await Promise.all([
security.role.delete('default_space_all_role'),
security.user.delete('default_space_all_user'),
PageObjects.security.logout(),
PageObjects.security.forceLogout(),
]);
});

4
x-pack/test/functional/apps/spaces/spaces_selection.ts
View file

@ -26,7 +26,7 @@ export default function spaceSelectorFunctonalTests({
after(async () => await esArchiver.unload('spaces/selector'));
afterEach(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('allows user to navigate to different spaces', async () => {
@ -87,7 +87,7 @@ export default function spaceSelectorFunctonalTests({
hash: sampleDataHash,
});
await PageObjects.home.removeSampleDataSet('logs');
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await esArchiver.unload('spaces/selector');
});

2
x-pack/test/functional/apps/status_page/status_page.ts
View file

@ -18,7 +18,7 @@ export default function statusPageFunctonalTests({
after(async () => await esArchiver.unload('empty_kibana'));
it('allows user to navigate without authentication', async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.statusPage.navigateToPage();
await PageObjects.statusPage.expectStatusPage();
});

10
x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
View file

@ -41,7 +41,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'global_timelion_all_user',
@ -53,7 +53,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.role.delete('global_timelion_all_role');
await security.user.delete('global_timelion_all_user');
});
@ -107,7 +107,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.role.delete('global_timelion_read_role');
await security.user.delete('global_timelion_read_user');
});
@ -151,7 +151,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'no_timelion_privileges_user',
@ -163,7 +163,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.role.delete('no_timelion_privileges_role');
await security.user.delete('no_timelion_privileges_user');
});

8
x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
View file

@ -56,7 +56,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
full_name: 'test user',
});
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login(
'global_visualize_all_user',
@ -68,7 +68,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.role.delete('global_visualize_all_role');
await security.user.delete('global_visualize_all_user');
});
@ -184,7 +184,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.role.delete('global_visualize_read_role');
await security.user.delete('global_visualize_read_user');
});
@ -294,7 +294,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await security.role.delete('no_visualize_privileges_role');
await security.user.delete('no_visualize_privileges_user');
});

2
x-pack/test/licensing_plugin/apis/changes.ts
View file

@ -37,7 +37,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
});
// ensure we're logged out so we can login as the appropriate users
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
await PageObjects.security.login('license_manager_user', 'license_manager_user-password');
},

4
x-pack/test/visual_regression/tests/login_page.js
View file

@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }) {
describe('Login Page', () => {
before(async () => {
await esArchiver.load('empty_kibana');
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
after(async () => {
@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }) {
});
afterEach(async () => {
await PageObjects.security.logout();
await PageObjects.security.forceLogout();
});
it('renders login page', async () => {