From 5ffeee38d43806e20e4053935221eddc930af2f7 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Mon, 12 Mar 2012 20:34:31 -0400 Subject: [PATCH] Ensure serializationMIMEType is configured when initializing object loaders via loaderWithURL: or loaderWithResourcePath: fixes #567 --- Code/ObjectMapping/RKObjectManager.m | 1 + Tests/Logic/ObjectMapping/RKObjectManagerTest.m | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Code/ObjectMapping/RKObjectManager.m b/Code/ObjectMapping/RKObjectManager.m index ec90fdd3..e2b8a164 100644 --- a/Code/ObjectMapping/RKObjectManager.m +++ b/Code/ObjectMapping/RKObjectManager.m @@ -361,6 +361,7 @@ static dispatch_queue_t defaultMappingQueue = nil; } - (void)configureObjectLoader:(RKObjectLoader *)objectLoader { + objectLoader.serializationMIMEType = self.serializationMIMEType; [self configureRequest:objectLoader]; } diff --git a/Tests/Logic/ObjectMapping/RKObjectManagerTest.m b/Tests/Logic/ObjectMapping/RKObjectManagerTest.m index d8fb917f..08becf71 100644 --- a/Tests/Logic/ObjectMapping/RKObjectManagerTest.m +++ b/Tests/Logic/ObjectMapping/RKObjectManagerTest.m @@ -345,4 +345,12 @@ assertThat(objectLoader.params, is(equalTo(myParams))); } +- (void)testInitializationOfObjectLoaderViaManagerConfiguresSerializationMIMEType { + RKObjectManager *objectManager = RKTestNewObjectManager(); + objectManager.serializationMIMEType = RKMIMETypeJSON; + RKObjectLoader *loader = [objectManager loaderWithResourcePath:@"/test"]; + assertThat(loader.serializationMIMEType, isNot(nilValue())); + assertThat(loader.serializationMIMEType, is(equalTo(RKMIMETypeJSON))); +} + @end