Skip to content

Commit b12cf1c

Browse files
patjackson52patjackson52
authored
Merge pull request #23 from patjackson52/feature/lifecycle-fixes
fix tests
2 parents 2282237 + 4e0244d commit b12cf1c

File tree

7 files changed

+124
-10
lines changed

7 files changed

+124
-10
lines changed

‎common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.beyondeye.reduks.Action
44
import com.willowtreeapps.common.repo.ItemsHolder
55
import com.willowtreeapps.common.repo.Profile
66

7-
internal sealed class Actions : Action {
7+
sealed class Actions : Action {
88

99
class FetchingItemsStartedAction
1010
class FetchingItemsSuccessAction(val itemsHolder: ItemsHolder)

‎common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlin.random.Random
99
* Reducers and functions used by reducers are in this file. Functions must be pure functions without
1010
* side effects.
1111
*/
12-
internal fun reducer(state: AppState, action: Any): AppState =
12+
fun reducer(state: AppState, action: Any): AppState =
1313
when (action) {
1414
is FetchingItemsStartedAction -> state.copy(isLoadingItems = true)
1515
is FetchingItemsSuccessAction -> {

‎iOS/NameGame/NameGame.xcodeproj/project.pbxproj‎

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
1EB9EA862238071B008AF004 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1EB9EA852238071B008AF004 /* Assets.xcassets */; };
2727
1EB9EA892238071B008AF004 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1EB9EA872238071B008AF004 /* LaunchScreen.storyboard */; };
2828
1EB9EA942238071B008AF004 /* NameGameTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EB9EA932238071B008AF004 /* NameGameTests.swift */; };
29-
1EB9EA9F2238071C008AF004 /* NameGameUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EB9EA9E2238071C008AF004 /* NameGameUITests.swift */; };
3029
1ED273982264E64C0094EE0D /* BaseNameGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED273972264E64C0094EE0D /* BaseNameGameViewController.swift */; };
30+
1ED2739D22660A560094EE0D /* NameGameUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED2739C22660A560094EE0D /* NameGameUITests.swift */; };
31+
1ED273AD22660CFE0094EE0D /* NameGameTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED273AC22660CFE0094EE0D /* NameGameTests.swift */; };
32+
39C7A84D324862D88D52B08F /* Pods_NameGameTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C435497E57B26B3C5C38A850 /* Pods_NameGameTests.framework */; };
33+
4C99F92CBEFDEFEA34932EBF /* Pods_NameGameUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B000730C94A459D36DD44F4 /* Pods_NameGameUITests.framework */; };
34+
D2DA6197A59BA1C72436D809 /* Pods_NameGame.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDB87376C9BE19ED50D010CE /* Pods_NameGame.framework */; };
3135
/* End PBXBuildFile section */
3236

3337
/* Begin PBXContainerItemProxy section */
@@ -62,6 +66,7 @@
6266
/* End PBXCopyFilesBuildPhase section */
6367

6468
/* Begin PBXFileReference section */
69+
147DDD9FCB23EB6E2457D2ED /* Pods-NameGame.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NameGame.debug.xcconfig"; path = "Target Support Files/Pods-NameGame/Pods-NameGame.debug.xcconfig"; sourceTree = "<group>"; };
6570
1E19EEA5224019610094EA01 /* StartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartViewController.swift; sourceTree = "<group>"; };
6671
1E37F67C225C063C00CC126B /* common.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = common.framework.dSYM; path = "../../common/build/xcode-frameworks/common.framework.dSYM"; sourceTree = "<group>"; };
6772
1E37F683225C21A700CC126B /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
@@ -86,9 +91,19 @@
8691
1EB9EA932238071B008AF004 /* NameGameTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NameGameTests.swift; sourceTree = "<group>"; };
8792
1EB9EA952238071B008AF004 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8893
1EB9EA9A2238071C008AF004 /* NameGameUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NameGameUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
89-
1EB9EA9E2238071C008AF004 /* NameGameUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NameGameUITests.swift; sourceTree = "<group>"; };
9094
1EB9EAA02238071C008AF004 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9195
1ED273972264E64C0094EE0D /* BaseNameGameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNameGameViewController.swift; sourceTree = "<group>"; };
96+
1ED2739B22660A550094EE0D /* NameGameUITests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NameGameUITests-Bridging-Header.h"; sourceTree = "<group>"; };
97+
1ED2739C22660A560094EE0D /* NameGameUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NameGameUITests.swift; sourceTree = "<group>"; };
98+
1ED273AC22660CFE0094EE0D /* NameGameTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NameGameTests.swift; sourceTree = "<group>"; };
99+
2FF125D4FD60A40A0A8AE043 /* Pods-NameGameUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NameGameUITests.release.xcconfig"; path = "Target Support Files/Pods-NameGameUITests/Pods-NameGameUITests.release.xcconfig"; sourceTree = "<group>"; };
100+
788E25026E87CE73E9C34255 /* Pods-NameGameTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NameGameTests.debug.xcconfig"; path = "Target Support Files/Pods-NameGameTests/Pods-NameGameTests.debug.xcconfig"; sourceTree = "<group>"; };
101+
7B000730C94A459D36DD44F4 /* Pods_NameGameUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NameGameUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
102+
A5ED998BA790D768D99AA5B0 /* Pods-NameGameUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NameGameUITests.debug.xcconfig"; path = "Target Support Files/Pods-NameGameUITests/Pods-NameGameUITests.debug.xcconfig"; sourceTree = "<group>"; };
103+
B24159B77BA754BFAD0FE88E /* Pods-NameGameTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NameGameTests.release.xcconfig"; path = "Target Support Files/Pods-NameGameTests/Pods-NameGameTests.release.xcconfig"; sourceTree = "<group>"; };
104+
BDB87376C9BE19ED50D010CE /* Pods_NameGame.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NameGame.framework; sourceTree = BUILT_PRODUCTS_DIR; };
105+
C435497E57B26B3C5C38A850 /* Pods_NameGameTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NameGameTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
106+
D9DC0EFBDBFDFEACFC949EF3 /* Pods-NameGame.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NameGame.release.xcconfig"; path = "Target Support Files/Pods-NameGame/Pods-NameGame.release.xcconfig"; sourceTree = "<group>"; };
92107
/* End PBXFileReference section */
93108

94109
/* Begin PBXFrameworksBuildPhase section */
@@ -97,20 +112,23 @@
97112
buildActionMask = 2147483647;
98113
files = (
99114
1E37F6862260E34900CC126B /* common.framework in Frameworks */,
115+
D2DA6197A59BA1C72436D809 /* Pods_NameGame.framework in Frameworks */,
100116
);
101117
runOnlyForDeploymentPostprocessing = 0;
102118
};
103119
1EB9EA8C2238071B008AF004 /* Frameworks */ = {
104120
isa = PBXFrameworksBuildPhase;
105121
buildActionMask = 2147483647;
106122
files = (
123+
39C7A84D324862D88D52B08F /* Pods_NameGameTests.framework in Frameworks */,
107124
);
108125
runOnlyForDeploymentPostprocessing = 0;
109126
};
110127
1EB9EA972238071C008AF004 /* Frameworks */ = {
111128
isa = PBXFrameworksBuildPhase;
112129
buildActionMask = 2147483647;
113130
files = (
131+
4C99F92CBEFDEFEA34932EBF /* Pods_NameGameUITests.framework in Frameworks */,
114132
);
115133
runOnlyForDeploymentPostprocessing = 0;
116134
};
@@ -126,6 +144,7 @@
126144
1EB9EA9D2238071C008AF004 /* NameGameUITests */,
127145
1EB9EA7C2238071A008AF004 /* Products */,
128146
1EB9EAAC2238250F008AF004 /* Frameworks */,
147+
C1C02D1BBE18C39554DCFAB6 /* Pods */,
129148
);
130149
sourceTree = "<group>";
131150
};
@@ -169,15 +188,17 @@
169188
children = (
170189
1EB9EA932238071B008AF004 /* NameGameTests.swift */,
171190
1EB9EA952238071B008AF004 /* Info.plist */,
191+
1ED273AC22660CFE0094EE0D /* NameGameTests.swift */,
172192
);
173193
path = NameGameTests;
174194
sourceTree = "<group>";
175195
};
176196
1EB9EA9D2238071C008AF004 /* NameGameUITests */ = {
177197
isa = PBXGroup;
178198
children = (
179-
1EB9EA9E2238071C008AF004 /* NameGameUITests.swift */,
180199
1EB9EAA02238071C008AF004 /* Info.plist */,
200+
1ED2739C22660A560094EE0D /* NameGameUITests.swift */,
201+
1ED2739B22660A550094EE0D /* NameGameUITests-Bridging-Header.h */,
181202
);
182203
path = NameGameUITests;
183204
sourceTree = "<group>";
@@ -186,17 +207,34 @@
186207
isa = PBXGroup;
187208
children = (
188209
1E37F67C225C063C00CC126B /* common.framework.dSYM */,
210+
BDB87376C9BE19ED50D010CE /* Pods_NameGame.framework */,
211+
C435497E57B26B3C5C38A850 /* Pods_NameGameTests.framework */,
212+
7B000730C94A459D36DD44F4 /* Pods_NameGameUITests.framework */,
189213
);
190214
name = Frameworks;
191215
sourceTree = "<group>";
192216
};
217+
C1C02D1BBE18C39554DCFAB6 /* Pods */ = {
218+
isa = PBXGroup;
219+
children = (
220+
147DDD9FCB23EB6E2457D2ED /* Pods-NameGame.debug.xcconfig */,
221+
D9DC0EFBDBFDFEACFC949EF3 /* Pods-NameGame.release.xcconfig */,
222+
788E25026E87CE73E9C34255 /* Pods-NameGameTests.debug.xcconfig */,
223+
B24159B77BA754BFAD0FE88E /* Pods-NameGameTests.release.xcconfig */,
224+
A5ED998BA790D768D99AA5B0 /* Pods-NameGameUITests.debug.xcconfig */,
225+
2FF125D4FD60A40A0A8AE043 /* Pods-NameGameUITests.release.xcconfig */,
226+
);
227+
path = Pods;
228+
sourceTree = "<group>";
229+
};
193230
/* End PBXGroup section */
194231

195232
/* Begin PBXNativeTarget section */
196233
1EB9EA7A2238071A008AF004 /* NameGame */ = {
197234
isa = PBXNativeTarget;
198235
buildConfigurationList = 1EB9EAA32238071C008AF004 /* Build configuration list for PBXNativeTarget "NameGame" */;
199236
buildPhases = (
237+
277D0BB52D26BF640FE16445 /* [CP] Check Pods Manifest.lock */,
200238
1EB9EAB62238485B008AF004 /* ShellScript */,
201239
1EB9EA772238071A008AF004 /* Sources */,
202240
1EB9EA782238071A008AF004 /* Frameworks */,
@@ -269,6 +307,7 @@
269307
};
270308
1EB9EA992238071C008AF004 = {
271309
CreatedOnToolsVersion = 10.1;
310+
LastSwiftMigration = 1010;
272311
TestTargetID = 1EB9EA7A2238071A008AF004;
273312
};
274313
};
@@ -343,6 +382,28 @@
343382
shellPath = /bin/sh;
344383
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#move to the xcode-frameworks folder\n#cd \"$SRCROOT/../../common/build/xcode-frameworks\"\ncd \"$SRCROOT/../../\"\n\n#run the gradle task\n./gradlew :common:build -PXCODE_CONFIGURATION=${CONFIGURATION}\n";
345384
};
385+
277D0BB52D26BF640FE16445 /* [CP] Check Pods Manifest.lock */ = {
386+
isa = PBXShellScriptBuildPhase;
387+
buildActionMask = 2147483647;
388+
files = (
389+
);
390+
inputFileListPaths = (
391+
);
392+
inputPaths = (
393+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
394+
"${PODS_ROOT}/Manifest.lock",
395+
);
396+
name = "[CP] Check Pods Manifest.lock";
397+
outputFileListPaths = (
398+
);
399+
outputPaths = (
400+
"$(DERIVED_FILE_DIR)/Pods-NameGame-checkManifestLockResult.txt",
401+
);
402+
runOnlyForDeploymentPostprocessing = 0;
403+
shellPath = /bin/sh;
404+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
405+
showEnvVarsInLog = 0;
406+
};
346407
5103126C9BF956C7ADB08E88 /* [CP] Check Pods Manifest.lock */ = {
347408
isa = PBXShellScriptBuildPhase;
348409
buildActionMask = 2147483647;
@@ -410,6 +471,7 @@
410471
isa = PBXSourcesBuildPhase;
411472
buildActionMask = 2147483647;
412473
files = (
474+
1ED273AD22660CFE0094EE0D /* NameGameTests.swift in Sources */,
413475
1EB9EA942238071B008AF004 /* NameGameTests.swift in Sources */,
414476
);
415477
runOnlyForDeploymentPostprocessing = 0;
@@ -418,7 +480,7 @@
418480
isa = PBXSourcesBuildPhase;
419481
buildActionMask = 2147483647;
420482
files = (
421-
1EB9EA9F2238071C008AF004 /* NameGameUITests.swift in Sources */,
483+
1ED2739D22660A560094EE0D /* NameGameUITests.swift in Sources */,
422484
);
423485
runOnlyForDeploymentPostprocessing = 0;
424486
};
@@ -575,6 +637,7 @@
575637
};
576638
1EB9EAA42238071C008AF004 /* Debug */ = {
577639
isa = XCBuildConfiguration;
640+
baseConfigurationReference = 147DDD9FCB23EB6E2457D2ED /* Pods-NameGame.debug.xcconfig */;
578641
buildSettings = {
579642
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
580643
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -606,6 +669,7 @@
606669
};
607670
1EB9EAA52238071C008AF004 /* Release */ = {
608671
isa = XCBuildConfiguration;
672+
baseConfigurationReference = D9DC0EFBDBFDFEACFC949EF3 /* Pods-NameGame.release.xcconfig */;
609673
buildSettings = {
610674
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
611675
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -631,6 +695,7 @@
631695
};
632696
1EB9EAA72238071C008AF004 /* Debug */ = {
633697
isa = XCBuildConfiguration;
698+
baseConfigurationReference = 788E25026E87CE73E9C34255 /* Pods-NameGameTests.debug.xcconfig */;
634699
buildSettings = {
635700
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
636701
BUNDLE_LOADER = "$(TEST_HOST)";
@@ -651,6 +716,7 @@
651716
};
652717
1EB9EAA82238071C008AF004 /* Release */ = {
653718
isa = XCBuildConfiguration;
719+
baseConfigurationReference = B24159B77BA754BFAD0FE88E /* Pods-NameGameTests.release.xcconfig */;
654720
buildSettings = {
655721
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
656722
BUNDLE_LOADER = "$(TEST_HOST)";
@@ -671,8 +737,10 @@
671737
};
672738
1EB9EAAA2238071C008AF004 /* Debug */ = {
673739
isa = XCBuildConfiguration;
740+
baseConfigurationReference = A5ED998BA790D768D99AA5B0 /* Pods-NameGameUITests.debug.xcconfig */;
674741
buildSettings = {
675742
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
743+
CLANG_ENABLE_MODULES = YES;
676744
CODE_SIGN_STYLE = Automatic;
677745
INFOPLIST_FILE = NameGameUITests/Info.plist;
678746
LD_RUNPATH_SEARCH_PATHS = (
@@ -682,6 +750,8 @@
682750
);
683751
PRODUCT_BUNDLE_IDENTIFIER = willowtree.NameGameUITests;
684752
PRODUCT_NAME = "$(TARGET_NAME)";
753+
SWIFT_OBJC_BRIDGING_HEADER = "NameGameUITests/NameGameUITests-Bridging-Header.h";
754+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
685755
SWIFT_VERSION = 4.2;
686756
TARGETED_DEVICE_FAMILY = "1,2";
687757
TEST_TARGET_NAME = NameGame;
@@ -690,8 +760,10 @@
690760
};
691761
1EB9EAAB2238071C008AF004 /* Release */ = {
692762
isa = XCBuildConfiguration;
763+
baseConfigurationReference = 2FF125D4FD60A40A0A8AE043 /* Pods-NameGameUITests.release.xcconfig */;
693764
buildSettings = {
694765
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
766+
CLANG_ENABLE_MODULES = YES;
695767
CODE_SIGN_STYLE = Automatic;
696768
INFOPLIST_FILE = NameGameUITests/Info.plist;
697769
LD_RUNPATH_SEARCH_PATHS = (
@@ -701,6 +773,7 @@
701773
);
702774
PRODUCT_BUNDLE_IDENTIFIER = willowtree.NameGameUITests;
703775
PRODUCT_NAME = "$(TARGET_NAME)";
776+
SWIFT_OBJC_BRIDGING_HEADER = "NameGameUITests/NameGameUITests-Bridging-Header.h";
704777
SWIFT_VERSION = 4.2;
705778
TARGETED_DEVICE_FAMILY = "1,2";
706779
TEST_TARGET_NAME = NameGame;

‎iOS/NameGame/NameGameTests/NameGameTests.swift‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// NameGameTests.swift
3+
// NameGameTests
4+
//
5+
// Created by Patrick Jackson on 4/16/19.
6+
// Copyright © 2019 Willowtree. All rights reserved.
7+
//
8+
9+
import Foundation
10+
import XCTest
11+
12+
class NameGameTest: XCTestCase {
13+
14+
func exampleUnitTest() {
15+
16+
}
17+
}

‎iOS/NameGame/NameGameUITests/NameGameUITests-Bridging-Header.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+

‎iOS/NameGame/NameGameUITests/NameGameUITests.swift‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//
2+
// NameGameUITests.swift
3+
// NameGameUITests
4+
//
5+
// Created by Patrick Jackson on 4/16/19.
6+
// Copyright © 2019 Willowtree. All rights reserved.
7+
//
8+
9+
import Foundation
10+
import XCTest
11+
12+
class NameGameUITests: XCTestCase {
13+
var app: XCUIApplication!
14+
15+
override func setUp() {
16+
super.setUp()
17+
app = XCUIApplication()
18+
app.launch()
19+
}
20+
21+
func test1() {
22+
app.buttons["Start"].tap()
23+
}
24+
}

‎iOS/NameGame/Podfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ target 'NameGame' do
88

99
# Pods for NameGame
1010

11-
target 'NameGameTests' do
12-
inherit! :search_paths
13-
# Pods for testing
14-
end
1511

1612
target 'NameGameUITests' do
1713
inherit! :search_paths

0 commit comments

Comments
 (0)