From a350a86e6ff89f12f356c9f1a426c06a56402e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 18:10:03 +0100
Subject: [PATCH 1/2] style: Test calc() percentage position in serialization.

The spec issue was resolved.
---
 tests/wpt/mozilla/meta/MANIFEST.json                | 2 +-
 tests/wpt/mozilla/tests/css/calc-serialization.html | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index a52e0f9feb4..436141455ed 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -61697,7 +61697,7 @@
    "testharness"
   ],
   "css/calc-serialization.html": [
-   "628597eb36bf21a1ec982c7f6935ee7949c62044",
+   "d0bcbd402cb78e704dabc7f1665d40ba163e30eb",
    "testharness"
   ],
   "css/canvas_as_block_element_a.html": [
diff --git a/tests/wpt/mozilla/tests/css/calc-serialization.html b/tests/wpt/mozilla/tests/css/calc-serialization.html
index b423557a1b8..f92de7338d3 100644
--- a/tests/wpt/mozilla/tests/css/calc-serialization.html
+++ b/tests/wpt/mozilla/tests/css/calc-serialization.html
@@ -3,20 +3,15 @@
 <title>CSS Values and Units: calc() serialization.</title>
 <link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@mozilla.com">
 <link rel="help" href="https://drafts.csswg.org/css-values/#calc-serialize">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1731">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<!-- FIXME(emilio): Upstream when spec stops being under discussion -->
 <div id="content"></div>
 <script>
-
-// NOTE(emilio): This intentionally doesn't test for order of percentages
-// because of:
-//
-// https://github.com/w3c/csswg-drafts/issues/1731
-
 test(function() {
   // specified -> expected
   var values = {
+    "calc(10px + 1vmin + 10%)": "calc(10% + 10px + 1vmin)",
     "calc(10px + 1vmin)": "calc(10px + 1vmin)",
     "calc(10px + 1em)": "calc(1em + 10px)",
     "calc(1vmin - 10px)": "calc(-10px + 1vmin)",

From d45a8425afc296cbda8d6e47d55455a03f12532b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 1 Dec 2017 18:12:43 +0100
Subject: [PATCH 2/2] style: Upstream calc serialization test.

---
 tests/wpt/metadata/MANIFEST.json                       | 10 ++++++++++
 tests/wpt/mozilla/meta/MANIFEST.json                   | 10 ----------
 .../css/css-values}/calc-serialization.html            |  0
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename tests/wpt/{mozilla/tests/css => web-platform-tests/css/css-values}/calc-serialization.html (100%)

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 89e0a1b5f3a..5ecb57eac2e 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -303223,6 +303223,12 @@
      {}
     ]
    ],
+   "css/css-values/calc-serialization.html": [
+    [
+     "/css/css-values/calc-serialization.html",
+     {}
+    ]
+   ],
    "css/css-values/calc-unit-analysis.html": [
     [
      "/css/css-values/calc-unit-analysis.html",
@@ -503724,6 +503730,10 @@
    "080551c1bee3d7bf54dda2c3d5b7e5a9fbd8aed6",
    "reftest"
   ],
+  "css/css-values/calc-serialization.html": [
+   "d0bcbd402cb78e704dabc7f1665d40ba163e30eb",
+   "testharness"
+  ],
   "css/css-values/calc-unit-analysis.html": [
    "995e7d094cb02f142d28ff0ca7de9d98f9a298e3",
    "testharness"
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 436141455ed..1bd5d50b9b9 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -32567,12 +32567,6 @@
      {}
     ]
    ],
-   "css/calc-serialization.html": [
-    [
-     "/_mozilla/css/calc-serialization.html",
-     {}
-    ]
-   ],
    "css/css-position-3/position-sticky-get-bounding-client-rect.html": [
     [
      "/_mozilla/css/css-position-3/position-sticky-get-bounding-client-rect.html",
@@ -61696,10 +61690,6 @@
    "b9e77c824d0c96e51d51fb8f1e923d3ab67be027",
    "testharness"
   ],
-  "css/calc-serialization.html": [
-   "d0bcbd402cb78e704dabc7f1665d40ba163e30eb",
-   "testharness"
-  ],
   "css/canvas_as_block_element_a.html": [
    "668d93da2dab9722998cc7c5785c20e2ab9a1ced",
    "reftest"
diff --git a/tests/wpt/mozilla/tests/css/calc-serialization.html b/tests/wpt/web-platform-tests/css/css-values/calc-serialization.html
similarity index 100%
rename from tests/wpt/mozilla/tests/css/calc-serialization.html
rename to tests/wpt/web-platform-tests/css/css-values/calc-serialization.html