From 2bb5ff414d964f90f4211715b227449e71d43794 Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Thu, 9 May 2019 13:05:20 +0300 Subject: [PATCH 1/2] chore(android): disable test_ImageCache_ValidUrl on api19 --- tests/app/ui/image-cache/image-cache-tests.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/app/ui/image-cache/image-cache-tests.ts b/tests/app/ui/image-cache/image-cache-tests.ts index c6237b8ac..946cf426b 100644 --- a/tests/app/ui/image-cache/image-cache-tests.ts +++ b/tests/app/ui/image-cache/image-cache-tests.ts @@ -1,9 +1,19 @@ import * as imageCacheModule from "tns-core-modules/ui/image-cache"; import * as imageSource from "tns-core-modules/image-source"; import * as types from "tns-core-modules/utils/types"; +import { device } from "tns-core-modules/platform"; +import lazy from "tns-core-modules/utils/lazy"; + import * as TKUnit from "../../TKUnit"; +const sdkVersion = lazy(() => parseInt(device.sdkVersion)); + export const test_ImageCache_ValidUrl = function() { + // see https://github.com/NativeScript/NativeScript/issues/6643 + if (sdkVersion() < 20) { + return; + } + const cache = new imageCacheModule.Cache(); cache.maxRequests = 5; From 6511eeb5a29675c31c7a978d30dffb82411a1f31 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Thu, 9 May 2019 14:39:23 +0300 Subject: [PATCH 2/2] chore: remove clashing typings --- e2e/animation/package.json | 1 - e2e/modal-navigation/package.json | 3 +-- e2e/nested-frame-navigation/package.json | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/e2e/animation/package.json b/e2e/animation/package.json index 00c40a851..b89e6fd59 100644 --- a/e2e/animation/package.json +++ b/e2e/animation/package.json @@ -19,7 +19,6 @@ "devDependencies": { "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", - "@types/node": "~10.12.18", "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", diff --git a/e2e/modal-navigation/package.json b/e2e/modal-navigation/package.json index c3ffbd134..b9fca7282 100644 --- a/e2e/modal-navigation/package.json +++ b/e2e/modal-navigation/package.json @@ -19,14 +19,13 @@ "devDependencies": { "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", - "@types/node": "^7.0.5", "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", - "tns-platform-declarations": "next", "rimraf": "^2.6.2", + "tns-platform-declarations": "next", "typescript": "^3.1.6" }, "scripts": { diff --git a/e2e/nested-frame-navigation/package.json b/e2e/nested-frame-navigation/package.json index e9754a49e..a433feba2 100644 --- a/e2e/nested-frame-navigation/package.json +++ b/e2e/nested-frame-navigation/package.json @@ -19,7 +19,6 @@ "devDependencies": { "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", - "@types/node": "^7.0.5", "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next",