Skip to content

[Swift] Add runtime iOS version to user agent #270

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

Draft
kieran-osgood-shopify wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Swift] Add runtime iOS version to user agent #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions platforms/swift/Sources/ShopifyCheckoutKit/UserAgent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public enum UserAgent {
if let swiftVersion = SwiftVersion.current {
parameters.append(" \(swiftVersion)")
}
parameters.append(";iOSVersion/\(UIDevice.current.systemVersion)")

var userAgentString = "\(baseUserAgent) (\(parameters))"

Expand Down
18 changes: 14 additions & 4 deletions platforms/swift/Tests/ShopifyCheckoutKitTests/UserAgentTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
@testable import ShopifyCheckoutKit
import UIKit
import XCTest

class UserAgentTests: XCTestCase {
private var expectedParameters: String {
"iOS;Swift \(SwiftVersion.current!);iOSVersion/\(UIDevice.current.systemVersion)"
}

func test_string_withAcceleratedCheckoutsEntryPoint_shouldReturnCorrectUserAgent() {
let acceleratedCheckoutsUA = UserAgent.string(
entryPoint: .acceleratedCheckouts
)
XCTAssertEqual(
acceleratedCheckoutsUA,
"ShopifyCheckoutKit/4.0.0-alpha.1 (iOS;Swift \(SwiftVersion.current!)) AcceleratedCheckouts"
"ShopifyCheckoutKit/4.0.0-alpha.1 (\(expectedParameters)) AcceleratedCheckouts"
)
}

Expand All @@ -19,7 +24,7 @@ class UserAgentTests: XCTestCase {
)
XCTAssertEqual(
acceleratedCheckoutsUA,
"ShopifyCheckoutKit/4.0.0-alpha.1 (iOS;Swift \(SwiftVersion.current!)) ReactNative AcceleratedCheckouts"
"ShopifyCheckoutKit/4.0.0-alpha.1 (\(expectedParameters)) ReactNative AcceleratedCheckouts"
)
}

Expand All @@ -30,14 +35,19 @@ class UserAgentTests: XCTestCase {
)
XCTAssertEqual(
acceleratedCheckoutsUA,
"ShopifyCheckoutKit/4.0.0-alpha.1 (iOS;Swift \(SwiftVersion.current!)) ReactNative/0.74.5 AcceleratedCheckouts"
"ShopifyCheckoutKit/4.0.0-alpha.1 (\(expectedParameters)) ReactNative/0.74.5 AcceleratedCheckouts"
)
}

func test_string_withoutEntryPoint_shouldReturnBasicUserAgent() {
let checkoutKitUA = UserAgent.string()
XCTAssertEqual(
checkoutKitUA, "ShopifyCheckoutKit/4.0.0-alpha.1 (iOS;Swift \(SwiftVersion.current!))"
checkoutKitUA, "ShopifyCheckoutKit/4.0.0-alpha.1 (\(expectedParameters))"
)
}

func test_string_shouldIncludeRuntimeIOSVersion() {
let checkoutKitUA = UserAgent.string()
XCTAssertTrue(checkoutKitUA.contains("iOSVersion/\(UIDevice.current.systemVersion)"))
}
}
Loading