cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: CB-9787 - [CDVStartPageTest testParametersInStartPage] unit-test failure
Date Mon, 02 Nov 2015 17:41:42 GMT
Repository: cordova-ios
Updated Branches:
  refs/heads/master fc690d584 -> 0ec2949d9


CB-9787 - [CDVStartPageTest testParametersInStartPage] unit-test failure


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/0ec2949d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/0ec2949d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/0ec2949d

Branch: refs/heads/master
Commit: 0ec2949d9b37495da6504867bfb371bd868242f0
Parents: fc690d5
Author: Shazron Abdullah <shazron@apache.org>
Authored: Mon Nov 2 09:41:21 2015 -0800
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Mon Nov 2 09:41:21 2015 -0800

----------------------------------------------------------------------
 tests/CordovaLibTests/CDVStartPageTests.m | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0ec2949d/tests/CordovaLibTests/CDVStartPageTests.m
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CDVStartPageTests.m b/tests/CordovaLibTests/CDVStartPageTests.m
index ba3acd3..5f72d88 100644
--- a/tests/CordovaLibTests/CDVStartPageTests.m
+++ b/tests/CordovaLibTests/CDVStartPageTests.m
@@ -89,10 +89,14 @@
 
     NSString* geHREF = @"window.location.href";
     [self waitForConditionName:@"getting href" block:^{
+        NSURL* vc1URL = vc1WebViewEngine.URL;
+        NSURL* vc2URL = vc2WebViewEngine.URL;
+        
         return
-        (BOOL)
-        ((vc1WebViewEngine.URL != nil && ![[vc1WebViewEngine.URL description] isEqualToString:@"about:blank"])
&&
-         (vc2WebViewEngine.URL != nil && ![[vc2WebViewEngine.URL description] isEqualToString:@"about:blank"]));
+        (BOOL)(
+               (vc1URL != nil && ![[vc1URL absoluteString] isEqualToString:@"about:blank"]
&& ![[vc1URL absoluteString] isEqualToString:@""]) &&
+               (vc2URL != nil && ![[vc2URL absoluteString] isEqualToString:@"about:blank"]
&& ![[vc2URL absoluteString] isEqualToString:@""])
+               );
     }];
 
     [vc1WebViewEngine evaluateJavaScript:geHREF completionHandler:^(NSString* href, NSError*
error) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message