Dr0ptp4kt has submitted this change and it was merged.
Change subject: Crash after migration - this value is supposed to be an array.
......................................................................
Crash after migration - this value is supposed to be an array.
Change-Id: Ie11043a276af73a304d3a0380964159ef9bf8146
---
M WikipediaUnitTests/OldDataSchemaMigratorTests.m
M wikipedia/Data/OldDataSchemaMigrator.m
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikipediaUnitTests/OldDataSchemaMigratorTests.m
b/WikipediaUnitTests/OldDataSchemaMigratorTests.m
index a1be3b1..8c6940c 100644
--- a/WikipediaUnitTests/OldDataSchemaMigratorTests.m
+++ b/WikipediaUnitTests/OldDataSchemaMigratorTests.m
@@ -128,7 +128,7 @@
// article misc
assertThat(migratedArticle.redirected, is([migratedSite
titleWithString:oldArticle.redirected]));
assertThat(@(migratedArticle.languagecount), is(oldArticle.languagecount));
- assertThat([migratedArticle.protection protectedActions],
is(equalTo(@[@"edit"])));
+ assertThat([migratedArticle.protection allowedGroupsForAction:@"edit"],
is(@[oldArticle.protectionStatus]));
// !!!: is this correct?
assertThat(@(migratedArticle.editable), isFalse());
}
diff --git a/wikipedia/Data/OldDataSchemaMigrator.m
b/wikipedia/Data/OldDataSchemaMigrator.m
index 73e9db9..a46f57a 100644
--- a/wikipedia/Data/OldDataSchemaMigrator.m
+++ b/wikipedia/Data/OldDataSchemaMigrator.m
@@ -249,8 +249,8 @@
}
if (article.protectionStatus) {
dict[@"protection"] = @{
- @"edit": article.protectionStatus
- };
+ @"edit": @[article.protectionStatus]
+ };
}
if (article.editable) {
dict[@"editable"] = @"";
--
To view, visit https://gerrit.wikimedia.org/r/199536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie11043a276af73a304d3a0380964159ef9bf8146
Gerrit-PatchSet: 5
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno <[email protected]>
Gerrit-Reviewer: Bgerstle <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Fjalapeno <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
