Skip to content

Fixed FBSnapshotTestCaseDefaultSuffixes to return the correct suffixes based on the architecture. #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reidmain merged 2 commits into from
Jun 21, 2019
Merged

Fixed FBSnapshotTestCaseDefaultSuffixes to return the correct suffixes based on the architecture. #87

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f65caa
Fixed FBSnapshotTestCaseDefaultSuffixes to return the correct suffixe…
Jun 20, 2019
69f2932
Removed iPhone from build script
Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions FBSnapshotTestCase/FBSnapshotTestCasePlatform.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ BOOL FBSnapshotTestCaseIs64Bit(void)

NSOrderedSet *FBSnapshotTestCaseDefaultSuffixes(void)
{
NSMutableOrderedSet *suffixesSet = [[NSMutableOrderedSet alloc] init];
[suffixesSet addObject:@"_32"];
[suffixesSet addObject:@"_64"];
if (FBSnapshotTestCaseIs64Bit()) {
return [suffixesSet reversedOrderedSet];
return [NSOrderedSet orderedSetWithObject:@"_64"];
} else {
return [NSOrderedSet orderedSetWithObject:@"_32"];
}
return [suffixesSet copy];
}

NSString *FBFileNameIncludeNormalizedFileNameFromOption(NSString *fileName, FBSnapshotTestCaseFileNameIncludeOption option)
Expand All @@ -54,7 +52,7 @@ BOOL FBSnapshotTestCaseIs64Bit(void)
[invalidCharacters formUnionWithCharacterSet:[NSCharacterSet punctuationCharacterSet]];
NSArray *validComponents = [fileName componentsSeparatedByCharactersInSet:invalidCharacters];
fileName = [validComponents componentsJoinedByString:@"_"];

if ((option & FBSnapshotTestCaseFileNameIncludeOptionScreenScale) == FBSnapshotTestCaseFileNameIncludeOptionScreenScale) {
CGFloat screenScale = [[UIScreen mainScreen] scale];
fileName = [fileName stringByAppendingFormat:@"@%.fx", screenScale];
Expand Down
7 changes: 0 additions & 7 deletions FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemoTests/FBSnapshotTestCaseDemoTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,4 @@ - (void)testViewSnapshotWithDifferentBackgroundColorPerArchitecture
FBSnapshotVerifyView(view, nil);
}

- (void)testViewSnapshotRecordedOnlyFor64BitArchitecture
{
UIView *greenView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
greenView.backgroundColor = [UIColor greenColor];
FBSnapshotVerifyView(greenView, nil);
}

@end
Binary file removed ...apshotTestCaseDemoTests/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed ...apshotTestCaseDemoTests/[email protected]
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ function ci_carthage_demo() {
popd
}

ci_lib "iPhone 5" && ci_demo "iPhone 5"
ci_lib "iPhone 7" && ci_demo "iPhone 7"
ci_lib "iPhone X" && ci_demo "iPhone X"
ci_lib "iPhone 5" && ci_carthage_demo "iPhone 5"
ci_lib "iPhone 7" && ci_carthage_demo "iPhone 7"
ci_lib "iPhone X" && ci_carthage_demo "iPhone X"