Skip to content

Commit 5dfba75

Browse files
itsmeichigoitsmeichigo
authored
Merge branch 'trunk' into WOOMOB-638-prefill-item-customs-details
2 parents ef48a77 + 13ec174 commit 5dfba75

File tree

1,014 files changed

+3314
-4513
lines changed

Some content is hidden

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

1,014 files changed

+3314
-4513
lines changed

‎Networking/Networking.xcodeproj/xcshareddata/xcschemes/NetworkingTests.xcscheme‎ renamed to ‎Modules/.swiftpm/xcode/xcshareddata/xcschemes/Networking.xcscheme‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES"
88
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "Networking"
19+
BuildableName = "Networking"
20+
BlueprintName = "Networking"
21+
ReferencedContainer = "container:">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
925
</BuildAction>
1026
<TestAction
1127
buildConfiguration = "Debug"
@@ -14,22 +30,10 @@
1430
shouldUseLaunchSchemeArgsEnv = "YES">
1531
<TestPlans>
1632
<TestPlanReference
17-
reference = "container:NetworkingTests/NetworkingTests.xctestplan"
33+
reference = "container:Tests/NetworkingTests/NetworkingTests.xctestplan"
1834
default = "YES">
1935
</TestPlanReference>
2036
</TestPlans>
21-
<Testables>
22-
<TestableReference
23-
skipped = "NO">
24-
<BuildableReference
25-
BuildableIdentifier = "primary"
26-
BlueprintIdentifier = "B557D9EB209753AA005962F4"
27-
BuildableName = "NetworkingTests.xctest"
28-
BlueprintName = "NetworkingTests"
29-
ReferencedContainer = "container:Networking.xcodeproj">
30-
</BuildableReference>
31-
</TestableReference>
32-
</Testables>
3337
</TestAction>
3438
<LaunchAction
3539
buildConfiguration = "Debug"
@@ -48,6 +52,15 @@
4852
savedToolIdentifier = ""
4953
useCustomWorkingDirectory = "NO"
5054
debugDocumentVersioning = "YES">
55+
<MacroExpansion>
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "Networking"
59+
BuildableName = "Networking"
60+
BlueprintName = "Networking"
61+
ReferencedContainer = "container:">
62+
</BuildableReference>
63+
</MacroExpansion>
5164
</ProfileAction>
5265
<AnalyzeAction
5366
buildConfiguration = "Debug">

‎Modules/.swiftpm/xcode/xcshareddata/xcschemes/Yosemite.xcscheme‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@
2727
buildConfiguration = "Debug"
2828
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2929
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
shouldAutocreateTestPlan = "YES">
30+
shouldUseLaunchSchemeArgsEnv = "YES">
31+
<TestPlans>
32+
<TestPlanReference
33+
reference = "container:Tests/YosemiteTests/YosemiteTests.xctestplan"
34+
default = "YES">
35+
</TestPlanReference>
36+
</TestPlans>
3237
</TestAction>
3338
<LaunchAction
3439
buildConfiguration = "Debug"

‎Modules/Package.resolved‎

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/Package.swift‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ let package = Package(
8989
.package(url: "https://github.com/markiv/SwiftUI-Shimmer", from: "1.0.0"),
9090
.package(url: "https://github.com/nalexn/ViewInspector", from: "0.10.0"),
9191
.package(url: "https://github.com/onevcat/Kingfisher", from: "7.6.2"),
92+
.package(url: "https://github.com/pmusolino/Wormholy", from: "2.0.0"),
9293
.package(url: "https://github.com/pavolkmet/ScrollViewSectionKit", from: "1.2.0"),
9394
.package(url: "https://github.com/Quick/Nimble.git", from: "13.0.0"),
9495
.package(url: "https://github.com/simibac/ConfettiSwiftUI.git", from: "1.0.0"),
@@ -165,6 +166,13 @@ let package = Package(
165166
name: "TestKit",
166167
dependencies: ["Difference", "Nimble"]
167168
),
169+
.target(
170+
name: "UITestsFoundation",
171+
dependencies: [
172+
.product(name: "ScreenObject", package: "ScreenObject"),
173+
.product(name: "XCUITestHelpers", package: "ScreenObject"),
174+
]
175+
),
168176
.target(
169177
name: "WooFoundation",
170178
dependencies: ["WooFoundationCore"]
@@ -228,6 +236,19 @@ let package = Package(
228236
"Hardware"
229237
]
230238
),
239+
.testTarget(
240+
name: "NetworkingTests",
241+
dependencies: [
242+
"Codegen",
243+
"Fakes",
244+
"Networking",
245+
"TestKit",
246+
"WooFoundation",
247+
"WordPressShared",
248+
.product(name: "KeychainAccess", package: "KeychainAccess"),
249+
],
250+
resources: [.process("Responses")]
251+
),
231252
.testTarget(
232253
name: "StorageTests",
233254
dependencies: [
@@ -253,6 +274,21 @@ let package = Package(
253274
dependencies: [.target(name: "WordPressShared")],
254275
resources: [.process("Resources")]
255276
),
277+
.testTarget(
278+
name: "YosemiteTests",
279+
dependencies: [
280+
"Codegen",
281+
"Fakes",
282+
"TestKit",
283+
"WooFoundation",
284+
"WordPressShared",
285+
"Yosemite"
286+
],
287+
resources: [
288+
.process("Resources"),
289+
.process("../NetworkingTests/Responses")
290+
]
291+
)
256292
]
257293
)
258294

@@ -274,52 +310,34 @@ let package = Package(
274310

275311
enum XcodeTargetNames {
276312
static let fakes = "Fakes"
277-
static let networkingTests = "NetworkingTests"
278313
static let notificationExtension = "NotificationExtension"
279314
static let storeWidgetsExtension = "StoreWidgetsExtension"
280-
static let uiTestsFoundation = "UITestsFoundation"
281315
static let wooCommerce = "WooCommerce"
282316
static let wooCommerceScreenshots = "WooCommerceScreenshots"
283317
static let wooCommerceTests = "WooCommerceTests"
284318
static let wooCommerceUITests = "WooCommerceUITests"
285319
static let wooCommerceWatchApp = "Woo Watch App"
286320
static let wordPressAuthenticator = "WordPressAuthenticator"
287321
static let wordPressAuthenticatorTests = "WordPressAuthenticatorTests"
288-
static let yosemiteTests = "YosemiteTests"
289322
}
290323

291324
enum XcodeSupport {
292325
static var products: [Product] {
293326
[
294-
XcodeTargetNames.networkingTests,
295327
XcodeTargetNames.notificationExtension,
296328
XcodeTargetNames.storeWidgetsExtension,
297-
XcodeTargetNames.uiTestsFoundation,
298329
XcodeTargetNames.wooCommerce,
299330
XcodeTargetNames.wooCommerceScreenshots,
300331
XcodeTargetNames.wooCommerceTests,
301332
XcodeTargetNames.wooCommerceUITests,
302333
XcodeTargetNames.wooCommerceWatchApp,
303334
XcodeTargetNames.wordPressAuthenticator,
304335
XcodeTargetNames.wordPressAuthenticatorTests,
305-
XcodeTargetNames.yosemiteTests
306336
].map { .supportingProduct(forXcodeTarget: $0) }
307337
}
308338

309339
static var targets: [Target] {
310340
[
311-
.xcodeTarget(
312-
XcodeTargetNames.networkingTests,
313-
dependencies: [
314-
"Codegen",
315-
"Fakes",
316-
"Networking",
317-
"TestKit",
318-
"WooFoundation",
319-
"WordPressShared",
320-
.product(name: "KeychainAccess", package: "KeychainAccess"),
321-
]
322-
),
323341
.xcodeTarget(
324342
XcodeTargetNames.notificationExtension,
325343
dependencies: [
@@ -338,13 +356,6 @@ enum XcodeSupport {
338356
.product(name: "KeychainAccess", package: "KeychainAccess"),
339357
]
340358
),
341-
.xcodeTarget(
342-
XcodeTargetNames.uiTestsFoundation,
343-
dependencies: [
344-
.product(name: "ScreenObject", package: "ScreenObject"),
345-
.product(name: "XCUITestHelpers", package: "ScreenObject"),
346-
]
347-
),
348359
.xcodeTarget(
349360
XcodeTargetNames.wooCommerce,
350361
dependencies: [
@@ -375,12 +386,14 @@ enum XcodeSupport {
375386
.product(name: "Shimmer", package: "SwiftUI-Shimmer"),
376387
.product(name: "StripeTerminal", package: "stripe-terminal-ios"),
377388
.product(name: "WordPressEditor", package: "AztecEditor-iOS"),
389+
.product(name: "Wormholy", package: "Wormholy"),
378390
.product(name: "ZendeskSupportSDK", package: "support_sdk_ios"),
379391
]
380392
),
381393
.xcodeTarget(
382394
XcodeTargetNames.wooCommerceScreenshots,
383395
dependencies: [
396+
"UITestsFoundation",
384397
.product(name: "Embassy", package: "Embassy"),
385398
.product(name: "ScreenObject", package: "ScreenObject"),
386399
XcodeTargetNames.wooCommerce.asDependency
@@ -404,6 +417,7 @@ enum XcodeSupport {
404417
.xcodeTarget(
405418
XcodeTargetNames.wooCommerceUITests,
406419
dependencies: [
420+
"UITestsFoundation",
407421
.product(name: "ScreenObject", package: "ScreenObject"),
408422
XcodeTargetNames.wooCommerce.asDependency
409423
]
@@ -440,17 +454,6 @@ enum XcodeSupport {
440454
XcodeTargetNames.wordPressAuthenticator.asDependency,
441455
]
442456
),
443-
.xcodeTarget(
444-
XcodeTargetNames.yosemiteTests,
445-
dependencies: [
446-
"Codegen",
447-
"Fakes",
448-
"TestKit",
449-
"WooFoundation",
450-
"WordPressShared",
451-
"Yosemite"
452-
]
453-
)
454457
]
455458
}
456459
}

‎Modules/Sources/Experiments/DefaultFeatureFlagService.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
5555
case .splitViewInProductsTab:
5656
return true
5757
case .subscriptionsInOrderCreationUI:
58-
return buildConfig == .localDeveloper || buildConfig == .alpha
58+
// Feature paused pdqJU4-4mn-p2#comment-2067
59+
return false
5960
case .subscriptionsInOrderCreationCustomers:
60-
// Feature paused pfoUAQ-zw-p2#comment-510.
61+
// Feature paused pdqJU4-4mn-p2#comment-2067
6162
return false
6263
case .pointOfSale:
6364
return buildConfig == .localDeveloper || buildConfig == .alpha

‎Modules/Sources/Fakes/Networking.generated.swift‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2406,7 +2406,7 @@ extension Networking.WooShippingPackagePurchase {
24062406
.init(
24072407
shipmentID: .fake(),
24082408
package: .fake(),
2409-
rate: .fake(),
2409+
selectedRate: .fake(),
24102410
productIDs: .fake()
24112411
)
24122412
}
@@ -2469,6 +2469,20 @@ extension Networking.WooShippingSavedPredefinedPackage {
24692469
)
24702470
}
24712471
}
2472+
extension Networking.WooShippingSelectedRate {
2473+
/// Returns a "ready to use" type filled with fake values.
2474+
///
2475+
public static func fake() -> Networking.WooShippingSelectedRate {
2476+
.init(
2477+
rate: .fake(),
2478+
signatureRate: .fake(),
2479+
adultSignatureRate: .fake(),
2480+
carbonNeutralRate: .fake(),
2481+
saturdayDeliveryRate: .fake(),
2482+
additionalHandlingRate: .fake()
2483+
)
2484+
}
2485+
}
24722486
extension Networking.WooShippingShipmentItem {
24732487
/// Returns a "ready to use" type filled with fake values.
24742488
///

‎Modules/Sources/Networking/Mapper/ProductListMapper.swift‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Modules/Sources/Networking/Mapper/ShippingLabelCarriersAndRatesMapper.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ private struct ShippingLabelDefaultBoxEnvelope: Decodable {
4949
return ShippingLabelCarriersAndRates(packageID: key,
5050
defaultRates: value.defaultRates,
5151
signatureRequired: value.signatureRequired,
52-
adultSignatureRequired: value.adultSignatureRequired)
52+
adultSignatureRequired: value.adultSignatureRequired,
53+
carbonNeutral: value.carbonNeutral,
54+
saturdayDelivery: value.saturdayDelivery,
55+
additionalHandling: value.additionalHandling)
5356
}
5457
}
5558
}

‎Modules/Sources/Networking/Mapper/WooShippingLabelRatesMapper.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ private struct ShippingLabelDefaultBoxEnvelope: Decodable {
4141
return ShippingLabelCarriersAndRates(packageID: key,
4242
defaultRates: value.defaultRates,
4343
signatureRequired: value.signatureRequired,
44-
adultSignatureRequired: value.adultSignatureRequired)
44+
adultSignatureRequired: value.adultSignatureRequired,
45+
carbonNeutral: value.carbonNeutral,
46+
saturdayDelivery: value.saturdayDelivery,
47+
additionalHandling: value.additionalHandling)
4548
}
4649
}
4750
}

0 commit comments

Comments
 (0)