consolidated use of localhost

Author: valeriomazzeo

Diff for: Code/Testing/RKTestFactory.m

@@ -74,7 +74,7 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
-        self.baseURL = [NSURL URLWithString:@"http://127.0.0.1:4567"];
+        self.baseURL = [NSURL URLWithString:@"http://localhost:4567"];
         self.factoryBlocks = [NSMutableDictionary new];
         self.sharedObjectsByFactoryName = [NSMutableDictionary new];
         [self defineDefaultFactories];

Diff for: Gemfile

@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gem 'bundler'
 gem 'rakeup', '~> 1.2.0'
-gem 'sinatra', '~> 1.4.0'
-gem 'sinatra-contrib', '~> 1.4.0'
-gem 'thin', '~> 1.5.0'
+gem 'sinatra', '~> 1.4.8'
+gem 'sinatra-contrib', '~> 1.4.7'
+gem 'thin', '~> 1.7.1'
 gem 'cocoapods', '1.2.1'
-gem 'xctasks', '~> 0.5.0'
-gem 'xcpretty', '~> 0.1.6'
+gem 'xctasks', '~> 0.6.0'
+gem 'xcpretty', '~> 0.2.8'

Diff for: Gemfile.lock

@@ -68,6 +68,7 @@ GEM
     rakeup (1.2.0)
       rack (~> 1.5.0)
       rake (~> 10.3.0)
+    rouge (2.0.7)
     ruby-macho (1.1.0)
     sinatra (1.4.8)
       rack (~> 1.5)
@@ -80,10 +81,10 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
+    thin (1.7.1)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     thread_safe (0.3.6)
     tilt (2.0.7)
     tzinfo (1.2.3)
@@ -93,22 +94,24 @@ GEM
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.1.12)
-    xctasks (0.5.0)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
+    xctasks (0.6.0)
       nokogiri (~> 1.6, >= 1.6.3.1)
       rake (~> 10.0, >= 10.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler
   cocoapods (= 1.2.1)
   rakeup (~> 1.2.0)
-  sinatra (~> 1.4.0)
-  sinatra-contrib (~> 1.4.0)
-  thin (~> 1.5.0)
-  xcpretty (~> 0.1.6)
-  xctasks (~> 0.5.0)
+  sinatra (~> 1.4.8)
+  sinatra-contrib (~> 1.4.7)
+  thin (~> 1.7.1)
+  xcpretty (~> 0.2.8)
+  xctasks (~> 0.6.0)
 
 BUNDLED WITH
    1.15.1

Diff for: Tests/Fixtures/JSON/ComplexNestedUser.json

@@ -7,8 +7,8 @@
         "request": {
             "http_host": "api2safer.localhost",
             "http_user_agent": "ST\/2.0 CFNetwork\/485.13.9 Darwin\/10.7.0",
-            "server_addr": "127.0.0.1",
-            "remote_addr": "127.0.0.1",
+            "server_addr": "localhost",
+            "remote_addr": "localhost",
             "server_protocol": "HTTP\/1.1",
             "request_method": "GET",
             "request_uri": "\/users\/login.json",

Diff for: Tests/Logic/Network/RKObjectRequestOperationTest.m

@@ -494,9 +494,9 @@ - (void)testErrorReportingForPathPatternMismatch
     expect([requestOperation isFinished]).will.beTruthy();
     expect(requestOperation.error).notTo.beNil();    
     NSString *failureReason = [[requestOperation.error userInfo] valueForKey:NSLocalizedFailureReasonErrorKey];
-    assertThat(failureReason, containsString(@"A 200 response was loaded from the URL 'http://127.0.0.1:4567/users/empty', which failed to match all (2) response descriptors:"));
-    assertThat(failureReason, containsString(@"failed to match: response URL 'http://127.0.0.1:4567/users/empty' is not relative to the baseURL 'http://restkit.org/api/v1'."));
-    assertThat(failureReason, containsString(@"failed to match: response URL 'http://127.0.0.1:4567/users/empty' is not relative to the baseURL 'http://restkit.org/api/v1'."));
+    assertThat(failureReason, containsString(@"A 200 response was loaded from the URL 'http://localhost:4567/users/empty', which failed to match all (2) response descriptors:"));
+    assertThat(failureReason, containsString(@"failed to match: response URL 'http://localhost:4567/users/empty' is not relative to the baseURL 'http://restkit.org/api/v1'."));
+    assertThat(failureReason, containsString(@"failed to match: response URL 'http://localhost:4567/users/empty' is not relative to the baseURL 'http://restkit.org/api/v1'."));
 }
 
 // Test trailing slash on the baseURL

Diff for: Tests/Logic/ObjectMapping/RKObjectManagerTest.m

@@ -478,7 +478,7 @@ - (void)testThatObjectParametersAreNotSentDuringGetObject
     temporaryHuman.name = @"My Name";
     temporaryHuman.railsID = @204;
     RKManagedObjectRequestOperation *operation = [_objectManager appropriateObjectRequestOperationWithObject:temporaryHuman method:RKRequestMethodGET path:nil parameters:@{@"this": @"that"}];
-    expect([operation.HTTPRequestOperation.request.URL absoluteString]).to.equal(@"http://127.0.0.1:4567/humans/204?this=that");
+    expect([operation.HTTPRequestOperation.request.URL absoluteString]).to.equal(@"http://localhost:4567/humans/204?this=that");
 }
 
 - (void)testThatObjectParametersAreNotSentDuringDeleteObject
@@ -487,14 +487,14 @@ - (void)testThatObjectParametersAreNotSentDuringDeleteObject
     temporaryHuman.name = @"My Name";
     temporaryHuman.railsID = @204;
     RKManagedObjectRequestOperation *operation = [_objectManager appropriateObjectRequestOperationWithObject:temporaryHuman method:RKRequestMethodDELETE path:nil parameters:@{@"this": @"that"}];
-    expect([operation.HTTPRequestOperation.request.URL absoluteString]).to.equal(@"http://127.0.0.1:4567/humans/204?this=that");
+    expect([operation.HTTPRequestOperation.request.URL absoluteString]).to.equal(@"http://localhost:4567/humans/204?this=that");
 }
 
 - (void)testInitializationOfObjectRequestOperationProducesCorrectURLRequest
 {
     RKHuman *temporaryHuman = [RKTestFactory insertManagedObjectForEntityForName:@"Human" inManagedObjectContext:nil withProperties:nil];
     NSURLRequest *request = [_objectManager requestWithObject:temporaryHuman method:RKRequestMethodPATCH path:@"/the/path" parameters:@{@"key": @"value"}];
-    expect([request.URL absoluteString]).to.equal(@"http://127.0.0.1:4567/the/path");
+    expect([request.URL absoluteString]).to.equal(@"http://localhost:4567/the/path");
     expect(request.HTTPMethod).to.equal(@"PATCH");
     expect(request.HTTPBody).notTo.beNil();
     NSString *string = [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding];