Release/0.16.2

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.16.2
+
+* Detect and identify Xcode 7 simulators #242
+
 ### 0.16.0 and 0.16.1
 
 These releases contains no code-level changes.  They have been

LPTestTarget/CocoaHTTPServer/Mime/MultipartFormDataParser.m

@@ -261,7 +261,7 @@ - (BOOL) appendData:(NSData *)data {
 			NSData* decodedData = [MultipartFormDataParser decodedDataFromData:[NSData dataWithBytesNoCopy:(char*)workingData.bytes + offset length:workingData.length - offset - sizeToLeavePending freeWhenDone:NO] encoding:currentEncoding];
 
 			if( [delegate respondsToSelector:@selector(processContent:WithHeader:)] ) {
-				HTTPLogVerbose(@"MultipartFormDataParser: Processed %"FMTNSINT" bytes of body",sizeToPass);
+				HTTPLogVerbose(@"MultipartFormDataParser: Processed %@ bytes of body", @(sizeToPass));
 
 				[delegate processContent: decodedData WithHeader:currentHeader];
 			}

LPTestTarget/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,63 +1,117 @@
 {
   "images" : [
     {
+      "size" : "29x29",
       "idiom" : "iphone",
+      "filename" : "Icon-Small.png",
+      "scale" : "1x"
+    },
+    {
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small-40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small-40@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Icon.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "60x60",
       "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small-1.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small@2x-1.png",
       "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "ipad",
+      "filename" : "Icon-Small-40.png",
+      "scale" : "1x"
+    },
+    {
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small-40@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small-50.png",
       "scale" : "1x"
     },
     {
+      "size" : "50x50",
       "idiom" : "ipad",
-      "size" : "40x40",
+      "filename" : "Icon-Small-50@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "72x72",
       "idiom" : "ipad",
-      "size" : "76x76",
+      "filename" : "Icon-72.png",
       "scale" : "1x"
     },
     {
+      "size" : "72x72",
       "idiom" : "ipad",
+      "filename" : "Icon-72@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76@2x.png",
       "scale" : "2x"
     }
   ],

LPTestTarget/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

LPTestTarget/Info.plist

@@ -22,6 +22,8 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>Main</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>

Makefile

@@ -32,6 +32,7 @@ dylibs:
 	scripts/make-calabash-dylib.rb device
 	CERT_CHECKSUM=337976ad9ace375ac06cd8fea2edb0c7276dec2a72d005ca5559a8bbf09c8841 \
 								scripts/make-libraries.rb verify-dylibs
+	xcrun codesign --display --verbose=4 calabash-dylibs/libCalabashDyn.dylib
 
 dylib_sim:
 	rm -rf build

XCTest/Tests/Invoker/LPInvokerThreadingTest.m

@@ -179,7 +179,7 @@ - (void) testPointerArgWithAllVariablesCreatedOffMainThread {
     [expectation fulfill];
   });
 
-  [self waitForExpectationsWithTimeout:0.1 handler:^(NSError *error) {
+  [self waitForExpectationsWithTimeout:0.5 handler:^(NSError *error) {
     if (error) { XCTFail(@"Expectation Failed with error: %@", error); }
   }];
 

XCTest/Tests/Operations/LPProcessInfoRouteTest.m

@@ -0,0 +1,33 @@
+#if ! __has_feature(objc_arc)
+#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
+#endif
+
+#import <XCTest/XCTest.h>
+#import "LPProcessInfoRoute.h"
+
+@interface LPProcessInfoRouteTest : XCTestCase
+
+@property(nonatomic, strong) LPProcessInfoRoute *route;
+@end
+
+@implementation LPProcessInfoRouteTest
+
+- (void) setUp {
+  [super setUp];
+  self.route = [LPProcessInfoRoute new];
+}
+
+- (void) tearDown {
+  [super tearDown];
+  self.route = nil;
+}
+
+- (void) testSupportsMethodGET {
+  expect([self.route supportsMethod:@"GET" atPath:nil]).to.equal(YES);
+}
+
+- (void) testSupportsMethodAnythingButGET {
+  expect([self.route supportsMethod:@"POST" atPath:nil]).to.equal(NO);
+}
+
+@end