removing @testable

LiveUI · Dec 18, 2020 · e93c058 · e93c058
1 parent 135d02e
commit e93c058
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ DerivedData/
 
 # End of https://www.gitignore.io/api/vapor
 /Package.resolved
+/.swiftpm
diff --git a/Sources/VaporTestTools/Extensions/Requests/HTTPRequest+Response.swift b/Sources/VaporTestTools/Extensions/Requests/HTTPRequest+Response.swift
@@ -7,7 +7,7 @@
 
 @_exported import Foundation
 @_exported import Vapor
-@_exported @testable import NIO
+@_exported import NIO
 
 
 extension TestableProperty where TestableType == HTTPRequest {

diff --git a/Sources/VaporTestTools/Extensions/Response tools/Response+Checks.swift b/Sources/VaporTestTools/Extensions/Response tools/Response+Checks.swift
@@ -6,8 +6,8 @@
 //
 
 import Foundation
-@testable import Vapor
-@testable import NIO
+import Vapor
+import NIO
 
 
 extension TestableProperty where TestableType: Response {

diff --git a/Sources/VaporTestTools/Extensions/Response tools/Response+Getters.swift b/Sources/VaporTestTools/Extensions/Response tools/Response+Getters.swift
@@ -6,8 +6,8 @@
 //
 
 import Foundation
-@testable import Vapor
-@testable import NIO
+import Vapor
+import NIO
 
 
 extension TestableProperty where TestableType: Response {
@@ -32,23 +32,21 @@ extension TestableProperty where TestableType: Response {
 
     /// Size of the content
     public var contentSize: Int? {
-        return element.content.container.http.body.data?.count
+        return contentString?.count   
     }
 
     /// Get content string. Maximum of 0.5Mb of text will be returned
     public var contentString: String? {
-        guard let data = try? element.content.container.http.body.consumeData(max: 500000, on: fakeRequest()).wait() else {
-            return nil
-        }
-        return String(data: data, encoding: .utf8)
+        return contentString(encoding: .utf8)
     }
 
     /// Get content string with encoding. Maximum of 0.5Mb of text will be returned
     public func contentString(encoding: String.Encoding) -> String? {
-        guard let data = try? element.content.container.http.body.consumeData(max: 500000, on: fakeRequest()).wait() else {
+        guard let data = try? element.http.body.consumeData(on: element).wait() else {
             return nil
         }
-        return String(data: data, encoding: encoding)
+        let string = String(data: data, encoding: encoding)
+        return string
     }
 
 }
diff --git a/Tests/VaporTestToolsTests/AppTests.swift b/Tests/VaporTestToolsTests/AppTests.swift
@@ -53,9 +53,9 @@ class GenericControllerTests: XCTestCase {
         res.testable.debug()
 
         XCTAssertTrue(res.testable.has(statusCode: .notFound), "Wrong status code")
-        XCTAssertFalse(res.testable.has(header: "Content-Type"), "Should not content type")
-        XCTAssertTrue(res.testable.has(contentLength: 9), "Wrong content length")
-        XCTAssertTrue(res.testable.has(content: "Not found"), "Incorrect content")
+        XCTAssertTrue(res.testable.has(header: "Content-Type"), "Should not content type")
+        XCTAssertTrue(res.testable.has(contentLength: 35), "Wrong content length")
+        XCTAssertTrue(res.testable.has(content: #"{"error":true,"reason":"Not Found"}"#), "Incorrect content")
     }
 
 }