[Fetch API] Follow a body setting spec change on Request constructor.

LayoutTests/http/tests/fetch/script-tests/request.js

 if (self.importScripts) {
   importScripts('../resources/fetch-test-helpers.js');
 }
 
 var URL = 'https://www.example.com/test.html';
 
 test(function() {
     var headers = new Headers;
     headers.set('User-Agent', 'Mozilla/5.0');
     headers.set('Accept', 'text/html');
@@ skipping 255 matching lines @@
                       method);
       });
   }, 'Request: valid method names and normalize test');
 
 test(function() {
     var req = new Request(URL);
     assert_false(req.bodyUsed,
                  'Request should not be flagged as used if it has not been ' +
                  'consumed.');
     var req2 = new Request(req);
+    assert_false(req.bodyUsed,
+                'Request should not be flagged as used if it does not have' +
+                'body.');
+    assert_false(req2.bodyUsed,
+                 'Request should not be flagged as used if it has not been ' +
+                 'consumed.');
+  }, 'Request construction without body behavior regardning "bodyUsed"');
+
+test(function() {
+    var req = new Request(URL, {method: 'POST', body: 'hello'});
+    assert_false(req.bodyUsed,
+                 'Request should not be flagged as used if it has not been ' +
+                 'consumed.');
+    var req2 = new Request(req);
     assert_true(req.bodyUsed,
-                'Request should be flagged as used if it is used as a ' +
-                'construction argument of another Request.');
+                'Request should be flagged as used if it has been consumed.');
     assert_false(req2.bodyUsed,
                  'Request should not be flagged as used if it has not been ' +
                  'consumed.');
-    assert_throws(new TypeError(), function() { new Request(req); },
-                  'Request cannot be constructed with a request that has ' +
-                  'been flagged as used.');
-    assert_throws(new TypeError(), function() { req.clone(); },
-                  'Request.clone: If used flag is set, throw a TypeError.');
-  },
-  'Request construction behavior regarding "used" body flag and exceptions.');
+    // Now we can create a Request from |req|, because creating |req2| from
+    // |req| sets |req|'s body to null as specified.
+    var req3 = new Request(req);
+    assert_true(req.bodyUsed,
+                'Request should be flagged as used if it has been consumed.');
+  }, 'Request construction without body behavior regardning "bodyUsed"');
 
+test(function() {
+    var req = new Request(URL, {method: 'POST', body: 'hello'});
+    assert_false(req.bodyUsed,
+                 'Request should not be flagged as used if it has not been ' +
+                 'consumed.');
+    assert_throws(
+      {name: 'TypeError'},
+      function() { new Request(req, {method: 'GET'}); },
+      'A get request may not have body.');
+
+    assert_false(req.bodyUsed, 'After the GET case');
+
+    assert_throws(
+      {name: 'TypeError'},
+      function() { new Request(req, {method: 'CONNECT'}); },
+      'Request() with a forbidden method must throw.');
+
+    assert_false(req.bodyUsed, 'After the forbidden method case');
+
+    var req2 = new Request(req);
+    assert_true(req.bodyUsed,
+                'Request should be flagged as used if it has been consumed.');
+  }, 'Request construction failure should not set "bodyUsed"');
 
 // Spec: https://fetch.spec.whatwg.org/#dom-request
 // Step 21:
 // If request's method is `GET` or `HEAD`, throw a TypeError.
 promise_test(function() {
     var headers = new Headers;
     headers.set('Content-Language', 'ja');
     ['GET', 'HEAD'].forEach(function(method) {
         assert_throws(
           {name: 'TypeError'},
@@ skipping 183 matching lines @@
   }, 'MIME type for Blob');
 
 promise_test(function(t) {
     var req = new Request('http://localhost/',
                           {method: 'POST',
                            body: new Blob([''], {type: 'Text/Plain'})});
     return req.blob()
       .then(function(blob) {
           assert_equals(blob.type, 'text/plain');
           assert_equals(req.headers.get('Content-Type'), 'text/plain');
+// TODO(yhirano): Currently blob() calling sets |bodyUsed| parmanently. Fix it.
+//          return req.blob();

[hiroshige, 2015/04/17 09:29:06]

Shouldn't this be "return (new Request(req)).blob();"?

[yhirano, 2015/04/17 09:37:04]

Done.

+//        }).then(function() {
+//          assert_equals(blob.type, 'text/plain');
         });
   }, 'MIME type for Blob with non-empty type');
 
 promise_test(function(t) {
     var req = new Request('http://localhost/',
                           {method: 'POST', body: new FormData()});
     return req.blob()
       .then(function(blob) {
           assert_equals(blob.type.indexOf('multipart/form-data; boundary='),
                         0);
@@ skipping 69 matching lines @@
 
 // Tests for requests context.
 test(function() {
     var request = new Request('http://localhost/', {method: 'POST', body: ''});
     assert_equals(request.context, '',
                   'Request.context should be empty string ' +
                   'for synthetic Request object');
   }, 'RequestContext of a synthetic Request object');
 
 done();