javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7621 from NativeScript/svetoslavtsenov/merge-release-in-master-6.0.4

Browse Source 
chore: merge release in master 6.0.4
This commit is contained in:
Svetoslav
2019-08-01 09:03:47 +03:00
committed by GitHub
parent c2b1d5aed2 56fc3e1af4
commit 09d370919f
44 changed files with 417 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CHANGELOG.md
View File

@@ -1,3 +1,37 @@
<a name="6.0.4"></a>
## [6.0.4](https://github.com/NativeScript/NativeScript/compare/6.0.3...6.0.4) (2019-07-30)
### Bug Fixes
* **ios:** 'ui/tabs' not found for element 'Tabs'
<a name="6.0.3"></a>
## [6.0.3](https://github.com/NativeScript/NativeScript/compare/6.0.2...6.0.3) (2019-07-29)
### Bug Fixes
* **ios:** move material design dependency to podfile ([#7592](https://github.com/NativeScript/NativeScript/issues/7592)) ([291e3b4](https://github.com/NativeScript/NativeScript/commit/291e3b4))
<a name="6.0.2"></a>
## [6.0.2](https://github.com/NativeScript/NativeScript/compare/6.0.0...6.0.2) (2019-07-26)
### Bug Fixes
* **android:** remove wait for doubletap if no gesture recognizer ([#7584](https://github.com/NativeScript/NativeScript/issues/7584)) ([9fd5ddc](https://github.com/NativeScript/NativeScript/commit/9fd5ddc))
* **bottom-navigation:** crash when tab selected with no item ([#7527](https://github.com/NativeScript/NativeScript/issues/7527)) ([46c17ca](https://github.com/NativeScript/NativeScript/commit/46c17ca))
* **tabs:** tab bar not visible when nested in layout ([#7544](https://github.com/NativeScript/NativeScript/issues/7544)) ([f00b370](https://github.com/NativeScript/NativeScript/commit/f00b370))
* **tabs-android:** wrong tabStripItem selected ([#7522](https://github.com/NativeScript/NativeScript/issues/7522)) ([ca22ba9](https://github.com/NativeScript/NativeScript/commit/ca22ba9))
* **tabs-ios:** crash when setting tabStripItems through items property ([#7548](https://github.com/NativeScript/NativeScript/issues/7548)) ([4511c76](https://github.com/NativeScript/NativeScript/commit/4511c76))
* **tabs-ios:** unable to return to tab after tab with nested frame visited ([#7574](https://github.com/NativeScript/NativeScript/issues/7574)) ([490cab0](https://github.com/NativeScript/NativeScript/commit/490cab0))
<a name="6.0.0"></a>
# [6.0.0](https://github.com/NativeScript/NativeScript/compare/5.4.2...6.0.0) (2019-06-28)

30
e2e/ui-tests-app/README.md
View File

@@ -1,17 +1,21 @@
***e2e tests execution***
1. Local setup
- install appium and all requirments related to how to use `nativescript-dev-appium` plugin
- install appium and all requirments related to `nativescript-dev-appium` plugin usage
- download images:
```npm run load-images Emulator-Api23-Default```
```npm run load-images Emulator-Api23-Default "iPhone X 12"```
or load multiple folders:
``` npm run load-images Emulator-Api23-Default Emulator-Google-Api28```
``` npm run load-images Emulator-Api23-Default Emulator-Google-Api28 "iPhone X 12"```
This command will download https://github.com/NativeScript/functional-tests-images/tree/master/uitestsapp and sparse all passed directories [emulator-name|simulator-name] [emulator-name|simulator-name] [emulator-name|simulator-name]
- name your device so that it matches folder name, respectively api level and density of emulators.
or load all folders:
``` npm run load-images all```
This command will download https://github.com/NativeScript/functional-tests-images/tree/master/uitestsapp and sparse all passed directories [emulator-name|simulator-name]
- rename/ create your device so that it matches folder name, respectively api level and density of emulators.
You can also use scripts:
@@ -19,7 +23,7 @@
If you need to download system image and create emulator use:
`npm run update-emulators -u`
`npm run update-emulators -- --update-system-images`
2. Test execution
- Run test compilation in separate terminal and don't kill it.
@@ -31,8 +35,8 @@
3. Debug test.
- Run:
`npm run test-debug [android|ios]`
in separate console and don't kill it. This command will start appium server and driver and use the installed app on the device but it will not execute tests.
`npm run e2e-debug [android|ios]`
run in separate console and don't kill it. This command will start appium server and driver and use the installed app on the device but it will not execute tests.
- Go to vs code debugging and use a config like:
```
@@ -48,13 +52,15 @@ in separate console and don't kill it. This command will start appium server and
"--opts",
"../config/mocha.opts",
"--attachToDebug",
"--grpe",
"button"
],
"internalConsoleOptions": "openOnSessionStart"
}
***mocha options***
mocha opt file is plased in "../config/mocha.opts".
mocha opt file is located at "../config/mocha.opts".
--timeout 999999
--recursive e2e
@@ -63,4 +69,8 @@ mocha opt file is plased in "../config/mocha.opts".
--exit
- grep particular suites: "--grep=tabs-tab(s-\\w+)-suite"
***grep particular suit or test***
` npm run e2e ios -- --grep=tabs-tab(s-\\w+)-suite`

2
e2e/ui-tests-app/app/action-bar/action-item-position-page.xml
View File

@@ -1,7 +1,7 @@
<Page
xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo">
<Page.actionBar>
<ActionBar>
<ActionBar automationText="actionBar">
<ActionItem ios.position="right" tap="{{ change }}">
<Button text="{{ text }}" backgroundColor="red" />
</ActionItem>

2
e2e/ui-tests-app/app/action-bar/action-view-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar>
<ActionBar automationText="actionBar">
<ActionBar.actionItems>
<ActionItem tap="navigate">
<ActionItem.actionView>

2
e2e/ui-tests-app/app/action-bar/all-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar title="Page Title" style="background-color: blue; color: yellow;">
<ActionBar title="Page Title" style="background-color: blue; color: yellow;" automationText="actionBar">
<NavigationButton text="go back"/>
<ActionBar.actionItems>
<ActionItem text="ITEM" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/background-css-page.xml
View File

@@ -1,5 +1,5 @@
<Page>
<ActionBar title="This is RED" class="action" />
<ActionBar title="This is RED" class="action" automationText="actionBar"/>
<StackLayout>
<Button text="go to cleared page" tap="navigate"/>
</StackLayout>

2
e2e/ui-tests-app/app/action-bar/background-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar title="Page Title" style="background-color: green;">
<ActionBar title="Page Title" style="background-color: green;" automationText="actionBar">
<NavigationButton text="go back"/>
<ActionBar.actionItems>
<ActionItem text="ITEM" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/clean-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar title="Page Title">
<ActionBar title="Page Title" automationText="actionBar">
<NavigationButton text="go back"/>
<ActionBar.actionItems>
<ActionItem text="ITEM" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/color-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar title="Page Title" style="color: green;">
<ActionBar title="Page Title" style="color: green;" automationText="actionBar">
<NavigationButton text="go back"/>
<ActionBar.actionItems>
<ActionItem text="ITEM" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/flat-layout-page.xml
View File

@@ -1,6 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" backgroundColor="yellow">
<ActionBar flat="true" backgroundColor="blue">
<ActionBar flat="true" backgroundColor="blue" automationText="actionBar">
<Label text="flat action bar"></Label>
</ActionBar>

2
e2e/ui-tests-app/app/action-bar/flat-page.xml
View File

@@ -1,6 +1,6 @@
<Page navigatedTo="onNavigateTo" backgroundColor="yellow">
<ActionBar backgroundColor="blue">
<ActionBar backgroundColor="blue" automationText="actionBar">
<Label text="flat action bar"></Label>
</ActionBar>

2
e2e/ui-tests-app/app/action-bar/flat-scrollview-page.xml
View File

@@ -1,6 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" backgroundColor="yellow">
<ActionBar flat="true" backgroundColor="blue">
<ActionBar flat="true" backgroundColor="blue" automationText="actionBar">
<Label text="flat action bar"></Label>
</ActionBar>

2
e2e/ui-tests-app/app/action-bar/flat-tab-opaque-bar-page.xml
View File

@@ -1,5 +1,5 @@
<Page backgroundColor="yellow">
<ActionBar flat="true" backgroundColor="blue">
<ActionBar flat="true" backgroundColor="blue" automationText="actionBar">
<Label text="flat action bar"></Label>
</ActionBar>

2
e2e/ui-tests-app/app/action-bar/flat-tab-page.xml
View File

@@ -1,6 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" backgroundColor="yellow">
<ActionBar flat="true" backgroundColor="blue">
<ActionBar flat="true" backgroundColor="blue" automationText="actionBar">
<Label text="flat action bar"></Label>
</ActionBar>

2
e2e/ui-tests-app/app/action-bar/font-icons-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar>
<ActionBar automationText="actionBar">
<ActionBar.actionItems>
<!-- font family + font size + color -->
<ActionItem icon="font://&#xF10B;" class="font-awesome font-size color" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/icons-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar>
<ActionBar automationText="actionBar">
<ActionBar.actionItems>
<ActionItem icon="res://icon" tap="navigate"/>
<ActionItem icon="res://add_to_fav" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/local-icons-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar>
<ActionBar automationText="actionBar">
<ActionBar.actionItems>
<ActionItem icon="~/resources/images/icon.png" tap="navigate"/>
<ActionItem icon="~/resources/images/add_to_fav@3x.png" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/modal-page-hidden-action-bar-page.xml
View File

@@ -1,4 +1,4 @@
<Page showingModally="onShownModally" actionBarHidden="true">
<Page showingModally="onShownModally" actionBarHidden="true" automationText="actionBar">
<StackLayout id="layout" >
<Button text="Close" tap="onTap" />
</StackLayout>

2
e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.xml
View File

@@ -1,4 +1,4 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" actionBarHidden="true">
<Page xmlns="http://schemas.nativescript.org/tns.xsd" actionBarHidden="true" automationText="actionBar">
<StackLayout>
<button text="Open Modal" tap="btnClick" />
<button text="Go Back" tap="btnBack" />

2
e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.xml
View File

@@ -1,6 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
<Page.actionBar>
<ActionBar backgroundColor="green" title="Main View" icon="">
<ActionBar backgroundColor="green" title="Main View" icon="" automationText="actionBar">
<NavigationButton text="Back" icon="" tap="" />
<ActionBar.actionItems>
<ActionItem icon="" text="Left" tap="" ios.position="left" />

2
e2e/ui-tests-app/app/action-bar/system-icons-page.xml
View File

@@ -1,6 +1,6 @@
<Page>
<Page.actionBar>
<ActionBar>
<ActionBar automationText="actionBar">
<ActionBar.actionItems>
<ActionItem ios.systemIcon="12" android.systemIcon="ic_menu_search" tap="navigate"/>
<ActionItem ios.systemIcon="15" android.systemIcon="ic_menu_camera" tap="navigate"/>

2
e2e/ui-tests-app/app/action-bar/transparent-bg-css-page.xml
View File

@@ -1,5 +1,5 @@
<Page>
<ActionBar title="This is transparent" class="action" />
<ActionBar title="This is transparent" class="action" automationText="actionBar"/>
<StackLayout>
<Button text="go to cleared page" tap="navigate"/>
</StackLayout>

10
e2e/ui-tests-app/e2e/helpers/image-helper.ts
View File

@@ -1,6 +1,14 @@
export const setImageName = (suite: string, spec: string, testsName: string) => {
const testName = `${suite}-${spec}-${testsName.replace(suite, "").replace(spec, "")}`.replace(/(\-+)/ig, "-").replace(/(\_+)/ig, "_");
let testName = testsName
.replace(suite, "")
.replace(spec, "");
testName = `${suite}-${spec}-${testName}`
.replace("should", "-")
.replace(/\s+/g, "-")
.replace(/\_+/ig, "_")
.replace(/[!$%^&*()+|~=`{}\[\]:";'<>?,.\/]/g, "")
.replace(/\-+/g, "-");
return testName;
};

5
e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
View File

@@ -107,9 +107,10 @@ export class NavigationHelper {
const endPoint = <Point>{};
if (this._driver.isIOS) {
const rect = this._driver.getScreenActualViewPort();
startPoint.x = 5;
startPoint.y = this._driver.nsCapabilities.device.viewportRect.y / this._driver.nsCapabilities.device.config.density;
endPoint.x = (this._driver.nsCapabilities.device.viewportRect.width / this._driver.nsCapabilities.device.config.density) - 5;
startPoint.y = rect.y;
endPoint.x = (rect.width / this._driver.nsCapabilities.device.deviceScreenDensity) - 5;
endPoint.y = startPoint.y;
await this._driver.swipe(startPoint, endPoint);

13
e2e/ui-tests-app/e2e/suites/action-bar/action-bar-base-page.ts Normal file
View File

@@ -0,0 +1,13 @@
import { AppiumDriver } from "nativescript-dev-appium";
import { PageObjectBaseModel } from "../../page-object-base-model";
export class ActionBarBasePage extends PageObjectBaseModel {
private readonly automationText: string = "actionBar";
constructor(_driver: AppiumDriver) {
super(_driver, ["action-bar"]);
}
get actionBar() {
return this._driver.waitForElement(this.automationText);
}
}

307
e2e/ui-tests-app/e2e/suites/action-bar/action-bar-tests.e2e-spec.ts Normal file
View File

@@ -0,0 +1,307 @@
import { nsCapabilities, createDriver, AppiumDriver, SearchOptions, logError } from "nativescript-dev-appium";
import { ActionBarBasePage } from "./action-bar-base-page";
import { assert } from "chai";
import { setImageName } from "../../helpers/image-helper";
// import { unlinkSync, existsSync } from "fs";
const suite = "action-bar";
const testNamePrefix = `${suite}: `;
describe(`${suite}-suite`, async function () {
let driver: AppiumDriver;
let actionBarBasePage: ActionBarBasePage;
before(async function () {
nsCapabilities.testReporter.context = this;
driver = await createDriver();
await driver.restartApp();
actionBarBasePage = new ActionBarBasePage(driver);
await actionBarBasePage.initSuite();
});
after(async function () {
await actionBarBasePage.endSuite();
});
beforeEach(async function () {
driver.imageHelper.testName = setImageName(suite, "", this.currentTest.title);
driver.imageHelper.options = {
donNotAppendActualSuffixOnIntialImageCapture: true
};
});
afterEach(async function () {
if (this.currentTest.state === "failed") {
await driver.logTestArtifacts(this.currentTest.title);
// await driver.resetApp();
// await actionBarBasePage.initSuite();
}
});
const btnGoToClearPageTap = async () => {
await clickOnElement("go to cleared page");
};
const btnGoToPrevPageTap = async () => {
await clickOnElement("go to previous page");
};
const btnTap = async () => {
await clickOnElement("Tap");
};
const clickOnElement = async (automationText: string) => {
const el = await driver.waitForElement(automationText);
if (el === null) {
logError(`Element ${automationText} not found!`);
assert.isTrue(false, `Element ${automationText} should be visible`);
}
await el.click();
};
it(`${testNamePrefix}"actBG", set background color`, async function () {
await actionBarBasePage.navigateToSample("actBG");
await driver.imageHelper.compareScreen();
await btnGoToClearPageTap();
await driver.imageHelper.compareScreen();
await btnGoToPrevPageTap();
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}"actBGCss", issue-516`, async function () {
await actionBarBasePage.navigateToSample("actBGCss");
const imageNameRed = setImageName(suite, "", `${testNamePrefix} should navigate to "actBGCss" issue-516-red`);
const imageNameTrans = setImageName(suite, "", `${testNamePrefix} should navigate to "actBGCss" issue-516-trans`);
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameRed, keepOriginalImageName: true });
await btnGoToClearPageTap();
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameTrans, keepOriginalImageName: true });
await btnGoToPrevPageTap();
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameRed, keepOriginalImageName: true });
await btnGoToClearPageTap();
await (await driver.waitForElement("ITEM")).click();
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameRed, keepOriginalImageName: true });
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}"actColor", should set text color`, async function () {
await actionBarBasePage.navigateToSample("actColor");
const result = await driver.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(result);
});
it(`${testNamePrefix}"actIcons"`, async function () {
await actionBarBasePage.navigateToSample("actIcons");
const result = await driver.compareElement(await actionBarBasePage.actionBar);
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(result);
});
it(`${testNamePrefix}"actLocalIcons"`, async function () {
await actionBarBasePage.navigateToSample("actLocalIcons");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("undefined");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("alwaysTemplate");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("undefined");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("automatic");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}"actResIcons"`, async function () {
await actionBarBasePage.navigateToSample("actResIcons");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("undefined");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("alwaysTemplate");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("undefined");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await clickOnElement("automatic");
await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix} should navigate to actStyle`, async function () {
await actionBarBasePage.navigateToSample("actStyle");
const result = await driver.compareElement(await actionBarBasePage.actionBar);
assert.isTrue(result);
});
it(`${testNamePrefix} should "go to cleared page"`, async function () {
await btnGoToClearPageTap();
const result = await driver.compareElement(await actionBarBasePage.actionBar);
assert.isTrue(result);
});
it(`${testNamePrefix} should "go to previous page"`, async function () {
await btnGoToPrevPageTap();
const result = await driver.compareElement(await actionBarBasePage.actionBar);
assert.isTrue(result);
});
it(`${testNamePrefix} click on "ITEM" and navigate to clean page`, async function () {
await (await driver.waitForElement("ITEM")).click();
const result = await driver.compareElement(await actionBarBasePage.actionBar);
assert.isTrue(result);
});
it(`${testNamePrefix} click on "ITEM" and navigate to action bar style initial page`, async function () {
await (await driver.waitForElement("ITEM")).click();
const result = await driver.compareElement(await actionBarBasePage.actionBar, `${suite}-navigate-to-actStyle`);
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(result);
});
it(`${testNamePrefix} should navigate to "actView"`, async function () {
await actionBarBasePage.navigateToSample("actView");
const result = await driver.compareElement(await actionBarBasePage.actionBar);
assert.isTrue(result);
});
it(`${testNamePrefix} should navigate with "Green" button`, async function () {
await (await driver.waitForElement("Green")).click();
const result = await driver.compareElement(await actionBarBasePage.actionBar, setImageName(suite, ``, `${testNamePrefix} should "go to cleared page"`));
assert.isTrue(result);
});
it(`${testNamePrefix} should navigate back with "BACK"`, async function () {
await driver.navBack();
const result = await driver.compareElement(await actionBarBasePage.actionBar, setImageName(suite, "", `${testNamePrefix} should navigate to "actView"`));
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(result);
});
it(`${testNamePrefix}"actionItemPosition",should change item position`, async function () {
await actionBarBasePage.navigateToSample("actionItemPosition");
await driver.imageHelper.compareScreen();
await btnTap();
await driver.imageHelper.compareScreen();
await btnTap();
await driver.imageHelper.compareScreen();
await btnTap();
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}"actTransparentBgCss", page background color as actBackground color`, async function () {
await actionBarBasePage.navigateToSample("actTransparentBgCss");
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("go to cleared page")).click();
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("ITEM")).click();
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix} should navigate to "modalShownActBar" nav back with "Go Back"`, async function () {
await actionBarBasePage.navigateToSample("modalShownActBar");
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Open Modal")).click();
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Close")).click();
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Go Back")).click();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix} should navigate to "modalHiddenActBar" nav back with "Go Back"`, async function () {
await actionBarBasePage.navigateToSample("modalHiddenActBar");
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Open Modal")).click();
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Change text")).click();
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Close")).click();
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("Go Back")).click();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}"flat", change`, async function () {
await actionBarBasePage.navigateToSample("flat");
await driver.imageHelper.compareScreen();
await (await driver.waitForElement("change flat property")).click();
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}flat-layout"`, async function () {
await actionBarBasePage.navigateToSample("flat-layout");
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}flat-scrollview`, async function () {
await actionBarBasePage.navigateToSample("flat-scrollview");
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}"flat-tab"`, async function () {
await actionBarBasePage.navigateToSample("flat-tab");
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
// BUG
it(`${testNamePrefix}flat-opaque-bar`, async function () {
this.skip();
await actionBarBasePage.navigateToSample("flat-tab-opaque-bar");
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
it(`${testNamePrefix}font-icons`, async function () {
await actionBarBasePage.navigateToSample("font-icons");
await driver.imageHelper.compareScreen();
await actionBarBasePage.navigateBackToSuitMainPage();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
});
});

1
e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
View File

@@ -8,7 +8,6 @@ export class ButtonBackgroundPage extends PageObjectBaseModel {
constructor(_driver: AppiumDriver) {
super(_driver, ["button", "background"], ElementCacheStrategy.none);
this._driver.imageHelper.options.toleranceType = ImageOptions.percent;
}
public viewGroupLocator() {

1
e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
View File

@@ -17,7 +17,6 @@ describe(`${imagePrefix}-suite`, () => {
await driver.restartApp();
backgroundPage = new ButtonBackgroundPage(driver);
await backgroundPage.initSuite();
driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
});
after(async function () {

4
e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
View File

@@ -1,7 +1,6 @@
import { nsCapabilities, createDriver, AppiumDriver, Direction } from "nativescript-dev-appium";
import { BottomNavigationBasePage } from "./bottom-navigation-base-page";
import { Platform } from "mobile-devices-controller";
import { ElementCacheStrategy } from "../../../helpers/navigation-helper";
import { setImageName } from "../../../helpers/image-helper";
import { assert } from "chai";
@@ -22,6 +21,7 @@ describe(`${imagePrefix}-suite`, async function () {
];
before(async function () {
this.skip();
nsCapabilities.testReporter.context = this;
driver = await createDriver();
await driver.restartApp();
@@ -30,10 +30,12 @@ describe(`${imagePrefix}-suite`, async function () {
});
after(async function () {
this.skip();
await bottomNavigationBasePage.endSuite();
});
afterEach(async function () {
this.skip();
if (this.currentTest.state === "failed") {
await driver.logTestArtifacts(this.currentTest.title);
await driver.restartApp();

1
e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts
View File

@@ -1,7 +1,6 @@
import { AppiumDriver, Point, IRectangle, UIElement, logInfo, logWarn } from "nativescript-dev-appium";
import { PageObjectBaseModel } from "../../page-object-base-model";
import { ElementCacheStrategy } from "../../helpers/navigation-helper";
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
export abstract class TabNavigationBasePage extends PageObjectBaseModel {
protected bottomNavigatioinTabRect: IRectangle;

0
e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/issues-from-git.ts
View File

3
e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts
View File

@@ -25,9 +25,6 @@ describe(`${imagePrefix}-suite`, async function () {
beforeEach(async function () {
driver.imageHelper.testName = setImageName(suite, spec, this.currentTest.title);
driver.imageHelper.options = {
donNotAppendActualSuffixOnIntialImageCapture: true
};
});
afterEach(async function () {

2
gruntfile.js
View File

@@ -237,7 +237,7 @@ module.exports = function (grunt) {
},
platformsFiles: {
expand: true,
src: "tns-core-modules/platforms/**/*.*",
src: "tns-core-modules/platforms/**/*",
dest: localCfg.outDir + "/"
},
apps: {

1
tns-core-modules-widgets/.gitignore vendored
View File

@@ -46,7 +46,6 @@ local.properties
ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcuserdata/
ios/TNSWidgets/TNSWidgets.xcodeproj/xcuserdata/
ios/TNSWidgets/DerivedData/
ios/TNSWidgets/Pods/
xcuserdata/
android/widgets/bin

4
tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java
View File

@@ -170,7 +170,9 @@ class TabStrip extends LinearLayout {
}
@Override
protected void onDraw(Canvas canvas) {
protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas);
final int height = getHeight();
final int childCount = getChildCount();
final TabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null

3
tns-core-modules-widgets/build.ios.sh
View File

@@ -16,9 +16,6 @@ cd ios
cd ..
echo "Copy ios/TNSWidgets/build/*.framework dist/package/platforms/ios"
cp -R ios/TNSWidgets/build/MaterialComponents.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/MDFInternationalization.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/Pods_TNSWidgets.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/TNSWidgets.framework dist/package/platforms/ios
cp ios/TNSWidgets/build/*.framework.dSYM.zip dist/package/platforms/ios

6
tns-core-modules-widgets/ios/TNSWidgets/Podfile
View File

@@ -1,6 +0,0 @@
platform :ios, '10.0'
use_frameworks!
target 'TNSWidgets' do
pod 'MaterialComponents/Tabs', '84.4.0'
end

39
tns-core-modules-widgets/ios/TNSWidgets/Podfile.lock
View File

@@ -1,39 +0,0 @@
PODS:
- MaterialComponents/AnimationTiming (84.4.0)
- MaterialComponents/Ink (84.4.0):
- MaterialComponents/private/Math
- MaterialComponents/Palettes (84.4.0)
- MaterialComponents/private/Application (84.4.0)
- MaterialComponents/private/Math (84.4.0)
- MaterialComponents/ShadowElevations (84.4.0)
- MaterialComponents/ShadowLayer (84.4.0):
- MaterialComponents/ShadowElevations
- MaterialComponents/Tabs (84.4.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Ink
- MaterialComponents/Palettes
- MaterialComponents/private/Math
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MDFInternationalization
- MaterialComponents/Typography (84.4.0):
- MaterialComponents/private/Application
- MaterialComponents/private/Math
- MDFInternationalization (2.0.0)
DEPENDENCIES:
- MaterialComponents/Tabs (= 84.4.0)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
- MaterialComponents
- MDFInternationalization
SPEC CHECKSUMS:
MaterialComponents: e31f67324695bb1b537e5eccaee62db07ac3d06b
MDFInternationalization: 010097556d6b09d2c4ea38e0820ea6d37be6a314
PODFILE CHECKSUM: cf8c5f11be5a664a1b63632768c1ac024bf37a30
COCOAPODS: 1.5.3

52
tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj
View File

@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */; };
8B7321CF1D097ECD00884AC6 /* TNSLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B7321CD1D097ECD00884AC6 /* TNSLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B7321D01D097ECD00884AC6 /* TNSLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B7321CE1D097ECD00884AC6 /* TNSLabel.m */; };
B8E76F52212C2DA2009CFCE2 /* NSObject+Swizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -36,7 +35,6 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TNSWidgets.release.xcconfig"; path = "Pods/Target Support Files/Pods-TNSWidgets/Pods-TNSWidgets.release.xcconfig"; sourceTree = "<group>"; };
8B7321CD1D097ECD00884AC6 /* TNSLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TNSLabel.h; sourceTree = "<group>"; };
8B7321CE1D097ECD00884AC6 /* TNSLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TNSLabel.m; sourceTree = "<group>"; };
B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Swizzling.h"; sourceTree = "<group>"; };
@@ -45,8 +43,6 @@
B8E76F59212C2F4E009CFCE2 /* UIView+PropertyBag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PropertyBag.m"; sourceTree = "<group>"; };
B8E76F5C212C3134009CFCE2 /* UIView+PassThroughParent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+PassThroughParent.h"; sourceTree = "<group>"; };
B8E76F5D212C3134009CFCE2 /* UIView+PassThroughParent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PassThroughParent.m"; sourceTree = "<group>"; };
BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TNSWidgets.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TNSWidgets/Pods-TNSWidgets.debug.xcconfig"; sourceTree = "<group>"; };
C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F915D3531EC9EF5E00071914 /* TNSProcess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TNSProcess.m; path = ../TNSProcess.m; sourceTree = "<group>"; };
F915D3541EC9EF5E00071914 /* TNSProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TNSProcess.h; path = ../TNSProcess.h; sourceTree = "<group>"; };
F98F5CAF1CD0EFEA00978308 /* TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -64,7 +60,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -79,31 +74,12 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
23F4E40A96EF6D33AE4654D3 /* Frameworks */ = {
isa = PBXGroup;
children = (
C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
50D824CFC5BFEB60164D83B1 /* Pods */ = {
isa = PBXGroup;
children = (
BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */,
0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
F98F5CA51CD0EFEA00978308 = {
isa = PBXGroup;
children = (
F98F5CB11CD0EFEA00978308 /* TNSWidgets */,
F98F5CBD1CD0EFEA00978308 /* TNSWidgetsTests */,
F98F5CB01CD0EFEA00978308 /* Products */,
50D824CFC5BFEB60164D83B1 /* Pods */,
23F4E40A96EF6D33AE4654D3 /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -170,7 +146,6 @@
isa = PBXNativeTarget;
buildConfigurationList = F98F5CC31CD0EFEA00978308 /* Build configuration list for PBXNativeTarget "TNSWidgets" */;
buildPhases = (
A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */,
F98F5CAA1CD0EFEA00978308 /* Sources */,
F98F5CAB1CD0EFEA00978308 /* Frameworks */,
F98F5CAC1CD0EFEA00978308 /* Headers */,
@@ -255,31 +230,6 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-TNSWidgets-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
F98F5CAA1CD0EFEA00978308 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -403,7 +353,6 @@
};
F98F5CC41CD0EFEA00978308 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -420,7 +369,6 @@
};
F98F5CC51CD0EFEA00978308 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;

10
tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/contents.xcworkspacedata generated
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:TNSWidgets.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>

8
tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

13
tns-core-modules-widgets/ios/build.sh
View File

@@ -3,17 +3,11 @@
echo "Set exit on simple errors"
set -e
(
echo "update pods"
cd TNSWidgets
pod install
)
echo "Build for iphonesimulator"
xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
echo "Build for iphoneos"
xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
function buildFatFramework() {
FRAMEWORK_NAME=$1
@@ -50,6 +44,3 @@ function buildFatFramework() {
}
buildFatFramework TNSWidgets .
buildFatFramework Pods_TNSWidgets .
buildFatFramework MDFInternationalization MDFInternationalization
buildFatFramework MaterialComponents MaterialComponents

2
tns-core-modules/package.json
View File

@@ -26,7 +26,7 @@
"license": "Apache-2.0",
"typings": "tns-core-modules.d.ts",
"dependencies": {
"tns-core-modules-widgets": "6.0.1",
"tns-core-modules-widgets": "next",
"tslib": "^1.9.3"
},
"devDependencies": {

1
tns-core-modules/platforms/ios/Podfile Normal file
View File

@@ -0,0 +1 @@
pod 'MaterialComponents/Tabs', '~> 84.4'