Skip to content

Update WordPressKit to address #22891 #22900

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
mokagio merged 2 commits into from
Mar 27, 2024
Merged

Update WordPressKit to address #22891 #22900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1781d8
Update WordPressKit to address #22891
mokagio Mar 26, 2024
5d6a5f0
Update failing `OCMStub` after WordPressKit internal changes
mokagio Mar 27, 2024
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
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def wordpress_ui
end

def wordpress_kit
pod 'WordPressKit', '~> 14.1'
pod 'WordPressKit', '~> 15.0'
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: ''
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
Expand Down
16 changes: 8 additions & 8 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ PODS:
- WordPress-Aztec-iOS (1.19.9)
- WordPress-Editor-iOS (1.19.9):
- WordPress-Aztec-iOS (= 1.19.9)
- WordPressAuthenticator (9.0.2):
- WordPressAuthenticator (9.0.4):
- Gridicons (~> 1.0)
- "NSURL+IDN (= 0.4)"
- SVProgressHUD (~> 2.2.5)
- WordPressKit (~> 14.0)
- WordPressKit (~> 15.0)
- WordPressShared (~> 2.1-beta)
- WordPressUI (~> 1.7-beta)
- WordPressKit (14.1.0):
- WordPressKit (15.0.0):
- NSObject-SafeExpectations (~> 0.0.4)
- UIDeviceIdentifier (~> 2.0)
- WordPressShared (~> 2.0-beta)
Expand Down Expand Up @@ -119,7 +119,7 @@ DEPENDENCIES:
- SwiftLint (= 0.54.0)
- WordPress-Editor-iOS (~> 1.19.9)
- WordPressAuthenticator (>= 9.0.2, ~> 9.0)
- WordPressKit (~> 14.1)
- WordPressKit (~> 15.0)
- WordPressShared (>= 2.3.1, ~> 2.3)
- WordPressUI (~> 1.15)
- ZendeskSupportSDK (= 5.3.0)
Expand All @@ -128,6 +128,7 @@ DEPENDENCIES:
SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPressAuthenticator
- WordPressKit
trunk:
- Alamofire
- AlamofireImage
Expand Down Expand Up @@ -156,7 +157,6 @@ SPEC REPOS:
- UIDeviceIdentifier
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressKit
- WordPressShared
- WordPressUI
- wpxmlrpc
Expand Down Expand Up @@ -211,8 +211,8 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
WordPressAuthenticator: d906a1005febb28de9f5c3a802736ca0850307f6
WordPressKit: 324ee6100ad74b72c0c37b81fab8937c437f0773
WordPressAuthenticator: 47ac66428c0a712ced8eb0ab481f64e2f4e80f47
WordPressKit: adbefc1caddae6b1a5a1f45d1062d3eb9aa58af6
WordPressShared: 04c6d51441bb8fa29651075b3a5536c90ae89c76
WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Expand All @@ -225,6 +225,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced

PODFILE CHECKSUM: 5b39e8e85fd8101ebfcfef947e6d1d9d4ce7f301
PODFILE CHECKSUM: c46a3c5878876da8bda61f28c86acd78a87ec7e2

COCOAPODS: 1.15.2
10 changes: 5 additions & 5 deletions WordPress/WordPressTest/MenusServiceTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ - (void)testThatSyncMenusForBlogWorks
blog.isAdmin = YES;

NSString* url = [NSString stringWithFormat:@"rest/v1.1/sites/%@/menus", [blog dotComID]];
OCMStub([api GET:[OCMArg isEqual:url]
OCMStub([api get:[OCMArg isEqual:url]
parameters:[OCMArg isNil]
success:[OCMArg isNotNil]
failure:[OCMArg isNotNil]]);
Expand Down Expand Up @@ -103,7 +103,7 @@ - (void)testThatCreateMenuWithNameWorks
&& [[parameters objectForKey:@"name"] isEqualToString:name]);
};

OCMStub([api POST:[OCMArg isEqual:url]
OCMStub([api post:[OCMArg isEqual:url]
parameters:[OCMArg checkWithBlock:parametersCheckBlock]
success:[OCMArg isNotNil]
failure:[OCMArg isNotNil]]);
Expand Down Expand Up @@ -152,7 +152,7 @@ - (void)testThatUpdateMenuWorks
menu.items = items;

NSString* url = [NSString stringWithFormat:@"rest/v1.1/sites/%@/menus/%@", [blog dotComID], menu.menuID];
OCMStub([api POST:[OCMArg isEqual:url]
OCMStub([api post:[OCMArg isEqual:url]
parameters:[OCMArg isKindOfClass:[NSDictionary class]]
success:[OCMArg isNotNil]
failure:[OCMArg isNotNil]]);
Expand All @@ -179,7 +179,7 @@ - (void)testThatDeleteMenuWithIdWorks

NSString* url = [NSString stringWithFormat:@"rest/v1.1/sites/%@/menus/%@/delete", [blog dotComID], menu.menuID];

OCMStub([api POST:[OCMArg isEqual:url]
OCMStub([api post:[OCMArg isEqual:url]
parameters:[OCMArg isNil]
success:[OCMArg isNotNil]
failure:[OCMArg isNotNil]]);
Expand All @@ -206,7 +206,7 @@ - (void)testThatDeleteMenuWithoutIdWorks

NSString* url = [NSString stringWithFormat:@"rest/v1.1/sites/%@/menus/%@/delete", [blog dotComID], menu.menuID];

OCMStub([api POST:[OCMArg isEqual:url]
OCMStub([api post:[OCMArg isEqual:url]
parameters:[OCMArg isNil]
success:[OCMArg isNotNil]
failure:[OCMArg isNotNil]]);
Expand Down
6 changes: 3 additions & 3 deletions WordPress/WordPressTest/ThemeServiceTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ - (void)testThatGetActiveThemeForBlogWorks

blog.dotComID = blogId;

OCMStub([api GET:[OCMArg isEqual:url]
OCMStub([api get:[OCMArg isEqual:url]
parameters:[OCMArg isNil]
success:[OCMArg any]
failure:[OCMArg any]]);
Expand Down Expand Up @@ -107,7 +107,7 @@ - (void)testThatGetThemesForBlogWorks
blog.dotComID = blogId;
blog.account.wordPressComRestApi = api;

OCMStub([api GET:[OCMArg isEqual:url]
OCMStub([api get:[OCMArg isEqual:url]
parameters:[OCMArg isNotNil]
success:[OCMArg any]
failure:[OCMArg any]]);
Expand Down Expand Up @@ -147,7 +147,7 @@ - (void)testThatActivateThemeWorks
blog.dotComID = blogId;
blog.account.wordPressComRestApi = api;

OCMStub([api POST:[OCMArg isEqual:url]
OCMStub([api post:[OCMArg isEqual:url]
parameters:[OCMArg isNotNil]
success:[OCMArg any]
failure:[OCMArg any]]);
Expand Down