Renamed Feed and related classes/instances to WebFeed

Frameworks/Account/Account.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 		5107A09B227DE49500C7C3C5 /* TestAccountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5107A09A227DE49500C7C3C5 /* TestAccountManager.swift */; };
 		5107A09D227DE77700C7C3C5 /* TestTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5107A09C227DE77700C7C3C5 /* TestTransport.swift */; };
 		510BD111232C3801002692E4 /* AccountMetadataFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510BD110232C3801002692E4 /* AccountMetadataFile.swift */; };
-		510BD113232C3E9D002692E4 /* FeedMetadataFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510BD112232C3E9D002692E4 /* FeedMetadataFile.swift */; };
+		510BD113232C3E9D002692E4 /* WebFeedMetadataFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510BD112232C3E9D002692E4 /* WebFeedMetadataFile.swift */; };
 		511B9804237CD4270028BCAA /* ArticleFetcherType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511B9803237CD4270028BCAA /* ArticleFetcherType.swift */; };
 		513323082281070D00C30F19 /* AccountFeedbinSyncTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513323072281070C00C30F19 /* AccountFeedbinSyncTest.swift */; };
 		5133230A2281082F00C30F19 /* subscriptions_initial.json in Resources */ = {isa = PBXBuildFile; fileRef = 513323092281082F00C30F19 /* subscriptions_initial.json */; };
@@ -56,7 +56,7 @@
 		841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D6F2106B40400DD04E6 /* ArticlesDatabase.framework */; };
 		841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D712106B40A00DD04E6 /* Articles.framework */; };
 		84245C851FDDD8CB0074AFBB /* FeedbinSubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84245C841FDDD8CB0074AFBB /* FeedbinSubscription.swift */; };
-		844B297D2106C7EC004020B3 /* Feed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844B297C2106C7EC004020B3 /* Feed.swift */; };
+		844B297D2106C7EC004020B3 /* WebFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844B297C2106C7EC004020B3 /* WebFeed.swift */; };
 		844B297F210CE37E004020B3 /* UnreadCountProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844B297E210CE37E004020B3 /* UnreadCountProvider.swift */; };
 		844B2981210CE3BF004020B3 /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B2980210CE3BF004020B3 /* RSWeb.framework */; };
 		8469F81C1F6DD15E0084783E /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848935101F62486800CEBD24 /* Account.swift */; };
@@ -65,7 +65,7 @@
 		846E77501F6EF9C400A165E2 /* LocalAccountRefresher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8419742D1F6DDE96006346C4 /* LocalAccountRefresher.swift */; };
 		846E77541F6F00E300A165E2 /* AccountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846E77531F6F00E300A165E2 /* AccountManager.swift */; };
 		848935001F62484F00CEBD24 /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 848934F61F62484F00CEBD24 /* Account.framework */; };
-		84B2D4D02238CD8A00498ADA /* FeedMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B2D4CE2238C13D00498ADA /* FeedMetadata.swift */; };
+		84B2D4D02238CD8A00498ADA /* WebFeedMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B2D4CE2238C13D00498ADA /* WebFeedMetadata.swift */; };
 		84B99C9F1FAE8D3200ECDEDB /* ContainerPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C9E1FAE8D3200ECDEDB /* ContainerPath.swift */; };
 		84C3654A1F899F3B001EC85C /* CombinedRefreshProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C365491F899F3B001EC85C /* CombinedRefreshProgress.swift */; };
 		84C8B3F41F89DE430053CCA6 /* DataExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C8B3F31F89DE430053CCA6 /* DataExtensions.swift */; };
@@ -209,7 +209,7 @@
 		5107A09A227DE49500C7C3C5 /* TestAccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestAccountManager.swift; sourceTree = "<group>"; };
 		5107A09C227DE77700C7C3C5 /* TestTransport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestTransport.swift; sourceTree = "<group>"; };
 		510BD110232C3801002692E4 /* AccountMetadataFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountMetadataFile.swift; sourceTree = "<group>"; };
-		510BD112232C3E9D002692E4 /* FeedMetadataFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedMetadataFile.swift; sourceTree = "<group>"; };
+		510BD112232C3E9D002692E4 /* WebFeedMetadataFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebFeedMetadataFile.swift; sourceTree = "<group>"; };
 		511B9803237CD4270028BCAA /* ArticleFetcherType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleFetcherType.swift; sourceTree = "<group>"; };
 		513323072281070C00C30F19 /* AccountFeedbinSyncTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountFeedbinSyncTest.swift; sourceTree = "<group>"; };
 		513323092281082F00C30F19 /* subscriptions_initial.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = subscriptions_initial.json; sourceTree = "<group>"; };
@@ -258,7 +258,7 @@
 		841D4D6F2106B40400DD04E6 /* ArticlesDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ArticlesDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		841D4D712106B40A00DD04E6 /* Articles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Articles.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		84245C841FDDD8CB0074AFBB /* FeedbinSubscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinSubscription.swift; sourceTree = "<group>"; };
-		844B297C2106C7EC004020B3 /* Feed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Feed.swift; sourceTree = "<group>"; };
+		844B297C2106C7EC004020B3 /* WebFeed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebFeed.swift; sourceTree = "<group>"; };
 		844B297E210CE37E004020B3 /* UnreadCountProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnreadCountProvider.swift; sourceTree = "<group>"; };
 		844B2980210CE3BF004020B3 /* RSWeb.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSWeb.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		846E77531F6F00E300A165E2 /* AccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountManager.swift; sourceTree = "<group>"; };
@@ -268,7 +268,7 @@
 		848935061F62485000CEBD24 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		848935101F62486800CEBD24 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
 		84AF4EA3222CFDD100F6A800 /* AccountMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountMetadata.swift; sourceTree = "<group>"; };
-		84B2D4CE2238C13D00498ADA /* FeedMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedMetadata.swift; sourceTree = "<group>"; };
+		84B2D4CE2238C13D00498ADA /* WebFeedMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebFeedMetadata.swift; sourceTree = "<group>"; };
 		84B99C9E1FAE8D3200ECDEDB /* ContainerPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerPath.swift; sourceTree = "<group>"; };
 		84C365491F899F3B001EC85C /* CombinedRefreshProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombinedRefreshProgress.swift; sourceTree = "<group>"; };
 		84C8B3F31F89DE430053CCA6 /* DataExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataExtensions.swift; sourceTree = "<group>"; };
@@ -532,9 +532,9 @@
 				8419740D1F6DD25F006346C4 /* Container.swift */,
 				84B99C9E1FAE8D3200ECDEDB /* ContainerPath.swift */,
 				84C8B3F31F89DE430053CCA6 /* DataExtensions.swift */,
-				844B297C2106C7EC004020B3 /* Feed.swift */,
-				84B2D4CE2238C13D00498ADA /* FeedMetadata.swift */,
-				510BD112232C3E9D002692E4 /* FeedMetadataFile.swift */,
+				844B297C2106C7EC004020B3 /* WebFeed.swift */,
+				84B2D4CE2238C13D00498ADA /* WebFeedMetadata.swift */,
+				510BD112232C3E9D002692E4 /* WebFeedMetadataFile.swift */,
 				841974001F6DD1EC006346C4 /* Folder.swift */,
 				844B297E210CE37E004020B3 /* UnreadCountProvider.swift */,
 				5165D71F22835E9800D9D53D /* FeedFinder */,
@@ -964,7 +964,7 @@
 				84F73CF1202788D90000BCEF /* ArticleFetcher.swift in Sources */,
 				9E713653233AD63E00765C84 /* FeedlySetUnreadArticlesOperation.swift in Sources */,
 				841974251F6DDCE4006346C4 /* AccountDelegate.swift in Sources */,
-				510BD113232C3E9D002692E4 /* FeedMetadataFile.swift in Sources */,
+				510BD113232C3E9D002692E4 /* WebFeedMetadataFile.swift in Sources */,
 				5165D73122837F3400D9D53D /* InitialFeedDownloader.swift in Sources */,
 				9EEEF71F23545CB4009E9D80 /* FeedlySendArticleStatusesOperation.swift in Sources */,
 				846E77541F6F00E300A165E2 /* AccountManager.swift in Sources */,
@@ -976,7 +976,7 @@
 				9E84DC492359A73600D6E809 /* FeedlyCheckpointOperation.swift in Sources */,
 				9E85C8EB236700E600D0F1F7 /* FeedlyGetEntriesOperation.swift in Sources */,
 				9E1D154D233370D800F4944C /* FeedlySyncAllOperation.swift in Sources */,
-				844B297D2106C7EC004020B3 /* Feed.swift in Sources */,
+				844B297D2106C7EC004020B3 /* WebFeed.swift in Sources */,
 				9E964EBA23754B4000A7AF2E /* OAuthAccountAuthorizationOperation.swift in Sources */,
 				9E1D15572334355900F4944C /* FeedlyRequestStreamsOperation.swift in Sources */,
 				9E1D15512334282100F4944C /* FeedlyMirrorCollectionsAsFoldersOperation.swift in Sources */,
@@ -987,7 +987,7 @@
 				9EEAE075235D01C400E3FEE4 /* FeedlyMarkArticlesService.swift in Sources */,
 				9EF1B10323584B4C000A486A /* FeedlySyncStreamContentsOperation.swift in Sources */,
 				5154367B228EEB28005E1CDF /* FeedbinImportResult.swift in Sources */,
-				84B2D4D02238CD8A00498ADA /* FeedMetadata.swift in Sources */,
+				84B2D4D02238CD8A00498ADA /* WebFeedMetadata.swift in Sources */,
 				9E84DC472359A23200D6E809 /* FeedlySyncUnreadStatusesOperation.swift in Sources */,
 				9EAEC624233315F60085D7C9 /* FeedlyEntry.swift in Sources */,
 				9EEAE073235D01AE00E3FEE4 /* FeedlyGetStreamIdsService.swift in Sources */,

Frameworks/Account/AccountDelegate.swift

@@ -33,13 +33,13 @@ protocol AccountDelegate {
 	func renameFolder(for account: Account, with folder: Folder, to name: String, completion: @escaping (Result<Void, Error>) -> Void)
 	func removeFolder(for account: Account, with folder: Folder, completion: @escaping (Result<Void, Error>) -> Void)
 
-	func createFeed(for account: Account, url: String, name: String?, container: Container, completion: @escaping (Result<Feed, Error>) -> Void)
-	func renameFeed(for account: Account, with feed: Feed, to name: String, completion: @escaping (Result<Void, Error>) -> Void)
-	func addFeed(for account: Account, with: Feed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void)
-	func removeFeed(for account: Account, with feed: Feed, from container: Container, completion: @escaping (Result<Void, Error>) -> Void)
-	func moveFeed(for account: Account, with feed: Feed, from: Container, to: Container, completion: @escaping (Result<Void, Error>) -> Void)
+	func createWebFeed(for account: Account, url: String, name: String?, container: Container, completion: @escaping (Result<WebFeed, Error>) -> Void)
+	func renameWebFeed(for account: Account, with feed: WebFeed, to name: String, completion: @escaping (Result<Void, Error>) -> Void)
+	func addWebFeed(for account: Account, with: WebFeed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void)
+	func removeWebFeed(for account: Account, with feed: WebFeed, from container: Container, completion: @escaping (Result<Void, Error>) -> Void)
+	func moveWebFeed(for account: Account, with feed: WebFeed, from: Container, to: Container, completion: @escaping (Result<Void, Error>) -> Void)
 
-	func restoreFeed(for account: Account, feed: Feed, container: Container, completion: @escaping (Result<Void, Error>) -> Void)
+	func restoreWebFeed(for account: Account, feed: WebFeed, container: Container, completion: @escaping (Result<Void, Error>) -> Void)
 	func restoreFolder(for account: Account, folder: Folder, completion: @escaping (Result<Void, Error>) -> Void)
 
 	func markArticles(for account: Account, articles: Set<Article>, statusKey: ArticleStatus.Key, flag: Bool) -> Set<Article>?

Frameworks/Account/AccountManager.swift

@@ -207,7 +207,7 @@ public final class AccountManager: UnreadCountProvider {
 
 	public func anyAccountHasAtLeastOneFeed() -> Bool {
 		for account in activeAccounts {
-			if account.hasAtLeastOneFeed() {
+			if account.hasAtLeastOneWebFeed() {
 				return true
 			}
 		}
@@ -217,7 +217,7 @@ public final class AccountManager: UnreadCountProvider {
 
 	public func anyAccountHasFeedWithURL(_ urlString: String) -> Bool {
 		for account in activeAccounts {
-			if let _ = account.existingFeed(withURL: urlString) {
+			if let _ = account.existingWebFeed(withURL: urlString) {
 				return true
 			}
 		}

Frameworks/Account/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift

@@ -33,8 +33,8 @@ class AccountFeedbinFolderContentsSyncTest: XCTestCase {
 		waitForExpectations(timeout: 5, handler: nil)
 
 		let folder = account.folders?.filter { $0.name == "Developers" } .first!
-		XCTAssertEqual(156, folder?.topLevelFeeds.count ?? 0)
-		XCTAssertEqual(2, account.topLevelFeeds.count)
+		XCTAssertEqual(156, folder?.topLevelWebFeeds.count ?? 0)
+		XCTAssertEqual(2, account.topLevelWebFeeds.count)
 
 		// Test Adding a Feed to the folder
 		testTransport.testFiles["https://api.feedbin.com/v2/taggings.json"] = "taggings_add.json"
@@ -45,8 +45,8 @@ class AccountFeedbinFolderContentsSyncTest: XCTestCase {
 		}
 		waitForExpectations(timeout: 5, handler: nil)
 
-		XCTAssertEqual(157, folder?.topLevelFeeds.count ?? 0)
-		XCTAssertEqual(1, account.topLevelFeeds.count)
+		XCTAssertEqual(157, folder?.topLevelWebFeeds.count ?? 0)
+		XCTAssertEqual(1, account.topLevelWebFeeds.count)
 
 		// Test Deleting some Feeds from the folder
 		testTransport.testFiles["https://api.feedbin.com/v2/taggings.json"] = "taggings_delete.json"
@@ -57,8 +57,8 @@ class AccountFeedbinFolderContentsSyncTest: XCTestCase {
 		}
 		waitForExpectations(timeout: 5, handler: nil)
 
-		XCTAssertEqual(153, folder?.topLevelFeeds.count ?? 0)
-		XCTAssertEqual(5, account.topLevelFeeds.count)
+		XCTAssertEqual(153, folder?.topLevelWebFeeds.count ?? 0)
+		XCTAssertEqual(5, account.topLevelWebFeeds.count)
 
 		TestAccountManager.shared.deleteAccount(account)
 

Frameworks/Account/AccountTests/Feedbin/AccountFeedbinSyncTest.swift

@@ -36,9 +36,9 @@ class AccountFeedbinSyncTest: XCTestCase {
 		}
 		waitForExpectations(timeout: 5, handler: nil)
 
-		XCTAssertEqual(224, account.flattenedFeeds().count)
+		XCTAssertEqual(224, account.flattenedWebFeeds().count)
 
-		let daringFireball = account.idToFeedDictionary["1296379"]
+		let daringFireball = account.idToWebFeedDictionary["1296379"]
 		XCTAssertEqual("Daring Fireball", daringFireball!.name)
 		XCTAssertEqual("https://daringfireball.net/feeds/json", daringFireball!.url)
 		XCTAssertEqual("https://daringfireball.net/", daringFireball!.homePageURL)
@@ -57,9 +57,9 @@ class AccountFeedbinSyncTest: XCTestCase {
 		}
 		waitForExpectations(timeout: 5, handler: nil)
 
-		XCTAssertEqual(225, account.flattenedFeeds().count)
+		XCTAssertEqual(225, account.flattenedWebFeeds().count)
 
-		let bPixels = account.idToFeedDictionary["1096623"]
+		let bPixels = account.idToWebFeedDictionary["1096623"]
 		XCTAssertEqual("Beautiful Pixels", bPixels?.name)
 		XCTAssertEqual("https://feedpress.me/beautifulpixels", bPixels?.url)
 		XCTAssertEqual("https://beautifulpixels.com/", bPixels?.homePageURL)

Frameworks/Account/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift

@@ -58,7 +58,7 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase {
 			completionExpectation.fulfill()
 		}
 
-		XCTAssertTrue(account.flattenedFeeds().isEmpty, "Expected empty account.")
+		XCTAssertTrue(account.flattenedWebFeeds().isEmpty, "Expected empty account.")
 
 		OperationQueue.main.addOperation(createFeeds)
 
@@ -72,8 +72,8 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase {
 			.flatMap { $0 }
 			.map { $0.title })
 
-		let accountFeeds = account.flattenedFeeds()
-		let ingestedIds = Set(accountFeeds.map { $0.feedID })
+		let accountFeeds = account.flattenedWebFeeds()
+		let ingestedIds = Set(accountFeeds.map { $0.webFeedID })
 		let ingestedTitles = Set(accountFeeds.map { $0.nameForDisplay })
 
 		let missingIds = feedIds.subtracting(ingestedIds)
@@ -91,7 +91,7 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase {
 		let ingestedFolderAndFeedIds = (account.folders ?? Set())
 			.sorted { $0.externalID! < $1.externalID! }
 			.compactMap { folder -> [String: [String]]? in
-				return [folder.externalID!: folder.topLevelFeeds.map { $0.feedID }.sorted(by: <)]
+				return [folder.externalID!: folder.topLevelWebFeeds.map { $0.webFeedID }.sorted(by: <)]
 		}
 
 		XCTAssertEqual(expectedFolderAndFeedIds, ingestedFolderAndFeedIds, "Did not ingest feeds in their corresponding folders.")
@@ -129,7 +129,7 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase {
 				completionExpectation.fulfill()
 			}
 
-			XCTAssertTrue(account.flattenedFeeds().isEmpty, "Expected empty account.")
+			XCTAssertTrue(account.flattenedWebFeeds().isEmpty, "Expected empty account.")
 
 			OperationQueue.main.addOperation(createFeeds)
 
@@ -165,8 +165,8 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase {
 			.flatMap { $0 }
 			.map { $0.title })
 
-		let accountFeeds = account.flattenedFeeds()
-		let ingestedIds = Set(accountFeeds.map { $0.feedID })
+		let accountFeeds = account.flattenedWebFeeds()
+		let ingestedIds = Set(accountFeeds.map { $0.webFeedID })
 		let ingestedTitles = Set(accountFeeds.map { $0.nameForDisplay })
 
 		XCTAssertEqual(ingestedIds.count, feedIds.count)
@@ -187,7 +187,7 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase {
 		let ingestedFolderAndFeedIds = (account.folders ?? Set())
 			.sorted { $0.externalID! < $1.externalID! }
 			.compactMap { folder -> [String: [String]]? in
-				return [folder.externalID!: folder.topLevelFeeds.map { $0.feedID }.sorted(by: <)]
+				return [folder.externalID!: folder.topLevelWebFeeds.map { $0.webFeedID }.sorted(by: <)]
 		}
 
 		XCTAssertEqual(expectedFolderAndFeedIds, ingestedFolderAndFeedIds, "Did not ingest feeds to their corresponding folders.")

Frameworks/Account/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift

@@ -183,7 +183,7 @@ class FeedlyMirrorCollectionsAsFoldersOperationTests: XCTestCase {
 
 			waitForExpectations(timeout: 2)
 
-			XCTAssertFalse(account.flattenedFeeds().isEmpty, "Expected account to have feeds.")
+			XCTAssertFalse(account.flattenedWebFeeds().isEmpty, "Expected account to have feeds.")
 		}
 
 		// Now that the folders are added, remove them all.
@@ -200,7 +200,7 @@ class FeedlyMirrorCollectionsAsFoldersOperationTests: XCTestCase {
 
 		waitForExpectations(timeout: 2)
 
-		let feeds = account.flattenedFeeds()
+		let feeds = account.flattenedWebFeeds()
 
 		XCTAssertTrue(feeds.isEmpty)
 	}