Mhurd has submitted this change and it was merged.
Change subject: all migrated articles editable fix
......................................................................
all migrated articles editable fix
We weren't properly setting article.editable during migration. To test,
migrate a mix of articles that are/aren't editable, and make sure the
property transfers correctly.
Change-Id: If6b54798a2dcc5c2a2b911f1c125c1e3d2a3cdcd
---
M WikipediaUnitTests/OldDataSchemaMigratorTests.m
M wikipedia/Data/OldDataSchemaMigrator.m
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Fjalapeno: Looks good to me, but someone else must approve
Mhurd: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikipediaUnitTests/OldDataSchemaMigratorTests.m
b/WikipediaUnitTests/OldDataSchemaMigratorTests.m
index 8c6940c..85b6851 100644
--- a/WikipediaUnitTests/OldDataSchemaMigratorTests.m
+++ b/WikipediaUnitTests/OldDataSchemaMigratorTests.m
@@ -129,8 +129,7 @@
assertThat(migratedArticle.redirected, is([migratedSite
titleWithString:oldArticle.redirected]));
assertThat(@(migratedArticle.languagecount), is(oldArticle.languagecount));
assertThat([migratedArticle.protection allowedGroupsForAction:@"edit"],
is(@[oldArticle.protectionStatus]));
- // !!!: is this correct?
- assertThat(@(migratedArticle.editable), isFalse());
+ assertThat(@(migratedArticle.editable), is(oldArticle.editable));
}
- (void)verifyArticleSections:(MWKArticle*)migratedArticle
correspondToOldArticle:(Article*)oldArticle {
diff --git a/wikipedia/Data/OldDataSchemaMigrator.m
b/wikipedia/Data/OldDataSchemaMigrator.m
index bb30296..91cf595 100644
--- a/wikipedia/Data/OldDataSchemaMigrator.m
+++ b/wikipedia/Data/OldDataSchemaMigrator.m
@@ -235,7 +235,7 @@
};
}
if (article.editable) {
- dict[@"editable"] = @"";
+ dict[@"editable"] = article.editable;
}
// sections!
--
To view, visit https://gerrit.wikimedia.org/r/200225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6b54798a2dcc5c2a2b911f1c125c1e3d2a3cdcd
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: 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
