Auto merge of #14868 - bd339:iss14068, r=jdm

Fix loss of response type information in Fetch API

<!-- Please describe your changes on the following line: -->
Avoids mapping response types that are distinct according to [the spec](https://fetch.spec.whatwg.org/#concept-response-type) to fewer response types. Also updates test expectations to match that we now pass tests that check the response type.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14068

<!-- Either: -->
- [X] There are tests for these changes

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14868)
<!-- Reviewable:end -->

components/script/dom/xmlhttprequest.rs

@@ -854,8 +854,10 @@ impl XMLHttpRequest {
             Ok(meta) => match meta {
                 FetchMetadata::Unfiltered(m) => m,
                 FetchMetadata::Filtered { filtered, .. } => match filtered {
+                    FilteredMetadata::Basic(m) => m,
+                    FilteredMetadata::Cors(m) => m,
                     FilteredMetadata::Opaque => return Err(Error::Network),
-                    FilteredMetadata::Transparent(m) => m
+                    FilteredMetadata::OpaqueRedirect => return Err(Error::Network)
                 }
             },
             Err(_) => {

components/script/fetch.rs

@@ -135,18 +135,29 @@ impl FetchResponseListener for FetchContext {
                     promise.global().get_cx(),
                     Error::Type("Network error occurred".to_string()));
                 self.fetch_promise = Some(TrustedPromise::new(promise));
+                self.response_object.root().set_type(DOMResponseType::Error);
                 return;
             },
             // Step 4.2
             Ok(metadata) => {
                 match metadata {
-                    FetchMetadata::Unfiltered(m) =>
-                        fill_headers_with_metadata(self.response_object.root(), m),
+                    FetchMetadata::Unfiltered(m) => {
+                        fill_headers_with_metadata(self.response_object.root(), m);
+                        self.response_object.root().set_type(DOMResponseType::Default);
+                    },
                     FetchMetadata::Filtered { filtered, .. } => match filtered {
-                        FilteredMetadata::Transparent(m) =>
-                            fill_headers_with_metadata(self.response_object.root(), m),
+                        FilteredMetadata::Basic(m) => {
+                            fill_headers_with_metadata(self.response_object.root(), m);
+                            self.response_object.root().set_type(DOMResponseType::Basic);
+                        },
+                        FilteredMetadata::Cors(m) => {
+                            fill_headers_with_metadata(self.response_object.root(), m);
+                            self.response_object.root().set_type(DOMResponseType::Cors);
+                        },
                         FilteredMetadata::Opaque =>
                             self.response_object.root().set_type(DOMResponseType::Opaque),
+                        FilteredMetadata::OpaqueRedirect =>
+                            self.response_object.root().set_type(DOMResponseType::Opaqueredirect)
                     }
                 }
             }