NativeScript
diff --git a/‎tests/app/testRunner.ts‎
Lines changed: 2 additions & 2 deletions b/‎tests/app/testRunner.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/app/ui/helper.ts‎
Lines changed: 37 additions & 3 deletions b/‎tests/app/ui/helper.ts‎
Lines changed: 37 additions & 3 deletions
@@ -11,7 +11,7 @@ import * as platform from "tns-core-modules/platform";
 import "./ui-test";
 import * as fs from "tns-core-modules/file-system";
 import { unsetValue } from "tns-core-modules/ui/core/properties";
-import { ad } from "tns-core-modules/utils/utils";
+import { ad, ios } from "tns-core-modules/utils/utils";
 
 Frame.defaultAnimatedNavigation = false;
 
@@ -136,7 +136,7 @@ import * as flexBoxLayoutTests from "./ui/layouts/flexbox-layout-tests";
 allTests["FLEXBOXLAYOUT"] = flexBoxLayoutTests;
 
 import * as safeAreaLayoutTests from "./ui/layouts/safe-area-tests";
-if (platform.device.os === platform.platformNames.ios) {
+if (platform.isIOS && ios.MajorVersion > 10) {
     allTests["SAFEAREALAYOUT"] = safeAreaLayoutTests;
 }
 
 
@@ -79,16 +79,50 @@ export function do_PageTest_WithStackLayout_AndButton(test: (views: [Page, Stack
     newPage.content = null;
 }
 
+export interface PageOptions {
+    pageCss?: any,
+    actionBar?: boolean,
+    actionBarFlat?: boolean,
+    actionBarHidden?: boolean,
+    tabBar?: boolean
+}
+
 //export function buildUIAndRunTest(controlToTest, testFunction, options) {
-export function buildUIAndRunTest<T extends View>(controlToTest: T, testFunction: (views: [T, Page]) => void, options?: {pageCss}) {
+export function buildUIAndRunTest<T extends View>(controlToTest: T, testFunction: (views: [T, Page]) => void, options?: PageOptions) {
     clearPage();
     let newPage = getCurrentPage();
 
+    let testSubject = controlToTest as View;
+
     if (options) {
-        newPage.css = options.pageCss;
+        if (options.pageCss) {
+            newPage.css = options.pageCss;
+        }
+
+        if (options.actionBar) {
+            newPage.actionBar.title = "Test";
+        }
+
+        if (options.actionBarFlat) {
+            newPage.actionBar.title = "Test";
+            newPage.actionBar.flat = true;
+        }
+
+        if (options.actionBarHidden) {
+            newPage.actionBarHidden = true;
+        }
+
+        if (options.tabBar) {
+            const tabView = new TabView();
+            const tabEntry = new TabViewItem();
+            tabEntry.title = "Test";
+            tabEntry.view = controlToTest;
+            tabView.items = [tabEntry];
+            testSubject = tabView;
+        }
     }
 
-    newPage.content = controlToTest;
+    newPage.content = testSubject;
 
     testFunction([controlToTest, newPage]);
     newPage.content = null;