From 5c4dbde98c8bdad288e95bb975964a50d6912a46 Mon Sep 17 00:00:00 2001 From: Rossen Hristov Date: Wed, 15 Jun 2016 14:09:11 +0300 Subject: [PATCH] Add unit test for SearchBar.textFieldHintColor on iOS Related to #1807 --- .../search-bar/search-bar-tests-native.ios.ts | 19 +++++++------------ tests/app/ui/search-bar/search-bar-tests.ts | 5 ----- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/tests/app/ui/search-bar/search-bar-tests-native.ios.ts b/tests/app/ui/search-bar/search-bar-tests-native.ios.ts index 06e25c606..1e3ef165b 100644 --- a/tests/app/ui/search-bar/search-bar-tests-native.ios.ts +++ b/tests/app/ui/search-bar/search-bar-tests-native.ios.ts @@ -1,16 +1,11 @@ -import colorModule = require("color"); -import searchBarModule = require("ui/search-bar"); +import { SearchBar } from "ui/search-bar"; +import { Color } from "color"; +import * as utils from "utils/utils"; -export function getNativeHintColor(searchBar: searchBarModule.SearchBar): colorModule.Color { - // TODO: This test needs to be created - return undefined; +export function getNativeHintColor(searchBar: SearchBar): Color { + return (searchBar)._placeholderLabel ? utils.ios.getColor((searchBar)._placeholderLabel.textColor) : undefined; } -export function getNativeFontSize(searchBar: searchBarModule.SearchBar): number { - var sf = (searchBar)._textField; - if (sf) { - return sf.font.pointSize; - } - - return undefined; +export function getNativeFontSize(searchBar: SearchBar): number { + return (searchBar)._textField ? (searchBar)._textField.font.pointSize : undefined; } diff --git a/tests/app/ui/search-bar/search-bar-tests.ts b/tests/app/ui/search-bar/search-bar-tests.ts index b17a04ab6..fc87f49d1 100644 --- a/tests/app/ui/search-bar/search-bar-tests.ts +++ b/tests/app/ui/search-bar/search-bar-tests.ts @@ -28,11 +28,6 @@ export var testSearchBarHintColorAndroid = function () { helper.buildUIAndRunTest(_createSearchBarFunc(), function (views: Array) { var searchBar = views[0]; - // TODO: create IOS test once IOS support is working - if (!searchBar.android) { - return; - } - searchBar.text = ""; searchBar.hint = "hint color test";