diff --git a/apps/tests/testRunner.ts b/apps/tests/testRunner.ts index 909ba2ce1..5141cbc90 100644 --- a/apps/tests/testRunner.ts +++ b/apps/tests/testRunner.ts @@ -2,16 +2,23 @@ import TKUnit = require("./TKUnit"); import trace = require("trace"); import frameModule = require("ui/frame"); +import platform = require("platform"); + frameModule.Frame.defaultAnimatedNavigation = false; function isRunningOnEmulator(): boolean { // This checks are not good enough to be added to modules but keeps unittests green. - return android.os.Build.FINGERPRINT.indexOf("generic") > -1 || - android.os.Build.HARDWARE.toLowerCase() === "goldfish" || - android.os.Build.HARDWARE.toLowerCase() === "donatello" || // VS Emulator - android.os.Build.PRODUCT.toLocaleLowerCase().indexOf("sdk") > -1 || - android.os.Build.PRODUCT.toLocaleLowerCase().indexOf("emulator") > -1; // VS Emulator + if (platform.device.os === platform.platformNames.android) { + return android.os.Build.FINGERPRINT.indexOf("generic") > -1 || + android.os.Build.HARDWARE.toLowerCase() === "goldfish" || + android.os.Build.HARDWARE.toLowerCase() === "donatello" || // VS Emulator + android.os.Build.PRODUCT.toLocaleLowerCase().indexOf("sdk") > -1 || + android.os.Build.PRODUCT.toLocaleLowerCase().indexOf("emulator") > -1; // VS Emulator + } + else if (platform.device.os === platform.platformNames.ios) { + return platform.device.model === "iPhone Simulator"; + } } export var allTests = {}; diff --git a/platform/platform.d.ts b/platform/platform.d.ts index 5339070b6..bc38bf328 100644 --- a/platform/platform.d.ts +++ b/platform/platform.d.ts @@ -18,7 +18,7 @@ declare module "platform" { export class device { /** * Gets the model of the device. - * For example: "Nexus 5" or "iPhone. + * For example: "Nexus 5" or "iPhone". */ static model: string;