This commit is contained in:
Pavel Feldman 2020-12-11 23:36:08 -08:00 коммит произвёл GitHub
Родитель aa1b546bd0
Коммит 2ba60e92e3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 136 добавлений и 8 удалений

2
android-types-internal.d.ts поставляемый
Просмотреть файл

@ -26,7 +26,7 @@ export interface AndroidDevice<BrowserContextOptions, BrowserContext, Page> exte
serial(): string;
model(): string;
webViews(): AndroidWebView<Page>[];
webView(selector: { pkg: string }): Promise<AndroidWebView<Page>>;
webView(selector: { pkg: string }, options?: { timeout?: number }): Promise<AndroidWebView<Page>>;
shell(command: string): Promise<string>;
launchBrowser(options?: BrowserContextOptions & { packageName?: string }): Promise<BrowserContext>;
close(): Promise<void>;

Просмотреть файл

@ -65,7 +65,7 @@ const PACKAGES = {
files: [...PLAYWRIGHT_CORE_FILES, ...FFMPEG_FILES, 'electron-types.d.ts'],
},
'playwright-android': {
version: '0.0.7', // Manually manage playwright-android version.
version: '0.0.8', // Manually manage playwright-android version.
description: 'A high-level API to automate Chrome for Android',
browsers: [],
files: [...PLAYWRIGHT_CORE_FILES, ...FFMPEG_FILES, 'android-types.d.ts', 'android-types-internal.d.ts', 'bin/android-driver.apk', 'bin/android-driver-target.apk'],

Просмотреть файл

@ -0,0 +1,34 @@
/**
* Copyright 2020 Microsoft Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import type { Android, AndroidDevice } from '../../android-types';
import { folio as baseFolio } from '../fixtures';
const fixtures = baseFolio.extend<{
device: AndroidDevice
}, {
android: Android,
}>();
fixtures.device.init(async ({ playwright }, runTest) => {
const [device] = await playwright._android.devices();
await device.shell('am force-stop org.chromium.webview_shell');
await device.shell('am force-stop com.android.chrome');
await runTest(device);
device.close();
});
export const folio = fixtures.build();

Просмотреть файл

@ -0,0 +1,32 @@
/**
* Copyright 2020 Microsoft Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { folio } from './android.fixtures';
const { it, expect } = folio;
if (process.env.PW_ANDROID_TESTS) {
it('should discover device', async function({ device }) {
expect(device.model()).toBe('sdk_gphone_x86_arm');
});
it('should launch browser', async function({ device }) {
const context = await device.launchBrowser();
const [page] = context.pages();
await page.goto('data:text/html,<title>Hello world!</title>');
expect(await page.title()).toBe('Hello world!');
await context.close();
});
}

Просмотреть файл

@ -0,0 +1,58 @@
/**
* Copyright 2020 Microsoft Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { folio } from './android.fixtures';
const { it, expect } = folio;
if (process.env.PW_ANDROID_TESTS) {
it('should discover webviews', async function({ device }) {
expect(device.webViews().length).toBe(0);
await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
expect(webview.pkg()).toBe('org.chromium.webview_shell');
});
it('should connect to page', async function({ device }) {
expect(device.webViews().length).toBe(0);
await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
const page = await webview.page();
expect(page.url()).toBe('about:blank');
});
it('should navigate page externally', async function({ device, server }) {
expect(device.webViews().length).toBe(0);
await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
const page = await webview.page();
await page.goto('data:text/html,<title>Hello world!</title>');
expect(await page.title()).toBe('Hello world!');
});
it('should navigate page externally', async function({ device, server }) {
expect(device.webViews().length).toBe(0);
await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
const page = await webview.page();
await device.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'data:text/html,<title>Hello world!</title>');
await Promise.all([
page.waitForNavigation(),
device.press({ res: 'org.chromium.webview_shell:id/url_field' }, 'Enter')
]);
expect(await page.title()).toBe('Hello world!');
});
}

Просмотреть файл

@ -15,7 +15,7 @@
*/
import { folio as base } from '../fixtures';
import type { ElectronApplication, ElectronLauncher, ElectronPage } from '../../electron-types';
import type { ElectronApplication, ElectronPage } from '../../electron-types';
import path from 'path';
const electronName = process.platform === 'win32' ? 'electron.cmd' : 'electron';
@ -42,7 +42,3 @@ fixtures.window.init(async ({ application }, run) => {
});
export const folio = fixtures.build();
declare module '../../index' {
const _electron: ElectronLauncher;
}

Просмотреть файл

@ -27,6 +27,8 @@ import { installCoverageHooks } from './coverage';
import { folio as httpFolio } from './http.fixtures';
import { folio as playwrightFolio } from './playwright.fixtures';
import { PlaywrightClient } from '../lib/remote/playwrightClient';
import type { Android } from '../android-types';
import type { ElectronLauncher } from '../electron-types';
export { expect, config } from 'folio';
const removeFolderAsync = util.promisify(require('rimraf'));
@ -189,3 +191,9 @@ export const beforeEach = folio.beforeEach;
export const afterEach = folio.afterEach;
export const beforeAll = folio.beforeAll;
export const afterAll = folio.afterAll;
declare module '../index' {
const _android: Android;
const _electron: ElectronLauncher;
}

Просмотреть файл

@ -5,4 +5,4 @@ export ANDROID_SDK_ROOT=${SDKDIR}
export ANDROID_HOME=${SDKDIR}
export ANDROID_AVD_HOME=${SDKDIR}/avd
${SDKDIR}/emulator/emulator -avd android30 -gpu guest
${SDKDIR}/emulator/emulator -avd android30 -gpu swiftshader_indirect