Skip to content

Commit b295a15

Browse files
lauramarsonlauramarson
committed
Merge branch 'develop' into unitTest
2 parents 31db43c + b6de842 commit b295a15

206 files changed

Lines changed: 18092 additions & 1026 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AnimalsApp/AnimalsApp.xcodeproj/project.pbxproj‎

Lines changed: 66 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@
1111
56CADB59A535B3ED60380013 /* Pods_AnimalsApp_AnimalsAppUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1E75A013A1B19FF9D2B114B /* Pods_AnimalsApp_AnimalsAppUITests.framework */; };
1212
5CA996F8285A98FB00FF5D79 /* RegisterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CA996F7285A98FB00FF5D79 /* RegisterViewModel.swift */; };
1313
A2A6AE83CC0E1DAC784999B1 /* Pods_AnimalsAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 290D574622CE042567539136 /* Pods_AnimalsAppTests.framework */; };
14+
A458A086285E58CC0057BC34 /* FavoritesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A458A085285E58CC0057BC34 /* FavoritesViewModel.swift */; };
15+
A458A08C2860BD2D0057BC34 /* Alert+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A458A08B2860BD2D0057BC34 /* Alert+UIViewController.swift */; };
16+
A458A0922860F7C40057BC34 /* success.json in Resources */ = {isa = PBXBuildFile; fileRef = A458A0912860F7C40057BC34 /* success.json */; };
17+
A458A094286128FF0057BC34 /* empty.json in Resources */ = {isa = PBXBuildFile; fileRef = A458A093286128FF0057BC34 /* empty.json */; };
18+
A458A09628621A570057BC34 /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A458A09528621A570057BC34 /* StringExtensions.swift */; };
19+
A458A09828622EA90057BC34 /* CoreDataMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A458A09728622EA90057BC34 /* CoreDataMock.swift */; };
20+
A458A09B28623DE80057BC34 /* CoreDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A458A09A28623DE80057BC34 /* CoreDataTests.swift */; };
1421
A463D0172858EBBB00929A3C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D0162858EBBB00929A3C /* AppDelegate.swift */; };
1522
A463D0212858EBBB00929A3C /* AnimalsApp.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = A463D01F2858EBBB00929A3C /* AnimalsApp.xcdatamodeld */; };
1623
A463D0232858EBBD00929A3C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A463D0222858EBBD00929A3C /* Assets.xcassets */; };
@@ -35,7 +42,7 @@
3542
A463D074285A398900929A3C /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D073285A398900929A3C /* HomeViewModel.swift */; };
3643
A463D078285A5A8000929A3C /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A463D077285A5A8000929A3C /* OpenSans-Regular.ttf */; };
3744
A463D07A285B8D8E00929A3C /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D079285B8D8D00929A3C /* Colors.swift */; };
38-
A463D07E285CF28200929A3C /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D07D285CF28200929A3C /* StringExtensions.swift */; };
45+
A463D07C285B9B6300929A3C /* CoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D07B285B9B6300929A3C /* CoreData.swift */; };
3946
A463D081285D1B4800929A3C /* SuccessWebService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D080285D1B4700929A3C /* SuccessWebService.swift */; };
4047
A463D083285D1D4500929A3C /* HomeViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D082285D1D4500929A3C /* HomeViewModelTests.swift */; };
4148
A463D085285D1F8800929A3C /* RegisterViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D084285D1F8800929A3C /* RegisterViewModelTests.swift */; };
@@ -70,6 +77,13 @@
7077
81C9DABDE310C2E15910D06C /* Pods-AnimalsAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AnimalsAppTests.debug.xcconfig"; path = "Target Support Files/Pods-AnimalsAppTests/Pods-AnimalsAppTests.debug.xcconfig"; sourceTree = "<group>"; };
7178
9D1DC7AE05F709A3F0E450DA /* Pods_AnimalsApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AnimalsApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7279
A1E75A013A1B19FF9D2B114B /* Pods_AnimalsApp_AnimalsAppUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AnimalsApp_AnimalsAppUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
80+
A458A085285E58CC0057BC34 /* FavoritesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoritesViewModel.swift; sourceTree = "<group>"; };
81+
A458A08B2860BD2D0057BC34 /* Alert+UIViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Alert+UIViewController.swift"; sourceTree = "<group>"; };
82+
A458A0912860F7C40057BC34 /* success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = success.json; sourceTree = "<group>"; };
83+
A458A093286128FF0057BC34 /* empty.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = empty.json; sourceTree = "<group>"; };
84+
A458A09528621A570057BC34 /* StringExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = "<group>"; };
85+
A458A09728622EA90057BC34 /* CoreDataMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataMock.swift; sourceTree = "<group>"; };
86+
A458A09A28623DE80057BC34 /* CoreDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataTests.swift; sourceTree = "<group>"; };
7387
A463D0132858EBBB00929A3C /* AnimalsApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AnimalsApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
7488
A463D0162858EBBB00929A3C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7589
A463D0202858EBBB00929A3C /* AnimalsApp.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = AnimalsApp.xcdatamodel; sourceTree = "<group>"; };
@@ -98,7 +112,7 @@
98112
A463D073285A398900929A3C /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
99113
A463D077285A5A8000929A3C /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = "<group>"; };
100114
A463D079285B8D8D00929A3C /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
101-
A463D07D285CF28200929A3C /* StringExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = "<group>"; };
115+
A463D07B285B9B6300929A3C /* CoreData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreData.swift; sourceTree = "<group>"; };
102116
A463D080285D1B4700929A3C /* SuccessWebService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuccessWebService.swift; sourceTree = "<group>"; };
103117
A463D082285D1D4500929A3C /* HomeViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModelTests.swift; sourceTree = "<group>"; };
104118
A463D084285D1F8800929A3C /* RegisterViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterViewModelTests.swift; sourceTree = "<group>"; };
@@ -146,6 +160,40 @@
146160
path = Pods;
147161
sourceTree = "<group>";
148162
};
163+
A458A08A2860BD1A0057BC34 /* Extensions */ = {
164+
isa = PBXGroup;
165+
children = (
166+
A458A08B2860BD2D0057BC34 /* Alert+UIViewController.swift */,
167+
A458A09528621A570057BC34 /* StringExtensions.swift */,
168+
);
169+
path = Extensions;
170+
sourceTree = "<group>";
171+
};
172+
A458A08D2860F47E0057BC34 /* Fonts */ = {
173+
isa = PBXGroup;
174+
children = (
175+
A463D077285A5A8000929A3C /* OpenSans-Regular.ttf */,
176+
);
177+
path = Fonts;
178+
sourceTree = "<group>";
179+
};
180+
A458A08E2860F4860057BC34 /* Animations */ = {
181+
isa = PBXGroup;
182+
children = (
183+
A458A0912860F7C40057BC34 /* success.json */,
184+
A458A093286128FF0057BC34 /* empty.json */,
185+
);
186+
path = Animations;
187+
sourceTree = "<group>";
188+
};
189+
A458A09928623DCA0057BC34 /* CoreDataTests */ = {
190+
isa = PBXGroup;
191+
children = (
192+
A458A09A28623DE80057BC34 /* CoreDataTests.swift */,
193+
);
194+
path = CoreDataTests;
195+
sourceTree = "<group>";
196+
};
149197
A463D00A2858EBBA00929A3C = {
150198
isa = PBXGroup;
151199
children = (
@@ -171,7 +219,7 @@
171219
A463D0152858EBBB00929A3C /* AnimalsApp */ = {
172220
isa = PBXGroup;
173221
children = (
174-
A463D086285D263000929A3C /* Extensions */,
222+
A458A08A2860BD1A0057BC34 /* Extensions */,
175223
A463D076285A59B500929A3C /* Resources */,
176224
A463D067285A1A4300929A3C /* Services */,
177225
A463D06028590CB700929A3C /* DesignSystem */,
@@ -182,14 +230,14 @@
182230
A463D0222858EBBD00929A3C /* Assets.xcassets */,
183231
A463D0242858EBBD00929A3C /* LaunchScreen.storyboard */,
184232
A463D0272858EBBD00929A3C /* Info.plist */,
185-
A463D01F2858EBBB00929A3C /* AnimalsApp.xcdatamodeld */,
186233
);
187234
path = AnimalsApp;
188235
sourceTree = "<group>";
189236
};
190237
A463D02F2858EBBD00929A3C /* AnimalsAppTests */ = {
191238
isa = PBXGroup;
192239
children = (
240+
A458A09928623DCA0057BC34 /* CoreDataTests */,
193241
A463D088285D270C00929A3C /* ExtensionsTests */,
194242
A463D087285D26F200929A3C /* ViewModelsTests */,
195243
A463D07F285D1B0B00929A3C /* Mocks */,
@@ -268,6 +316,7 @@
268316
isa = PBXGroup;
269317
children = (
270318
A463D068285A1A5A00929A3C /* WebServices.swift */,
319+
A463D07B285B9B6300929A3C /* CoreData.swift */,
271320
);
272321
path = Services;
273322
sourceTree = "<group>";
@@ -284,6 +333,7 @@
284333
A463D06F285A371F00929A3C /* Models */ = {
285334
isa = PBXGroup;
286335
children = (
336+
A463D01F2858EBBB00929A3C /* AnimalsApp.xcdatamodeld */,
287337
A463D070285A373700929A3C /* Animals.swift */,
288338
);
289339
path = Models;
@@ -294,6 +344,7 @@
294344
children = (
295345
A463D073285A398900929A3C /* HomeViewModel.swift */,
296346
5CA996F7285A98FB00FF5D79 /* RegisterViewModel.swift */,
347+
A458A085285E58CC0057BC34 /* FavoritesViewModel.swift */,
297348
);
298349
path = "View Models";
299350
sourceTree = "<group>";
@@ -310,7 +361,8 @@
310361
A463D076285A59B500929A3C /* Resources */ = {
311362
isa = PBXGroup;
312363
children = (
313-
A463D077285A5A8000929A3C /* OpenSans-Regular.ttf */,
364+
A458A08E2860F4860057BC34 /* Animations */,
365+
A458A08D2860F47E0057BC34 /* Fonts */,
314366
);
315367
path = Resources;
316368
sourceTree = "<group>";
@@ -319,18 +371,11 @@
319371
isa = PBXGroup;
320372
children = (
321373
A463D080285D1B4700929A3C /* SuccessWebService.swift */,
374+
A458A09728622EA90057BC34 /* CoreDataMock.swift */,
322375
);
323376
path = Mocks;
324377
sourceTree = "<group>";
325378
};
326-
A463D086285D263000929A3C /* Extensions */ = {
327-
isa = PBXGroup;
328-
children = (
329-
A463D07D285CF28200929A3C /* StringExtensions.swift */,
330-
);
331-
path = Extensions;
332-
sourceTree = "<group>";
333-
};
334379
A463D087285D26F200929A3C /* ViewModelsTests */ = {
335380
isa = PBXGroup;
336381
children = (
@@ -469,9 +514,11 @@
469514
files = (
470515
A463D04C2858F39000929A3C /* MainTabBarController.xib in Resources */,
471516
A463D0582858F62600929A3C /* RegisterViewController.xib in Resources */,
517+
A458A094286128FF0057BC34 /* empty.json in Resources */,
472518
A463D066285953F900929A3C /* AnimalTableViewCell.xib in Resources */,
473519
A463D06E285A22D300929A3C /* DetailViewController.xib in Resources */,
474520
A463D0262858EBBD00929A3C /* LaunchScreen.storyboard in Resources */,
521+
A458A0922860F7C40057BC34 /* success.json in Resources */,
475522
A463D0232858EBBD00929A3C /* Assets.xcassets in Resources */,
476523
A463D05E2858F64B00929A3C /* FavoritesViewController.xib in Resources */,
477524
A463D078285A5A8000929A3C /* OpenSans-Regular.ttf in Resources */,
@@ -604,18 +651,21 @@
604651
buildActionMask = 2147483647;
605652
files = (
606653
A463D06228590D0300929A3C /* Images.swift in Sources */,
654+
A458A08C2860BD2D0057BC34 /* Alert+UIViewController.swift in Sources */,
655+
A463D07C285B9B6300929A3C /* CoreData.swift in Sources */,
607656
A463D065285953F900929A3C /* AnimalTableViewCell.swift in Sources */,
608657
A463D0212858EBBB00929A3C /* AnimalsApp.xcdatamodeld in Sources */,
609658
A463D0572858F62600929A3C /* RegisterViewController.swift in Sources */,
610659
A463D0172858EBBB00929A3C /* AppDelegate.swift in Sources */,
611660
A463D071285A373800929A3C /* Animals.swift in Sources */,
661+
A458A086285E58CC0057BC34 /* FavoritesViewModel.swift in Sources */,
612662
A463D04B2858F39000929A3C /* MainTabBarController.swift in Sources */,
613663
A463D074285A398900929A3C /* HomeViewModel.swift in Sources */,
614664
A463D07A285B8D8E00929A3C /* Colors.swift in Sources */,
665+
A458A09628621A570057BC34 /* StringExtensions.swift in Sources */,
615666
5CA996F8285A98FB00FF5D79 /* RegisterViewModel.swift in Sources */,
616667
A463D05D2858F64B00929A3C /* FavoritesViewController.swift in Sources */,
617668
A463D06D285A22D200929A3C /* DetailViewController.swift in Sources */,
618-
A463D07E285CF28200929A3C /* StringExtensions.swift in Sources */,
619669
A463D069285A1A5A00929A3C /* WebServices.swift in Sources */,
620670
A463D0532858F60C00929A3C /* HomeViewController.swift in Sources */,
621671
);
@@ -626,6 +676,8 @@
626676
buildActionMask = 2147483647;
627677
files = (
628678
A463D08A285D273400929A3C /* StringExtensionTests.swift in Sources */,
679+
A458A09828622EA90057BC34 /* CoreDataMock.swift in Sources */,
680+
A458A09B28623DE80057BC34 /* CoreDataTests.swift in Sources */,
629681
A463D085285D1F8800929A3C /* RegisterViewModelTests.swift in Sources */,
630682
A463D081285D1B4800929A3C /* SuccessWebService.swift in Sources */,
631683
A463D083285D1D4500929A3C /* HomeViewModelTests.swift in Sources */,

0 commit comments

Comments
 (0)