Skip to content

Commit 009bccb

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into rules/7.9-v2
2 parents 05032b8 + 21156d6 commit 009bccb

62 files changed

Lines changed: 1227 additions & 1659 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/settings/apm-settings.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Changing these settings may disable features of the APM App.
4747
| Set to `false` to hide the APM app from the menu. Defaults to `true`.
4848

4949
| `xpack.apm.ui.transactionGroupBucketSize`
50-
| Number of top transaction groups displayed in the APM app. Defaults to `100`.
50+
| Number of top transaction groups displayed in the APM app. Defaults to `1000`.
5151

5252
| `xpack.apm.ui.maxTraceItems` {ess-icon}
5353
| Maximum number of child items displayed when viewing trace details. Defaults to `1000`.

‎test/functional/apps/saved_objects_management/edit_saved_object.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
6767
};
6868

6969
// Flaky: https://github.com/elastic/kibana/issues/68400
70-
describe('saved objects edition page', () => {
70+
describe.skip('saved objects edition page', () => {
7171
beforeEach(async () => {
7272
await esArchiver.load('saved_objects_management/edit_saved_object');
7373
});

‎test/functional/page_objects/login_page.ts‎

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,76 +7,26 @@
77
* not use this file except in compliance with the License.
88
* You may obtain a copy of the License at
99
*
10-
*    http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
1212
* Unless required by applicable law or agreed to in writing,
1313
* software distributed under the License is distributed on an
1414
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied.  See the License for the
15+
* KIND, either express or implied. See the License for the
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
1919

20-
import { delay } from 'bluebird';
2120
import { FtrProviderContext } from '../ftr_provider_context';
2221

2322
export function LoginPageProvider({ getService }: FtrProviderContext) {
2423
const testSubjects = getService('testSubjects');
25-
const log = getService('log');
26-
const find = getService('find');
27-
28-
const regularLogin = async (user: string, pwd: string) => {
29-
await testSubjects.setValue('loginUsername', user);
30-
await testSubjects.setValue('loginPassword', pwd);
31-
await testSubjects.click('loginSubmit');
32-
await find.waitForDeletedByCssSelector('.kibanaWelcomeLogo');
33-
await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
34-
};
35-
36-
const samlLogin = async (user: string, pwd: string) => {
37-
try {
38-
await find.clickByButtonText('Login using SAML');
39-
await find.setValue('input[name="email"]', user);
40-
await find.setValue('input[type="password"]', pwd);
41-
await find.clickByCssSelector('.auth0-label-submit');
42-
await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
43-
} catch (err) {
44-
log.debug(`${err} \nFailed to find Auth0 login page, trying the Auth0 last login page`);
45-
await find.clickByCssSelector('.auth0-lock-social-button');
46-
}
47-
};
4824

4925
class LoginPage {
5026
async login(user: string, pwd: string) {
51-
if (
52-
process.env.VM === 'ubuntu18_deb_oidc' ||
53-
process.env.VM === 'ubuntu16_deb_desktop_saml'
54-
) {
55-
await samlLogin(user, pwd);
56-
return;
57-
}
58-
59-
await regularLogin(user, pwd);
60-
}
61-
62-
async logoutLogin(user: string, pwd: string) {
63-
await this.logout();
64-
await this.sleep(3002);
65-
await this.login(user, pwd);
66-
}
67-
68-
async logout() {
69-
await testSubjects.click('userMenuButton');
70-
await this.sleep(500);
71-
await testSubjects.click('logoutLink');
72-
log.debug('### found and clicked log out--------------------------');
73-
await this.sleep(8002);
74-
}
75-
76-
async sleep(sleepMilliseconds: number) {
77-
log.debug(`... sleep(${sleepMilliseconds}) start`);
78-
await delay(sleepMilliseconds);
79-
log.debug(`... sleep(${sleepMilliseconds}) end`);
27+
await testSubjects.setValue('loginUsername', user);
28+
await testSubjects.setValue('loginPassword', pwd);
29+
await testSubjects.click('loginSubmit');
8030
}
8131
}
8232

0 commit comments

Comments
 (0)