Merge branch 'release/1.2.4'

akashivskyy · akashivskyy · commit 887918518cf1 · 2018-04-06T21:34:09.000+02:00
diff --git a/Cartfile.private b/Cartfile.private
@@ -12,4 +12,5 @@ github "netguru/xcconfigs" == 0.3
 # Test dependencies
 
 github "Quick/Quick" ~> 1.2.0
-github "Quick/Nimble" ~> 7.0.2
+github "Quick/Nimble" ~> 7.0.0
+github "AliSoftware/OHHTTPStubs" ~> 6.1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,4 @@
-github "Quick/Nimble" "v7.0.2"
+github "AliSoftware/OHHTTPStubs" "6.1.0"
+github "Quick/Nimble" "v7.0.3"
 github "Quick/Quick" "v1.2.0"
 github "netguru/xcconfigs" "0.3"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4
+Subproject commit 22800b0954c89344bb8c87f8ab93378076716fb7
diff --git a/ResponseDetective.podspec b/ResponseDetective.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
   # Description
 
   spec.name = 'ResponseDetective'
-  spec.version = '1.2.2'
+  spec.version = '1.2.4'
   spec.summary = 'Sherlock Holmes of the networking layer'
   spec.homepage = 'https://github.com/netguru/ResponseDetective'
 
diff --git a/ResponseDetective.xcodeproj/project.pbxproj b/ResponseDetective.xcodeproj/project.pbxproj
@@ -328,26 +328,10 @@
 			isa = PBXGroup;
 			children = (
 				3AF56F0B1E5B4ED800F1CEBC /* TestBodyDeserializer.swift */,
-				3AF56EBC1E5B37B500F1CEBC /* Generators */,
-				3AF56EBD1E5B37B500F1CEBC /* Matchers */,
 			);
 			path = Additions;
 			sourceTree = "<group>";
 		};
-		3AF56EBC1E5B37B500F1CEBC /* Generators */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Generators;
-			sourceTree = "<group>";
-		};
-		3AF56EBD1E5B37B500F1CEBC /* Matchers */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Matchers;
-			sourceTree = "<group>";
-		};
 		3AF56EBF1E5B37B500F1CEBC /* Specs */ = {
 			isa = PBXGroup;
 			children = (
@@ -651,14 +635,16 @@
 				CLASSPREFIX = RDT;
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Netguru Sp. z o.o.";
 				TargetAttributes = {
 					3A2007D71B5501BC00769021 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0930;
 					};
 					3A2007E11B5501BC00769021 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0930;
 					};
 					3AE546291E152DB500E74469 = {
 						CreatedOnToolsVersion = 8.2.1;
@@ -754,6 +740,7 @@
 			inputPaths = (
 				"$(_CARTHAGE_BUILD_PATH)/Quick.framework",
 				"$(_CARTHAGE_BUILD_PATH)/Nimble.framework",
+				"$(_CARTHAGE_BUILD_PATH)/OHHTTPStubs.framework",
 			);
 			name = "Copy Carthage Frameworks";
 			outputPaths = (
@@ -771,6 +758,7 @@
 			inputPaths = (
 				"$(_CARTHAGE_BUILD_PATH)/Nimble.framework",
 				"$(_CARTHAGE_BUILD_PATH)/Quick.framework",
+				"$(_CARTHAGE_BUILD_PATH)/OHHTTPStubs.framework",
 			);
 			name = "Copy Carthage Frameworks";
 			outputPaths = (
@@ -788,6 +776,7 @@
 			inputPaths = (
 				"$(_CARTHAGE_BUILD_PATH)/Quick.framework",
 				"$(_CARTHAGE_BUILD_PATH)/Nimble.framework",
+				"$(_CARTHAGE_BUILD_PATH)/OHHTTPStubs.framework",
 			);
 			name = "Copy Carthage Frameworks";
 			outputPaths = (
diff --git a/ResponseDetective.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ResponseDetective.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-iOS.xcscheme b/ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,9 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -71,7 +70,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-macOS.xcscheme b/ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,9 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -71,7 +70,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-tvOS.xcscheme b/ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,9 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -71,7 +70,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ResponseDetective/Configuration/Common-Base.xcconfig b/ResponseDetective/Configuration/Common-Base.xcconfig
@@ -12,7 +12,7 @@
 
 // MARK: Build
 
-_BUILD_VERSION = 1.2.2
+_BUILD_VERSION = 1.2.4
 
 // MARK: Deployment
 
diff --git a/ResponseDetective/Tests/Specs/ResponseDetectiveSpec.swift b/ResponseDetective/Tests/Specs/ResponseDetectiveSpec.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import Nimble
+import OHHTTPStubs
 import ResponseDetective
 import Quick
 
@@ -15,11 +16,21 @@ internal final class ResponseDetectiveSpec: QuickSpec {
 	override func spec() {
 		
 		describe("ResponseDetective") {
-
+			
+			beforeSuite {
+				stub(condition: isHost("httpbin.org")) { _ in
+					return OHHTTPStubsResponse(data: Data(), statusCode: 200, headers: nil)
+				}
+			}
+			
 			beforeEach {
 				ResponseDetective.reset()
 			}
 			
+			afterSuite {
+				OHHTTPStubs.removeAllStubs()
+			}
+			
 			describe("initial state") {
 
 				it("should use default output facility") {
