Merge 6 integration test fixtures into one (#699)

Polymer · Apr 10, 2018 · e116b2c · e116b2c
1 parent b2ddb14
commit e116b2c
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 236 deletions.
diff --git a/test/fixtures/integration/hybrid/golden.json b/test/fixtures/integration/hybrid/golden.json
diff --git a/test/fixtures/integration/hybrid/test/tests.html b/test/fixtures/integration/hybrid/test/tests.html
diff --git a/test/fixtures/integration/hybrid/test/tests.js b/test/fixtures/integration/hybrid/test/tests.js
diff --git a/test/fixtures/integration/inline-js/golden.json b/test/fixtures/integration/inline-js/golden.json
diff --git a/test/fixtures/integration/inline-js/test/index.html b/test/fixtures/integration/inline-js/test/index.html
diff --git a/test/fixtures/integration/many-html/golden.json b/test/fixtures/integration/many-html/golden.json
diff --git a/test/fixtures/integration/many-html/test/index.html b/test/fixtures/integration/many-html/test/index.html
diff --git a/test/fixtures/integration/many-html/test/three.html b/test/fixtures/integration/many-html/test/three.html
diff --git a/test/fixtures/integration/many-js/golden.json b/test/fixtures/integration/many-js/golden.json
diff --git a/test/fixtures/integration/many-js/test/index.html b/test/fixtures/integration/many-js/test/index.html
diff --git a/test/fixtures/integration/many-js/test/three.js b/test/fixtures/integration/many-js/test/three.js
diff --git a/test/fixtures/integration/mixed-suites/golden.json b/test/fixtures/integration/mixed-suites/golden.json
@@ -0,0 +1,54 @@
+{
+  "passing": 10,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
+  "tests": {
+    "test/": {
+      "inline suite": {
+        "inline nested test": {
+          "state": "passing"
+        }
+      },
+      "inline test": {
+        "state": "passing"
+      },
+      "suite 1": {
+        "nested test 1": {
+          "state": "passing"
+        }
+      },
+      "test 1": {
+        "state": "passing"
+      },
+      "suite 2": {
+        "nested test 2": {
+          "state": "passing"
+        }
+      },
+      "test 2": {
+        "state": "passing"
+      }
+    },
+    "test/one.html": {
+      "suite 1": {
+        "nested test 1": {
+          "state": "passing"
+        }
+      },
+      "test 1": {
+        "state": "passing"
+      }
+    },
+    "test/two.html": {
+      "suite 2": {
+        "nested test 2": {
+          "state": "passing"
+        }
+      },
+      "test 2": {
+        "state": "passing"
+      }
+    }
+  }
+}
diff --git a/...xtures/integration/hybrid/test/index.html → .../integration/mixed-suites/test/index.html b/...xtures/integration/hybrid/test/index.html → .../integration/mixed-suites/test/index.html
@@ -8,7 +8,7 @@
 
 <body>
   <script>
-    WCT.loadSuites(['tests.html', 'tests.js']);
+    WCT.loadSuites(['one.html', 'two.html', 'one.js', 'two.js']);
 
     suite('inline suite', function () {
       test('inline nested test', function () { });
@@ -17,4 +17,4 @@
   </script>
 </body>
 
-</html>
+</html>
diff --git a/...tures/integration/many-html/test/one.html → ...es/integration/mixed-suites/test/one.html b/...tures/integration/many-html/test/one.html → ...es/integration/mixed-suites/test/one.html
diff --git a/.../fixtures/integration/many-js/test/one.js → ...ures/integration/mixed-suites/test/one.js b/.../fixtures/integration/many-js/test/one.js → ...ures/integration/mixed-suites/test/one.js
diff --git a/...tures/integration/many-html/test/two.html → ...es/integration/mixed-suites/test/two.html b/...tures/integration/many-html/test/two.html → ...es/integration/mixed-suites/test/two.html
diff --git a/.../fixtures/integration/many-js/test/two.js → ...ures/integration/mixed-suites/test/two.js b/.../fixtures/integration/many-js/test/two.js → ...ures/integration/mixed-suites/test/two.js
diff --git a/test/fixtures/integration/one-html/golden.json b/test/fixtures/integration/one-html/golden.json
diff --git a/test/fixtures/integration/one-html/test/index.html b/test/fixtures/integration/one-html/test/index.html
diff --git a/test/fixtures/integration/one-html/test/tests.html b/test/fixtures/integration/one-html/test/tests.html
diff --git a/test/fixtures/integration/one-js/golden.json b/test/fixtures/integration/one-js/golden.json
diff --git a/test/fixtures/integration/one-js/test/index.html b/test/fixtures/integration/one-js/test/index.html
diff --git a/test/fixtures/integration/one-js/test/tests.js b/test/fixtures/integration/one-js/test/tests.js