aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2023-09-21 07:56:44 -0700
committerGravatar GitHub <noreply@github.com> 2023-09-21 07:56:44 -0700
commit0b4a34bbd6e07096212774759ca6e8a7f3922e46 (patch)
tree0957691439c490d65352a96096e3566f41683245 /src/bun.js
parentd1e9b33cac65794632921045e7a851c58ef1863d (diff)
downloadbun-0b4a34bbd6e07096212774759ca6e8a7f3922e46.tar.gz
bun-0b4a34bbd6e07096212774759ca6e8a7f3922e46.tar.zst
bun-0b4a34bbd6e07096212774759ca6e8a7f3922e46.zip
Fix test failures (#5862)
* Fix test failures * Fixes #5851 --------- Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src/bun.js')
-rw-r--r--src/bun.js/webcore/blob.zig12
-rw-r--r--src/bun.js/webcore/body.zig4
2 files changed, 4 insertions, 12 deletions
diff --git a/src/bun.js/webcore/blob.zig b/src/bun.js/webcore/blob.zig
index 49564c1fd..b0f1df935 100644
--- a/src/bun.js/webcore/blob.zig
+++ b/src/bun.js/webcore/blob.zig
@@ -2739,17 +2739,7 @@ pub const Blob = struct {
value: JSC.JSValue,
global: *JSGlobalObject,
) JSC.JSValue {
- if (value.isError()) {
- return JSC.JSPromise.rejectedPromiseValue(global, value);
- }
-
- if (value.jsType() == .JSPromise)
- return value;
-
- return JSPromise.resolvedPromiseValue(
- global,
- value,
- );
+ return JSC.JSPromise.wrap(global, value);
}
pub fn getText(
diff --git a/src/bun.js/webcore/body.zig b/src/bun.js/webcore/body.zig
index 621acc0b3..bbdf21d5d 100644
--- a/src/bun.js/webcore/body.zig
+++ b/src/bun.js/webcore/body.zig
@@ -1136,7 +1136,9 @@ pub fn BodyMixin(comptime Type: type) type {
}
var blob = value.useAsAnyBlobAllowNonUTF8String();
- return JSC.JSPromise.wrap(globalObject, blob.toJSON(globalObject, .share));
+ const result = blob.toJSON(globalObject, .share);
+
+ return JSC.JSPromise.wrap(globalObject, result);
}
fn handleBodyAlreadyUsed(globalObject: *JSC.JSGlobalObject) JSValue {