canUploadAsset logic changed to handle self hosted sites + overloaded function for easier testing + new unit test

Author: sla8c

WordPress/Classes/Utility/Media/Blog+VideoLimits.swift

@@ -2,6 +2,10 @@ extension Blog {
 
     /// returns true if the blog is allowed to upload the given asset, true otherwise
     func canUploadAsset(_ asset: WPMediaAsset) -> Bool {
-        hasPaidPlan || !asset.exceedsFreeSitesAllowance()
+        return canUploadAsset(asset.exceedsFreeSitesAllowance())
+    }
+
+    public func canUploadAsset(_ assetExceedsFreeSitesAllowance: Bool) -> Bool {
+        return hasPaidPlan || !isHostedAtWPcom || !assetExceedsFreeSitesAllowance
     }
 }

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -2413,6 +2413,7 @@
 		DC8F61F727032B3F0087AC5D /* TimeZoneFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8F61F627032B3F0087AC5D /* TimeZoneFormatter.swift */; };
 		DC8F61F827032B3F0087AC5D /* TimeZoneFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8F61F627032B3F0087AC5D /* TimeZoneFormatter.swift */; };
 		DC8F61FC2703321F0087AC5D /* TimeZoneFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8F61FB2703321F0087AC5D /* TimeZoneFormatterTests.swift */; };
+		DCC662512810915D00962D0C /* BlogVideoLimitsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC662502810915D00962D0C /* BlogVideoLimitsTests.swift */; };
 		E100C6BB1741473000AE48D8 /* WordPress-11-12.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = E100C6BA1741472F00AE48D8 /* WordPress-11-12.xcmappingmodel */; };
 		E10290741F30615A00DAC588 /* Role.swift in Sources */ = {isa = PBXBuildFile; fileRef = E10290731F30615A00DAC588 /* Role.swift */; };
 		E102B7901E714F24007928E8 /* RecentSitesService.swift in Sources */ = {isa = PBXBuildFile; fileRef = E102B78F1E714F24007928E8 /* RecentSitesService.swift */; };
@@ -7178,6 +7179,7 @@
 		DC76668226FD9AC9009254DD /* TimeZoneTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeZoneTableViewCell.swift; sourceTree = "<group>"; };
 		DC8F61F627032B3F0087AC5D /* TimeZoneFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeZoneFormatter.swift; sourceTree = "<group>"; };
 		DC8F61FB2703321F0087AC5D /* TimeZoneFormatterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeZoneFormatterTests.swift; sourceTree = "<group>"; };
+		DCC662502810915D00962D0C /* BlogVideoLimitsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogVideoLimitsTests.swift; sourceTree = "<group>"; };
 		E100C6BA1741472F00AE48D8 /* WordPress-11-12.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = "WordPress-11-12.xcmappingmodel"; sourceTree = "<group>"; };
 		E10290731F30615A00DAC588 /* Role.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Role.swift; sourceTree = "<group>"; };
 		E102B78F1E714F24007928E8 /* RecentSitesService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentSitesService.swift; sourceTree = "<group>"; };
@@ -8327,6 +8329,7 @@
 				FF8CD624214184EE00A33A8D /* MediaAssetExporterTests.swift */,
 				08F8CD3A1EBD2D020049D0C0 /* MediaURLExporterTests.swift */,
 				08E77F461EE9D72F006F9515 /* MediaThumbnailExporterTests.swift */,
+				DCC662502810915D00962D0C /* BlogVideoLimitsTests.swift */,
 			);
 			name = Media;
 			sourceTree = "<group>";
@@ -19484,6 +19487,7 @@
 				73B6693A21CAD960008456C3 /* ErrorStateViewTests.swift in Sources */,
 				8BD34F0927D144FF005E931C /* BlogDashboardStateTests.swift in Sources */,
 				1759F1721FE017F20003EC81 /* QueueTests.swift in Sources */,
+				DCC662512810915D00962D0C /* BlogVideoLimitsTests.swift in Sources */,
 				3F1AD48123FC87A400BB1375 /* BlogDetailsViewController+MeButtonTests.swift in Sources */,
 				08F8CD3B1EBD2D020049D0C0 /* MediaURLExporterTests.swift in Sources */,
 				D81C2F6220F89632002AE1F1 /* EditCommentActionTests.swift in Sources */,

WordPress/WordPressTest/BlogVideoLimitsTests.swift

@@ -0,0 +1,60 @@
+import XCTest
+
+class BlogVideoLimitsTests: XCTestCase {
+
+    private var blog: Blog!
+    private var contextManager: TestContextManager!
+    private var context: NSManagedObjectContext!
+
+    override func setUpWithError() throws {
+        contextManager = TestContextManager()
+        context = contextManager.newDerivedContext()
+        blog = NSEntityDescription.insertNewObject(forEntityName: "Blog", into: context) as? Blog
+        blog.url = Constants.blogURL
+        blog.xmlrpc = Constants.blogURL
+    }
+
+    override func tearDownWithError() throws {
+        blog = nil
+    }
+
+    func testCanUploadAssetPaidPlan() throws {
+        // Given a blog
+        // When blog has a paid plan
+        blog.hasPaidPlan = true
+
+        // Then it can upload assets irrespective of allowance
+        XCTAssertTrue(blog.canUploadAsset(true))
+        XCTAssertTrue(blog.canUploadAsset(false))
+    }
+
+    func testCanUploadAssetWPCom() throws {
+        // Given a blog
+        // When blog is on WPCom and not paid
+        blog.isHostedAtWPcom = true
+        blog.hasPaidPlan = false
+
+        // Then it can upload assets when allowance not exceeded
+        XCTAssertTrue(blog.canUploadAsset(false))
+
+        // Then it cannot upload assets when allowance exceeded
+        XCTAssertFalse(blog.canUploadAsset(true))
+    }
+
+    func testCanUploadAssetSelfHosted() throws {
+        // Given a blog
+        // When blog is not on WPCom and not paid
+        blog.isHostedAtWPcom = false
+        blog.hasPaidPlan = false
+
+        // Then it can upload assets irrespective of allowance
+        XCTAssertTrue(blog.canUploadAsset(true))
+        XCTAssertTrue(blog.canUploadAsset(false))
+    }
+}
+
+private extension BlogVideoLimitsTests {
+    enum Constants {
+        static let blogURL: String = "http://wordpress.com"
+    }
+}