fix travis build

scripts/build-all.sh

@@ -4,4 +4,5 @@ set -e
 cd $(dirname $0)
 ./build-js.sh
 ./build-objc-ios.sh
+./build-objc-osx.sh
 ./build-java-android.sh

scripts/build-travis.sh

@@ -7,7 +7,7 @@ export ANDROID_SDK_ROOT=$HOMEBREW/opt/android-sdk
 
 cd $(dirname $0)
 ./build-js.sh
-./build-objc-ios.sh 0
+./build-objc-ios.sh
 ./build-objc-osx.sh
 
 # currently, race conditions prevent the android tests to pass

scripts/install-travis.sh

@@ -8,14 +8,23 @@ set -ev
 # curl -L https://github.com/mxcl/homebrew/tarball/master | tar xz --strip 1 -C $HOMEBREW
 # export PATH=$HOMEBREW/bin:$PATH
 
-brew install phantomjs
-which phantomjs || (echo "PhantomJS not in PATH" && exit 1)
 
+brew install node
+which npm || (echo "npm not in PATH" && exit 1)
+
+# workaround as describe in http://blog.npmjs.org/post/78085451721/npms-self-signed-certificate-is-no-more
+npm config set ca ""
+
+brew update
+brew unlink xctool
 brew install xctool
+
 brew install appledoc
 
-pod --version
-gem update cocoapods
+gem install cocoapods
+
+brew install phantomjs
+which phantomjs || (echo "PhantomJS not in PATH" && exit 1)
 
 # android build currently not supported on travis => skip installation
 #

tests/objc-general/TransitAbstractWebViewContextTests.m

@@ -474,7 +474,7 @@ -(void)testCanUseObjectProxy {
     TransitAbstractWebViewContext *context = [self contextWithEmptyPage];
     [self.class waitForWebViewToBeLoaded:context.webView];
     // hack to add some extra waiting since this test fails sometimes in ci environment
-    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
     TransitProxy* proxy = [context eval:@"window.document"];
     NSString* result = [context eval:@"@.title" val:proxy];
     STAssertEqualObjects(@"Empty Page", result, @"document.title");