WriteValue should return undefined

servo · Nov 28, 2016 · 50a5639 · 50a5639
1 parent 4dbca05
commit 50a5639
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs
@@ -300,9 +300,8 @@ impl AsyncBluetoothListener for BluetoothRemoteGATTCharacteristic {
                 promise.resolve_native(promise_cx, &value);
             },
             BluetoothResponse::WriteValue(result) => {
-                let value = ByteString::new(result);
-                *self.value.borrow_mut() = Some(value.clone());
-                promise.resolve_native(promise_cx, &value);
+                *self.value.borrow_mut() = Some(ByteString::new(result));
+                promise.resolve_native(promise_cx, &());
             },
             BluetoothResponse::EnableNotification(_result) => {
                 promise.resolve_native(promise_cx, self);

diff --git a/components/script/dom/bluetoothremotegattdescriptor.rs b/components/script/dom/bluetoothremotegattdescriptor.rs
@@ -137,9 +137,8 @@ impl AsyncBluetoothListener for BluetoothRemoteGATTDescriptor {
                 promise.resolve_native(promise_cx, &value);
             },
             BluetoothResponse::WriteValue(result) => {
-                let value = ByteString::new(result);
-                *self.value.borrow_mut() = Some(value.clone());
-                promise.resolve_native(promise_cx, &value);
+                *self.value.borrow_mut() = Some(ByteString::new(result));
+                promise.resolve_native(promise_cx, &());
             },
             _ => promise.reject_error(promise_cx, Error::Type("Something went wrong...".to_owned())),
         }

diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html
@@ -13,6 +13,7 @@
     .then(device => device.gatt.connect())
     .then(gattServer => gattServer.getPrimaryService(generic_access.name))
     .then(service => service.getCharacteristic(device_name.name))
-    .then(characteristic => characteristic.writeValue(new Uint8Array(1)));
+    .then(characteristic => characteristic.writeValue(new Uint8Array(1)))
+    .then(result => assert_equals(result, undefined));
 }, 'A regular write request to a writable characteristic should succeed.');
 </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html
@@ -14,6 +14,7 @@
     .then(gattServer => gattServer.getPrimaryService(generic_access.name))
     .then(service => service.getCharacteristic(device_name.name))
     .then(characteristic => characteristic.getDescriptor(number_of_digitals.name))
-    .then(descriptor => descriptor.writeValue(new Uint8Array(1)));
+    .then(descriptor => descriptor.writeValue(new Uint8Array(1)))
+    .then(result => assert_equals(result, undefined));
 }, 'A regular write request to a writable descriptor should succeed.');
 </script>