Add passing a port from the env vars

Author: sergey-plevako-badoo

DeviceAgent/DeviceAgent-simulator-template.xctestrun

@@ -12,6 +12,8 @@
 		<string>TEST_HOST_PATH</string>
 		<key>TestingEnvironmentVariables</key>
 		<dict>
+			<key>CbxServerPort</key>
+			<string>CBX_SERVER_PORT</string>
 			<key>DYLD_FRAMEWORK_PATH</key>
 			<string></string>
 			<key>DYLD_LIBRARY_PATH</key>
@@ -23,7 +25,7 @@
 		<dict>
 			<key>CbxServerPort</key>
 			<string>CBX_SERVER_PORT</string>
-		</dict>	
+		</dict>
 		<key>UITargetAppPath</key>
 		<string>/path/to/AUT.app</string>
 		<key>UseUITargetAppProvidedByTests</key>

Server/CBXCUITestServer.m

@@ -93,8 +93,7 @@ - (void)start {
     NSError *error;
     BOOL serverStarted = NO;
 
-    NSString *portNumberString = [CBXCUITestServer valueFromArguments: NSProcessInfo.processInfo.arguments
-                                                   forKey: @"--port"];
+    NSString *portNumberString = [NSProcessInfo.processInfo.environment objectForKey: @"CbxServerPort"];
     NSUInteger port = (NSUInteger)[portNumberString integerValue];
 
     if (port == 0) {

cucumber/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "calabash-cucumber"
-gem "run_loop", :github => "calabash/run_loop", :branch => "develop"
+gem "run_loop", :github => "sergey-plevako-badoo/run_loop", :branch => "add_setting_server_port"
 gem "cucumber", "2.99.0"
 gem "json", "1.8.6"
 gem "rspec", "~> 3.0"