Skip to content

Commit 202d5f4

Browse files
committed
Improve attachments naming
1 parent e5ac65b commit 202d5f4

5 files changed

Lines changed: 25 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,23 @@ All notable changes to this project will be documented in this file.
33

44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6-
## [Unreleased](https://github.com/openium/SwiftiumTestingKit/compare/latest...HEAD)
6+
## [Unreleased](https://github.com/openium/SwiftiumTestingKit/compare/v0.6.0...HEAD)
77
### Added
88

99
### Changed
1010

1111
### Removed
1212

13+
## [0.6.0](https://github.com/openium/SwiftiumTestingKit/compare/v0.5.0...v0.4.0)
14+
### Added
15+
Add ability for solo to waitForAnimationsToFinish
16+
17+
### Changed
18+
attachScreenshot now prefixes the attachment name with Locale identifier and device name
19+
20+
### Removed
21+
latest tag "update" and force push making clones not able to fetch smoothly
22+
1323
## [0.5.0](https://github.com/openium/SwiftiumTestingKit/compare/v0.5.0...v0.4.0)
1424
### Added
1525
Add default carrier name

SwiftiumTestingKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
CLANG_ENABLE_MODULES = YES;
543543
CODE_SIGN_IDENTITY = "";
544544
CODE_SIGN_STYLE = Automatic;
545-
CURRENT_PROJECT_VERSION = 5;
545+
CURRENT_PROJECT_VERSION = 6;
546546
DEFINES_MODULE = YES;
547547
DEVELOPMENT_TEAM = QH6KR5PAQ7;
548548
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -560,7 +560,7 @@
560560
"@executable_path/Frameworks",
561561
"@loader_path/Frameworks",
562562
);
563-
MARKETING_VERSION = 0.5.0;
563+
MARKETING_VERSION = 0.6.0;
564564
PRODUCT_BUNDLE_IDENTIFIER = fr.openium.SwiftiumTestingKit;
565565
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
566566
SKIP_INSTALL = YES;
@@ -576,7 +576,7 @@
576576
CLANG_ENABLE_MODULES = YES;
577577
CODE_SIGN_IDENTITY = "";
578578
CODE_SIGN_STYLE = Automatic;
579-
CURRENT_PROJECT_VERSION = 5;
579+
CURRENT_PROJECT_VERSION = 6;
580580
DEFINES_MODULE = YES;
581581
DEVELOPMENT_TEAM = QH6KR5PAQ7;
582582
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -594,7 +594,7 @@
594594
"@executable_path/Frameworks",
595595
"@loader_path/Frameworks",
596596
);
597-
MARKETING_VERSION = 0.5.0;
597+
MARKETING_VERSION = 0.6.0;
598598
PRODUCT_BUNDLE_IDENTIFIER = fr.openium.SwiftiumTestingKit;
599599
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
600600
SKIP_INSTALL = YES;

SwiftiumTestingKit/STKSolo.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,10 @@ public class STKSolo: NSObject {
185185
return textBecameInvalid
186186
}
187187

188+
public func waitForAnimationsToFinish() {
189+
testActor.waitForAnimationsToFinish()
190+
}
191+
188192
public func waitForever() {
189193
testActor.wait(forTimeInterval: internalTimeToWaitForever)
190194
}

SwiftiumTestingKit/XCTestCaseExtension.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,15 @@ extension XCTestCase {
7575
add(attachment)
7676
}
7777

78-
public func attachScreenshot(name: String) {
78+
public func attachScreenshot(name: String, useLangPhonePrefix: Bool = true, separator: String = "_") {
7979
let image = XCUIScreen.main.screenshot().image
8080
let attachment = XCTAttachment(image: image, quality: .medium)
8181
attachment.lifetime = .keepAlways
82-
attachment.name = name
82+
if useLangPhonePrefix {
83+
attachment.name = NSLocale.current.identifier + separator + UIDevice.current.name + separator + name
84+
} else {
85+
attachment.name = name
86+
}
8387
add(attachment)
8488
}
8589
}

tag-release.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ carthage build --no-skip-current && carthage archive SwiftiumTestingKit
1818
echo "Creating tag $TAG and pushing it to github"
1919
git tag $TAG
2020
git push --tags
21-
git tag -f latest
22-
git push --tags -f
2321

2422
echo "You can now upload SwiftiumTestingKit.framework.zip and edit release notes from https://github.com/openium/SwiftiumTestingKit/releases/edit/$TAG"
2523

0 commit comments

Comments
 (0)