[master] - Update to use the included XCTest subspec in tests so it d…

…oesn't break in the future - TT
wwt · May 11, 2020 · 9050c9a · 9050c9a
1 parent dd4f653
commit 9050c9a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 94 deletions.
diff --git a/Podfile b/Podfile
@@ -35,6 +35,7 @@ target 'WorkflowExample' do
 
   target 'WorkflowExampleTests' do
     pod 'DynamicWorkflow', :path => '.'
+    pod 'DynamicWorkflow/XCTest', :path => '.'
     pod 'UIUTest'
   end
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -2,10 +2,12 @@ PODS:
   - CwlCatchException (1.0.2)
   - CwlPreconditionTesting (1.1.1):
     - CwlCatchException
-  - DynamicWorkflow (1.0.1):
-    - DynamicWorkflow/Swinject (= 1.0.1)
-  - DynamicWorkflow/Swinject (1.0.1):
+  - DynamicWorkflow (1.0.2):
+    - DynamicWorkflow/Swinject (= 1.0.2)
+    - DynamicWorkflow/XCTest (= 1.0.2)
+  - DynamicWorkflow/Swinject (1.0.2):
     - Swinject
+  - DynamicWorkflow/XCTest (1.0.2)
   - Swinject (2.7.1)
   - UIUTest (1.6.0)
 
@@ -14,6 +16,7 @@ DEPENDENCIES:
   - CwlPreconditionTesting (from `https://github.com/mattgallagher/CwlPreconditionTesting.git`, tag `1.2.0`)
   - DynamicWorkflow (from `.`)
   - DynamicWorkflow/Swinject (from `.`)
+  - DynamicWorkflow/XCTest (from `.`)
   - Swinject
   - UIUTest
 
@@ -43,10 +46,10 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   CwlCatchException: 70a52ae44ea5d46db7bd385f801a94942420cd8c
   CwlPreconditionTesting: d33a4e4f285c0b885fddcae5dfedfbb34d4f3961
-  DynamicWorkflow: 154e45e7477f601d3ed33568cfeced0b4c6353bf
+  DynamicWorkflow: 078a684071835215ad3ea891924877421749e640
   Swinject: ddf78b8486dd9b71a667b852cad919ab4484478e
   UIUTest: 842c642e5bec098b1e2c890cbe25aacab80f2481
 
-PODFILE CHECKSUM: 9446e19cd304190fb0bff5ec8aefc4f0e183127b
+PODFILE CHECKSUM: 1cdd0a570329e1cf8b977ac9c040a799d4a2846a
 
 COCOAPODS: 1.9.1
diff --git a/Workflow.xcodeproj/project.pbxproj b/Workflow.xcodeproj/project.pbxproj
@@ -35,8 +35,6 @@
 		AD79EC4B23492B6F00F86101 /* ReviewOrderViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD79EC4A23492B6F00F86101 /* ReviewOrderViewControllerTests.swift */; };
 		AD79EC4D23492EDD00F86101 /* EnterAddressViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD79EC4C23492EDD00F86101 /* EnterAddressViewControllerTests.swift */; };
 		AD79EC4F2349306100F86101 /* SetupViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD79EC4E2349306100F86101 /* SetupViewControllerTests.swift */; };
-		AD79EC522349319300F86101 /* MockPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD79EC512349319300F86101 /* MockPresenter.swift */; };
-		AD79EC54234931A400F86101 /* WorkflowListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD79EC53234931A400F86101 /* WorkflowListener.swift */; };
 		AD8B6C772319E8B200781B01 /* Screen.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B6C762319E8B200781B01 /* Screen.swift */; };
 		AD8BEBE42318303A0071A83D /* AnyPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8BEBE32318303A0071A83D /* AnyPresenter.swift */; };
 		AD8BEBE6231830860071A83D /* BasePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8BEBE5231830860071A83D /* BasePresenter.swift */; };
@@ -147,8 +145,6 @@
 		AD79EC4A23492B6F00F86101 /* ReviewOrderViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewOrderViewControllerTests.swift; sourceTree = "<group>"; };
 		AD79EC4C23492EDD00F86101 /* EnterAddressViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterAddressViewControllerTests.swift; sourceTree = "<group>"; };
 		AD79EC4E2349306100F86101 /* SetupViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetupViewControllerTests.swift; sourceTree = "<group>"; };
-		AD79EC512349319300F86101 /* MockPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPresenter.swift; sourceTree = "<group>"; };
-		AD79EC53234931A400F86101 /* WorkflowListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkflowListener.swift; sourceTree = "<group>"; };
 		AD8B6C762319E8B200781B01 /* Screen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Screen.swift; sourceTree = "<group>"; };
 		AD8BEBE32318303A0071A83D /* AnyPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyPresenter.swift; sourceTree = "<group>"; };
 		AD8BEBE5231830860071A83D /* BasePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasePresenter.swift; sourceTree = "<group>"; };
@@ -330,15 +326,6 @@
 			path = WorkflowExample;
 			sourceTree = "<group>";
 		};
-		AD79EC502349317C00F86101 /* Mocks */ = {
-			isa = PBXGroup;
-			children = (
-				AD79EC512349319300F86101 /* MockPresenter.swift */,
-				AD79EC53234931A400F86101 /* WorkflowListener.swift */,
-			);
-			path = Mocks;
-			sourceTree = "<group>";
-		};
 		AD8BEBE72318308C0071A83D /* Models */ = {
 			isa = PBXGroup;
 			children = (
@@ -466,7 +453,6 @@
 		ADEE7750233BAA6C007E9FD2 /* WorkflowExampleTests */ = {
 			isa = PBXGroup;
 			children = (
-				AD79EC502349317C00F86101 /* Mocks */,
 				ADEE7753233BAA6C007E9FD2 /* Info.plist */,
 				ADEE7759233BAB27007E9FD2 /* LocationsViewControllerTests.swift */,
 				ADEE775B233BC7F0007E9FD2 /* ViewControllerTest.swift */,
@@ -980,10 +966,8 @@
 				AD79EC4D23492EDD00F86101 /* EnterAddressViewControllerTests.swift in Sources */,
 				AD79EC4F2349306100F86101 /* SetupViewControllerTests.swift in Sources */,
 				AD79EC472349210000F86101 /* MenuSelectionViewControllerTests.swift in Sources */,
-				AD79EC54234931A400F86101 /* WorkflowListener.swift in Sources */,
 				ADEE7760233BC960007E9FD2 /* Convenience.swift in Sources */,
 				ADEE775C233BC7F0007E9FD2 /* ViewControllerTest.swift in Sources */,
-				AD79EC522349319300F86101 /* MockPresenter.swift in Sources */,
 				ADEE775E233BC901007E9FD2 /* PickupOrDeliveryViewControllerTests.swift in Sources */,
 				AD79EC4B23492B6F00F86101 /* ReviewOrderViewControllerTests.swift in Sources */,
 			);

diff --git a/WorkflowExampleTests/Mocks/MockPresenter.swift b/WorkflowExampleTests/Mocks/MockPresenter.swift
diff --git a/WorkflowExampleTests/Mocks/WorkflowListener.swift b/WorkflowExampleTests/Mocks/WorkflowListener.swift
diff --git a/WorkflowExampleTests/SetupViewControllerTests.swift b/WorkflowExampleTests/SetupViewControllerTests.swift
@@ -10,6 +10,7 @@ import Foundation
 import XCTest
 
 @testable import WorkflowExample
+import DynamicWorkflow
 
 class SetupViewControllerTests: ViewControllerTest<SetupViewController> {
     func testLaunchingMultiLocationWorkflow() {