From 3d1a8151e4506bfff5c8da1b1dc444427b5ef3ca Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Thu, 18 Jul 2019 20:53:15 +0300 Subject: [PATCH] chore: update tests --- .../app/bottom-navigation/binding-page.ts | 4 ++-- .../bottom-navigation-view-model.ts | 2 -- e2e/ui-tests-app/app/tabs/tabs-binding-page.ts | 15 ++------------- .../app/tabs/tabs-binding-view-model.ts | 1 - e2e/ui-tests-app/e2e/page-object-base-model.ts | 6 ++++++ .../button/background/button-background-page.ts | 1 - .../bottom-navigation.e2e-spec.ts | 4 ---- .../tab-navigation/tab-navigation-base-page.ts | 6 ------ .../tab-navigation/tab-view/tab-view-base-page.ts | 3 --- .../tab-view/tab-view-css-properties.e2e-spec.ts | 6 ++++-- .../tab-navigation/tabs/tabs-tests.e2e-spec.ts | 10 ++++++---- 11 files changed, 20 insertions(+), 38 deletions(-) diff --git a/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts b/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts index 90447f7a9..38dec586d 100644 --- a/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts +++ b/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts @@ -1,6 +1,6 @@ -import * as vmModule from "./bottom-navigation-view-model"; +import { BottomNavigationViewModel } from "./bottom-navigation-view-model"; export function bottomNavigaitonLoaded(args) { const bottomNav = args.object.page; - bottomNav.bindingContext = vmModule.bottomNavigationViewModel; + bottomNav.bindingContext = new BottomNavigationViewModel(); } \ No newline at end of file diff --git a/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-view-model.ts b/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-view-model.ts index cf6032aea..f4f699e5e 100644 --- a/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-view-model.ts +++ b/e2e/ui-tests-app/app/bottom-navigation/bottom-navigation-view-model.ts @@ -2,7 +2,6 @@ import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout"; import { Label } from "tns-core-modules/ui/label"; import { Observable } from "tns-core-modules/data/observable"; -import { ObservableArray } from "tns-core-modules/data/observable-array"; import { TabStripItem } from "tns-core-modules/ui/tab-navigation-base/tab-strip-item"; import { TabContentItem } from "tns-core-modules/ui/tab-navigation-base/tab-content-item"; @@ -58,4 +57,3 @@ export class BottomNavigationViewModel extends Observable { return contentItem; } } -export const bottomNavigationViewModel = new BottomNavigationViewModel(); diff --git a/e2e/ui-tests-app/app/tabs/tabs-binding-page.ts b/e2e/ui-tests-app/app/tabs/tabs-binding-page.ts index 40e37b2a8..277730f9f 100644 --- a/e2e/ui-tests-app/app/tabs/tabs-binding-page.ts +++ b/e2e/ui-tests-app/app/tabs/tabs-binding-page.ts @@ -1,17 +1,6 @@ -import * as vmModule from "./tabs-binding-view-model"; - -// var viewModel = vmModule.tabsBindingNavigationViewModel; - -// export function tabsLoaded(args) { -// let tabs = args.object; -// tabs.bindingContext = viewModel; -// } - -// export function addTabs(args) { -// viewModel.createItems(); -// } +import { TabsBindingNavigationViewModel } from "./tabs-binding-view-model"; export function tabsLoaded(args) { const page = args.object.page; - page.bindingContext = vmModule.tabsBindingNavigationViewModel; + page.bindingContext = new TabsBindingNavigationViewModel(); } \ No newline at end of file diff --git a/e2e/ui-tests-app/app/tabs/tabs-binding-view-model.ts b/e2e/ui-tests-app/app/tabs/tabs-binding-view-model.ts index c745121c1..18a51c893 100644 --- a/e2e/ui-tests-app/app/tabs/tabs-binding-view-model.ts +++ b/e2e/ui-tests-app/app/tabs/tabs-binding-view-model.ts @@ -58,4 +58,3 @@ export class TabsBindingNavigationViewModel extends Observable { return contentItem; } } -export var tabsBindingNavigationViewModel = new TabsBindingNavigationViewModel(); diff --git a/e2e/ui-tests-app/e2e/page-object-base-model.ts b/e2e/ui-tests-app/e2e/page-object-base-model.ts index ecddbde85..ca7ba36e4 100644 --- a/e2e/ui-tests-app/e2e/page-object-base-model.ts +++ b/e2e/ui-tests-app/e2e/page-object-base-model.ts @@ -1,5 +1,6 @@ import { AppiumDriver, logInfo } from "nativescript-dev-appium"; import { NavigationHelper, ElementCacheStrategy } from "./helpers/navigation-helper"; +import { ImageOptions } from "nativescript-dev-appium/lib/image-options"; export abstract class PageObjectBaseModel { @@ -7,6 +8,11 @@ export abstract class PageObjectBaseModel { constructor(protected _driver: AppiumDriver, protected _naviagtionLinks: Array, elementCacheStrategy: ElementCacheStrategy = ElementCacheStrategy.none) { this.navigationHelper = new NavigationHelper(this._driver, this._naviagtionLinks, elementCacheStrategy); + this._driver.imageHelper.options.overwriteActualImage = process.env["OVERWRITE_ACTUALIMAGE"] === 'true'; + this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = +process.env["WAIT_BEFORE_CREATING_INITIAL_IMAGE_CAPTURE"] || 9000; + this._driver.imageHelper.options.keepOriginalImageSize = false; + this._driver.imageHelper.options.tolerance = 0; + this._driver.imageHelper.options.toleranceType = ImageOptions.pixel; } async initSuite() { diff --git a/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts b/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts index 7bc8d8964..ede3d634f 100644 --- a/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts +++ b/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts @@ -8,7 +8,6 @@ export class ButtonBackgroundPage extends PageObjectBaseModel { constructor(_driver: AppiumDriver) { super(_driver, ["button", "background"], ElementCacheStrategy.none); - this._driver.imageHelper.options.keepOriginalImageSize = false; this._driver.imageHelper.options.toleranceType = ImageOptions.percent; } diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts index 220a99e99..3aeabdce3 100644 --- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts +++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts @@ -54,8 +54,6 @@ describe(`${suite}-${spec}-suite`, async function () { * Bug */ it(`${spec}-binding-add-items`, async function () { - this.skip(); - await bottomNavigationBasePage.navigateToSample("binding"); await driver.imageHelper.compareScreen(); @@ -84,8 +82,6 @@ describe(`${suite}-${spec}-suite`, async function () { * Bug */ it(`${spec}-binding-remove-items`, async function () { - this.skip(); - await bottomNavigationBasePage.navigateToSample("binding"); await driver.imageHelper.compareScreen(); diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts index 1b8481d4a..1e798c28f 100644 --- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts +++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts @@ -10,12 +10,6 @@ export abstract class TabNavigationBasePage extends PageObjectBaseModel { constructor(_driver: AppiumDriver, navigationLinks: Array) { super(_driver, navigationLinks, ElementCacheStrategy.none); - this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = 6000; - this._driver.imageHelper.options.keepOriginalImageSize = false; - this._driver.imageHelper.options.tolerance = 0; - this._driver.imageHelper.options.toleranceType = ImageOptions.pixel; - this._driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true; - this._driver.imageHelper.options.timeOutSeconds = 7; } abstract async mainWidget(); diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts index bab586b5b..1796cdd89 100644 --- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts +++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts @@ -12,8 +12,5 @@ export class TabViewBasePage extends PageObjectBaseModel { async init(subSuiteName: string) { this._naviagtionLinks.push(subSuiteName); await super.initSuite(); - this._driver.imageHelper.options.keepOriginalImageSize = false; - this._driver.imageHelper.options.tolerance = 0; - this._driver.imageHelper.options.toleranceType = ImageOptions.pixel; } } \ No newline at end of file diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts index 65de285b0..17518b948 100644 --- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts +++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-css-properties.e2e-spec.ts @@ -1,4 +1,4 @@ -import { nsCapabilities, createDriver, AppiumDriver, Direction } from "nativescript-dev-appium"; +import { nsCapabilities, createDriver, AppiumDriver, Direction, logError } from "nativescript-dev-appium"; import { TabViewBasePage } from "./tab-view-base-page"; import { ImageOptions } from "nativescript-dev-appium/lib/image-options"; import { Platform } from "mobile-devices-controller"; @@ -32,7 +32,6 @@ describe(`${suite}-${spec}-suite`, async function () { await driver.restartApp(); tabViewBasePage = new TabViewBasePage(driver, ElementCacheStrategy.none); await tabViewBasePage.init("tabViewCss"); - driver.imageHelper.options.keepOriginalImageSize = false; }); after(async function () { @@ -63,6 +62,9 @@ describe(`${suite}-${spec}-suite`, async function () { if (driver.platformName === Platform.ANDROID && (sample.sample.toLowerCase() === "all" || sample.sample.toLowerCase() === "reset")) { await driver.scroll(Direction.down, 400, 200, 300, 200); + await driver.scroll(Direction.down, 400, 200, 300, 200); + await driver.scroll(Direction.down, 400, 200, 300, 200); + } const scenarioBtn = await driver.waitForElement(sample.sample); await scenarioBtn.tap(); diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts index 694d94072..aa3aafc86 100644 --- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts +++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts @@ -177,8 +177,9 @@ describe(`${imagePrefix}-suite`, async function () { * Bug */ it(`${imagePrefix}-binding-add-items`, async function () { - this.skip(); - + if (driver.isIOS) { + this.skip(); + } await tabsViewBasePage.navigateToSample("tabs-binding"); await driver.imageHelper.compareScreen(); @@ -207,8 +208,9 @@ describe(`${imagePrefix}-suite`, async function () { * Bug */ it(`${imagePrefix}-binding-remove-items`, async function () { - this.skip(); - + if (driver.isIOS) { + this.skip(); + } await tabsViewBasePage.navigateToSample("tabs-binding"); await driver.imageHelper.compareScreen();