Change argument label from context to insertInto for better API name

crazytonyli · crazytonyli · commit 2009f8a739be · 2022-05-03T00:47:24.000+12:00
diff --git a/WordPress/WordPressTest/FormattableUserContentTests.swift b/WordPress/WordPressTest/FormattableUserContentTests.swift
@@ -138,7 +138,7 @@ final class FormattableUserContentTests: XCTestCase {
     }
 
     private func loadLikeNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     private func loadMeta() -> [String: AnyObject] {
diff --git a/WordPress/WordPressTest/NSManagedObject+Fixture.swift b/WordPress/WordPressTest/NSManagedObject+Fixture.swift
@@ -4,13 +4,11 @@ extension NSManagedObject {
 
     /// Loads the contents of any given JSON file into a new `NSManagedObject` instance.
     ///
-    /// This helper method is useful for Unit Testing scenarios.
-    ///
     /// - Parameters:
     ///   - filename: The name of the JSON file to be loaded
     ///   - context: The managed object context to use
     /// - Returns: A new instance with property values of the given JSON file.
-    static func fixture(fromFile fileName: String, context: NSManagedObjectContext) -> Self {
+    static func fixture(fromFile fileName: String, insertInto context: NSManagedObjectContext) -> Self {
         guard let jsonObject = JSONLoader().loadFile(named: fileName) else {
             fatalError("Mockup data could not be parsed, the filename is \(fileName)")
         }
diff --git a/WordPress/WordPressTest/NotificationSyncMediatorTests.swift b/WordPress/WordPressTest/NotificationSyncMediatorTests.swift
@@ -155,7 +155,7 @@ class NotificationSyncMediatorTests: XCTestCase {
 
         // Inject Dummy Note
         let path = "notifications-like.json"
-        let note = WordPress.Notification.fixture(fromFile: path, context: manager.mainContext)
+        let note = WordPress.Notification.fixture(fromFile: path, insertInto: manager.mainContext)
 
         XCTAssertNotNil(note)
         XCTAssertFalse(note.read)
@@ -187,9 +187,9 @@ class NotificationSyncMediatorTests: XCTestCase {
         let path1 = "notifications-like.json"
         let path2 = "notifications-new-follower.json"
         let path3 = "notifications-unapproved-comment.json"
-        let note1 = WordPress.Notification.fixture(fromFile: path1, context: manager.mainContext)
-        let note2 = WordPress.Notification.fixture(fromFile: path2, context: manager.mainContext)
-        let note3 = WordPress.Notification.fixture(fromFile: path3, context: manager.mainContext)
+        let note1 = WordPress.Notification.fixture(fromFile: path1, insertInto: manager.mainContext)
+        let note2 = WordPress.Notification.fixture(fromFile: path2, insertInto: manager.mainContext)
+        let note3 = WordPress.Notification.fixture(fromFile: path3, insertInto: manager.mainContext)
 
         XCTAssertFalse(note1.read)
         XCTAssertFalse(note3.read)
@@ -225,9 +225,9 @@ class NotificationSyncMediatorTests: XCTestCase {
         let path1 = "notifications-like.json"
         let path2 = "notifications-new-follower.json"
         let path3 = "notifications-unapproved-comment.json"
-        let note1 = WordPress.Notification.fixture(fromFile: path1, context: manager.mainContext)
-        let note2 = WordPress.Notification.fixture(fromFile: path2, context: manager.mainContext)
-        let note3 = WordPress.Notification.fixture(fromFile: path3, context: manager.mainContext)
+        let note1 = WordPress.Notification.fixture(fromFile: path1, insertInto: manager.mainContext)
+        let note2 = WordPress.Notification.fixture(fromFile: path2, insertInto: manager.mainContext)
+        let note3 = WordPress.Notification.fixture(fromFile: path3, insertInto: manager.mainContext)
 
         XCTAssertFalse(note1.read)
         XCTAssertFalse(note3.read)
diff --git a/WordPress/WordPressTest/NotificationTextContentTests.swift b/WordPress/WordPressTest/NotificationTextContentTests.swift
@@ -100,7 +100,7 @@ final class NotificationTextContentTests: XCTestCase {
     }
 
     private func loadLikeNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     private func mockedActions() -> [FormattableContentAction] {
diff --git a/WordPress/WordPressTest/NotificationUtility.swift b/WordPress/WordPressTest/NotificationUtility.swift
@@ -21,27 +21,27 @@ class NotificationUtility {
     }
 
     func loadBadgeNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-badge.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-badge.json", insertInto: contextManager.mainContext)
     }
 
     func loadLikeNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     func loadFollowerNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-new-follower.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-new-follower.json", insertInto: contextManager.mainContext)
     }
 
     func loadCommentNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-replied-comment.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-replied-comment.json", insertInto: contextManager.mainContext)
     }
 
     func loadUnapprovedCommentNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-unapproved-comment.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-unapproved-comment.json", insertInto: contextManager.mainContext)
     }
 
     func loadPingbackNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-pingback.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-pingback.json", insertInto: contextManager.mainContext)
     }
 
     func mockCommentContent() -> FormattableCommentContent {
diff --git a/WordPress/WordPressTest/NotificationsContentFactoryTests.swift b/WordPress/WordPressTest/NotificationsContentFactoryTests.swift
@@ -40,6 +40,6 @@ final class NotificationsContentFactoryTests: XCTestCase {
     }
 
     func loadLikeNotification() -> WordPress.Notification {
-        return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ final class FormattableUserContentTests: XCTestCase {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func loadLikeNotification() -> WordPress.Notification {`
`141`		`- return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)`
	`141`	`+ return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private func loadMeta() -> [String: AnyObject] {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ final class NotificationTextContentTests: XCTestCase {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`private func loadLikeNotification() -> WordPress.Notification {`
`103`		`- return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)`
	`103`	`+ return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`private func mockedActions() -> [FormattableContentAction] {`
Original file line number	Diff line number	Diff line change
`@@ -21,27 +21,27 @@ class NotificationUtility {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func loadBadgeNotification() -> WordPress.Notification {`
`24`		`- return .fixture(fromFile: "notifications-badge.json", context: contextManager.mainContext)`
	`24`	`+ return .fixture(fromFile: "notifications-badge.json", insertInto: contextManager.mainContext)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func loadLikeNotification() -> WordPress.Notification {`
`28`		`- return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)`
	`28`	`+ return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func loadFollowerNotification() -> WordPress.Notification {`
`32`		`- return .fixture(fromFile: "notifications-new-follower.json", context: contextManager.mainContext)`
	`32`	`+ return .fixture(fromFile: "notifications-new-follower.json", insertInto: contextManager.mainContext)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func loadCommentNotification() -> WordPress.Notification {`
`36`		`- return .fixture(fromFile: "notifications-replied-comment.json", context: contextManager.mainContext)`
	`36`	`+ return .fixture(fromFile: "notifications-replied-comment.json", insertInto: contextManager.mainContext)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func loadUnapprovedCommentNotification() -> WordPress.Notification {`
`40`		`- return .fixture(fromFile: "notifications-unapproved-comment.json", context: contextManager.mainContext)`
	`40`	`+ return .fixture(fromFile: "notifications-unapproved-comment.json", insertInto: contextManager.mainContext)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func loadPingbackNotification() -> WordPress.Notification {`
`44`		`- return .fixture(fromFile: "notifications-pingback.json", context: contextManager.mainContext)`
	`44`	`+ return .fixture(fromFile: "notifications-pingback.json", insertInto: contextManager.mainContext)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func mockCommentContent() -> FormattableCommentContent {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ final class NotificationsContentFactoryTests: XCTestCase {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func loadLikeNotification() -> WordPress.Notification {`
`43`		`- return .fixture(fromFile: "notifications-like.json", context: contextManager.mainContext)`
	`43`	`+ return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)`
`44`	`44`	`}`
`45`	`45`	`}`