Update writable streams for the latest spec changes

third_party/WebKit/LayoutTests/http/tests/streams/writable-streams/aborting.js

Index: third_party/WebKit/LayoutTests/http/tests/streams/writable-streams/aborting.js
diff --git a/third_party/WebKit/LayoutTests/http/tests/streams/writable-streams/aborting.js b/third_party/WebKit/LayoutTests/http/tests/streams/writable-streams/aborting.js
index 3cf207cc5b911f076bf761ca4aebf0cd7bf76a39..65881d111f158fe1915494056a10d31275accc96 100644
--- a/third_party/WebKit/LayoutTests/http/tests/streams/writable-streams/aborting.js
+++ b/third_party/WebKit/LayoutTests/http/tests/streams/writable-streams/aborting.js
@@ -9,6 +9,9 @@ if (self.importScripts) {
 const error1 = new Error('error1');
 error1.name = 'error1';
 
+const error2 = new Error('error2');
+error2.name = 'error2';
+
 promise_test(t => {
   const ws = new WritableStream({
     write() {
@@ -17,7 +20,7 @@ promise_test(t => {
   });
 
   const writer = ws.getWriter();
-  writer.write('a');
+  const writePromise = writer.write('a');
 
   const readyPromise = writer.ready;
 
@@ -25,7 +28,10 @@ promise_test(t => {
 
   assert_equals(writer.ready, readyPromise, 'the ready promise property should not change');
 
-  return promise_rejects(t, new TypeError(), readyPromise, 'the ready promise should reject with a TypeError');
+  return Promise.all([
+    promise_rejects(t, new TypeError(), readyPromise, 'the ready promise should reject with a TypeError'),
+    promise_rejects(t, new TypeError(), writePromise, 'the write() promise should reject with a TypeError')
+  ]);
 }, 'Aborting a WritableStream should cause the writer\'s unsettled ready promise to reject');
 
 promise_test(t => {
@@ -53,7 +59,7 @@ promise_test(t => {
   return promise_rejects(t, new TypeError(), writer.abort(), 'abort() should reject with a TypeError');
 }, 'abort() on a released writer rejects');
 
-promise_test(() => {
+promise_test(t => {
   const ws = recordingWritableStream();
 
   return delay(0)
@@ -61,29 +67,43 @@ promise_test(() => {
       const writer = ws.getWriter();
 
       writer.abort();
-      writer.write(1);
-      writer.write(2);
+
+      return Promise.all([
+        promise_rejects(t, new TypeError(), writer.write(1), 'write(1) must reject with a TypeError'),
+        promise_rejects(t, new TypeError(), writer.write(2), 'write(2) must reject with a TypeError')
+      ]);
     })
     .then(() => {
       assert_array_equals(ws.events, ['abort', undefined]);
     });
 }, 'Aborting a WritableStream immediately prevents future writes');
 
-promise_test(() => {
+promise_test(t => {
   const ws = recordingWritableStream();
+  const results = [];
 
   return delay(0)
     .then(() => {
       const writer = ws.getWriter();
 
-      writer.write(1);
-      writer.write(2);
-      writer.write(3);
-      writer.abort();
-      writer.write(4);
-      writer.write(5);
+      results.push(
+        writer.write(1),
+        promise_rejects(t, new TypeError(), writer.write(2), 'write(2) must reject with a TypeError'),
+        promise_rejects(t, new TypeError(), writer.write(3), 'write(3) must reject with a TypeError')
+      );
+
+      const abortPromise = writer.abort();
+
+      results.push(
+        promise_rejects(t, new TypeError(), writer.write(4), 'write(4) must reject with a TypeError'),
+        promise_rejects(t, new TypeError(), writer.write(5), 'write(5) must reject with a TypeError')
+      );
+
+      return abortPromise;
     }).then(() => {
       assert_array_equals(ws.events, ['write', 1, 'abort', undefined]);
+
+      return Promise.all(results);
     });
 }, 'Aborting a WritableStream prevents further writes after any that are in progress');
 
@@ -162,26 +182,36 @@ promise_test(t => {
   const ws = new WritableStream();
   const writer = ws.getWriter();
 
-  writer.close();
+  const closePromise = writer.close();
   writer.abort(error1);
 
-  return promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError');
+  return Promise.all([
+    promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError'),
+    promise_rejects(t, new TypeError(), closePromise, 'close() should reject with a TypeError')
+  ]);
 }, 'Closing but then immediately aborting a WritableStream causes the stream to error');
 
 promise_test(t => {
+  let resolveClose;
   const ws = new WritableStream({
     close() {
-      return new Promise(() => { }); // forever-pending
+      return new Promise(resolve => {
+        resolveClose = resolve;
+      });
     }
   });
   const writer = ws.getWriter();
 
-  writer.close();
+  const closePromise = writer.close();
 
   return delay(0).then(() => {
     writer.abort(error1);
-  })
-  .then(() => promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError'));
+    resolveClose();
+    return Promise.all([
+      promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError'),
+      closePromise
+    ]);
+  });
 }, 'Closing a WritableStream and aborting it while it closes causes the stream to error');
 
 promise_test(() => {
@@ -193,14 +223,25 @@ promise_test(() => {
   return delay(0).then(() => writer.abort());
 }, 'Aborting a WritableStream after it is closed is a no-op');
 
-test(() => {
-  const ws = recordingWritableStream();
+promise_test(t => {
+  // Cannot use recordingWritableStream since it always has an abort
+  let controller;
+  let closeArgs;
+  const ws = new WritableStream({
+    start(c) {
+      controller = c;
+    },
+    close(...args) {
+      closeArgs = args;
+    }
+  });
+
   const writer = ws.getWriter();
 
   writer.abort();
 
-  return writer.closed.then(() => {
-    assert_array_equals(ws.events, ['close']);
+  return promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError').then(() => {
+    assert_array_equals(closeArgs, [controller], 'close must have been called, with the controller as its argument');
   });
 }, 'WritableStream should call underlying sink\'s close if no abort is supplied');
 
@@ -220,4 +261,275 @@ promise_test(() => {
   return writer.abort().then(() => assert_true(thenCalled, 'then() should be called'));
 }, 'returning a thenable from abort() should work');
 
+promise_test(t => {
+  const ws = new WritableStream({
+    write() {
+      return flushAsyncEvents();
+    }
+  });
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const writePromise = writer.write('a');
+    writer.abort(error1);
+    let closedResolved = false;
+    return Promise.all([
+      writePromise.then(() => assert_false(closedResolved, '.closed should not resolve before write()')),
+      promise_rejects(t, new TypeError(), writer.closed, '.closed should reject').then(() => {
+        closedResolved = true;
+      })
+    ]);
+  });
+}, '.closed should not resolve before fulfilled write()');
+
+promise_test(t => {
+  const ws = new WritableStream({
+    write() {
+      return Promise.reject(error1);
+    }
+  });
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const writePromise = writer.write('a');
+    const abortPromise = writer.abort(error2);
+    let closedResolved = false;
+    return Promise.all([
+      promise_rejects(t, error1, writePromise, 'write() should reject')
+          .then(() => assert_false(closedResolved, '.closed should not resolve before write()')),
+      promise_rejects(t, error1, writer.closed, '.closed should reject')
+          .then(() => {
+            closedResolved = true;
+          }),
+      promise_rejects(t, error1, abortPromise, 'abort() should reject')]);
+  });
+}, '.closed should not resolve before rejected write(); write() error should overwrite abort() error');
+
+promise_test(t => {
+  const ws = new WritableStream({
+    write() {
+      return flushAsyncEvents();
+    }
+  }, new CountQueuingStrategy(4));
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const settlementOrder = [];
+    return Promise.all([
+      writer.write('1').then(() => settlementOrder.push(1)),
+      promise_rejects(t, new TypeError(), writer.write('2'), 'first queued write should be rejected')
+          .then(() => settlementOrder.push(2)),
+      promise_rejects(t, new TypeError(), writer.write('3'), 'second queued write should be rejected')
+          .then(() => settlementOrder.push(3)),
+      writer.abort(error1)
+    ]).then(() => assert_array_equals([1, 2, 3], settlementOrder, 'writes should be satisfied in order'));
+  });
+}, 'writes should be satisfied in order when aborting');
+
+promise_test(t => {
+  const ws = new WritableStream({
+    write() {
+      return Promise.reject(error1);
+    }
+  }, new CountQueuingStrategy(4));
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const settlementOrder = [];
+    return Promise.all([
+      promise_rejects(t, error1, writer.write('1'), 'pending write should be rejected')
+          .then(() => settlementOrder.push(1)),
+      promise_rejects(t, error1, writer.write('2'), 'first queued write should be rejected')
+          .then(() => settlementOrder.push(2)),
+      promise_rejects(t, error1, writer.write('3'), 'second queued write should be rejected')
+          .then(() => settlementOrder.push(3)),
+      promise_rejects(t, error1, writer.abort(error1), 'abort should be rejected')
+    ]).then(() => assert_array_equals([1, 2, 3], settlementOrder, 'writes should be satisfied in order'));
+  });
+}, 'writes should be satisfied in order after rejected write when aborting');
+
+promise_test(t => {
+  const ws = new WritableStream({
+    write() {
+      return Promise.reject(error1);
+    }
+  });
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    return Promise.all([
+      promise_rejects(t, error1, writer.write('a'), 'writer.write() should reject with error from underlying write()'),
+      promise_rejects(t, error1, writer.close(), 'writer.close() should reject with error from underlying write()'),
+      promise_rejects(t, error1, writer.abort(), 'writer.abort() should reject with error from underlying write()')
+    ]);
+  });
+}, 'close() should use error from underlying write() on abort');
+
+promise_test(() => {
+  let resolveWrite;
+  let abort_called = false;
+  const ws = new WritableStream({
+    write() {
+      return new Promise(resolve => {
+        resolveWrite = resolve;
+      });
+    },
+    abort() {
+      abort_called = true;
+    }
+  });
+
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    writer.write('a');
+    const abortPromise = writer.abort();
+    return flushAsyncEvents().then(() => {
+      assert_false(abort_called, 'abort should not be called while write is pending');
+      resolveWrite();
+      return abortPromise.then(() => assert_true(abort_called, 'abort should be called'));
+    });
+  });
+}, 'underlying abort() should not be called until underlying write() completes');
+
+promise_test(() => {
+  let resolveClose;
+  let abort_called = false;
+  const ws = new WritableStream({
+    close() {
+      return new Promise(resolve => {
+        resolveClose = resolve;
+      });
+    },
+    abort() {
+      abort_called = true;
+    }
+  });
+
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    writer.close();
+    const abortPromise = writer.abort();
+    return flushAsyncEvents().then(() => {
+      assert_false(abort_called, 'abort should not be called while close is pending');
+      resolveClose();
+      return abortPromise.then(() => assert_false(abort_called, 'abort should not be called after close completes'));
+    });
+  });
+}, 'underlying abort() should not be called if underlying close() has started');
+
+promise_test(t => {
+  let resolveWrite;
+  let abort_called = false;
+  const ws = new WritableStream({
+    write() {
+      return new Promise(resolve => {
+        resolveWrite = resolve;
+      });
+    },
+    abort() {
+      abort_called = true;
+    }
+  });
+
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    writer.write('a');
+    const closePromise = writer.close();
+    const abortPromise = writer.abort();
+    return flushAsyncEvents().then(() => {
+      assert_false(abort_called, 'abort should not be called while write is pending');
+      resolveWrite();
+      return abortPromise.then(() => {
+        assert_true(abort_called, 'abort should be called after write completes');
+        return promise_rejects(t, new TypeError(), closePromise, 'promise returned by close() should be rejected');
+      });
+    });
+  });
+}, 'underlying abort() should be called while closing if underlying close() has not started yet');
+
+promise_test(() => {
+  const ws = new WritableStream();
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const closePromise = writer.close();
+    const abortPromise = writer.abort();
+    let closeResolved = false;
+    Promise.all([
+      closePromise.then(() => { closeResolved = true; }),
+      abortPromise.then(() => { assert_true(closeResolved, 'close() promise should resolve before abort() promise'); })
+    ]);
+  });
+}, 'writer close() promise should resolve before abort() promise');
+
+promise_test(t => {
+  const ws = new WritableStream({
+    write(chunk, controller) {
+      controller.error(error1);
+      return new Promise(() => {});
+    }
+  });
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    writer.write('a');
+    return promise_rejects(t, error1, writer.ready, 'writer.ready should reject');
+  });
+}, 'writer.ready should reject on controller error without waiting for underlying write');
+
+promise_test(t => {
+  let resolveWrite;
+  const ws = new WritableStream({
+    write() {
+      return new Promise(resolve => {
+        resolveWrite = resolve;
+      });
+    }
+  });
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const writePromise = writer.write('a');
+    const closed = writer.closed;
+    const abortPromise = writer.abort();
+    writer.releaseLock();
+    resolveWrite();
+    return Promise.all([
+      writePromise,
+      abortPromise,
+      promise_rejects(t, new TypeError(), closed, 'closed should reject')]);
+  });
+}, 'releaseLock() while aborting should reject the original closed promise');
+
+promise_test(t => {
+  let resolveWrite;
+  let resolveAbort;
+  let resolveAbortStarted;
+  const abortStarted = new Promise(resolve => {
+    resolveAbortStarted = resolve;
+  });
+  const ws = new WritableStream({
+    write() {
+      return new Promise(resolve => {
+        resolveWrite = resolve;
+      });
+    },
+    abort() {
+      resolveAbortStarted();
+      return new Promise(resolve => {
+        resolveAbort = resolve;
+      });
+    }
+  });
+  const writer = ws.getWriter();
+  return writer.ready.then(() => {
+    const writePromise = writer.write('a');
+    const closed = writer.closed;
+    const abortPromise = writer.abort();
+    resolveWrite();
+    return abortStarted.then(() => {
+      writer.releaseLock();
+      assert_not_equals(writer.closed, closed, 'closed promise should have changed');
+      resolveAbort();
+      return Promise.all([
+        writePromise,
+        abortPromise,
+        promise_rejects(t, new TypeError(), closed, 'original closed should reject'),
+        promise_rejects(t, new TypeError(), writer.closed, 'new closed should reject')]);
+    });
+  });
+}, 'releaseLock() during delayed async abort() should create a new rejected closed promise');
+
 done();