Changeset 47512

Timestamp:

03/27/2020 12:16:58 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Update QUnit and Sinon to the latest versions.

Update JS tests per the QUnit 2.x Upgrade Guide.

Fixes #37117.

Location:

trunk

Files:

• package-lock.json (modified) (101 diffs)
• package.json (modified) (1 diff)
• tests/qunit/index.html (modified) (1 diff)
• tests/qunit/vendor (deleted)
• tests/qunit/wp-admin/js/customize-base.js (modified) (10 diffs)
• tests/qunit/wp-admin/js/customize-controls-utils.js (modified) (5 diffs)
• tests/qunit/wp-admin/js/customize-controls.js (modified) (20 diffs)
• tests/qunit/wp-admin/js/customize-header.js (modified) (9 diffs)
• tests/qunit/wp-admin/js/customize-nav-menus.js (modified) (6 diffs)
• tests/qunit/wp-admin/js/customize-widgets.js (modified) (3 diffs)
• tests/qunit/wp-admin/js/nav-menu.js (modified) (1 diff)
• tests/qunit/wp-admin/js/password-strength-meter.js (modified) (4 diffs)
• tests/qunit/wp-admin/js/widgets/test-media-gallery-widget.js (modified) (1 diff)
• tests/qunit/wp-admin/js/widgets/test-media-image-widget.js (modified) (5 diffs)
• tests/qunit/wp-admin/js/widgets/test-media-video-widget.js (modified) (3 diffs)
• tests/qunit/wp-admin/js/widgets/test-media-widgets.js (modified) (2 diffs)
• tests/qunit/wp-includes/js/shortcode.js (modified) (5 diffs)
• tests/qunit/wp-includes/js/tinymce/tinymce-obsolete.js (modified) (4 diffs)
• tests/qunit/wp-includes/js/wp-api.js (modified) (5 diffs)

trunk/package-lock.json

@@ -1831 +1831 @@
             "optional": true
         },
+        "@sinonjs/commons": {
+            "version": "1.7.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz",
+            "integrity": "sha512-Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==",
+            "dev": true,
+            "requires": {
+                "type-detect": "4.0.8"
+            }
+        },
+        "@sinonjs/fake-timers": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz",
+            "integrity": "sha512-atR1J/jRXvQAb47gfzSK8zavXy7BcpnYq21ALon0U99etu99vsir0trzIO3wpeLtW+LLVY6X7EkfVTbjGSH8Ww==",
+            "dev": true,
+            "requires": {
+                "@sinonjs/commons": "^1.7.0"
+            }
+        },
+        "@sinonjs/formatio": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz",
+            "integrity": "sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==",
+            "dev": true,
+            "requires": {
+                "@sinonjs/commons": "^1",
+                "@sinonjs/samsam": "^5.0.2"
+            }
+        },
+        "@sinonjs/samsam": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.0.3.tgz",
+            "integrity": "sha512-QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==",
+            "dev": true,
+            "requires": {
+                "@sinonjs/commons": "^1.6.0",
+                "lodash.get": "^4.4.2",
+                "type-detect": "^4.0.8"
+            }
+        },
+        "@sinonjs/text-encoding": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
+            "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+            "dev": true
+        },
         "@tannin/compile": {
             "version": "1.1.0",
@@ -4590 +4635 @@
                     "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "p-finally": "^1.0.0"
@@ -4635 +4679 @@
             "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "readable-stream": "^2.3.5",
@@ -4928 +4971 @@
             "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "buffer-alloc-unsafe": "^1.1.0",
@@ -4938 +4980 @@
             "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
             "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "buffer-crc32": {
@@ -4945 +4986 @@
             "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
             "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "buffer-fill": {
@@ -4952 +4992 @@
             "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
             "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "buffer-from": {
@@ -5213 +5252 @@
             "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "get-proxy": "^2.0.0",
@@ -5348 +5386 @@
                 },
                 "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
                     "dev": true
                 },
@@ -5788 +5826 @@
             "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "ini": "^1.3.4",
@@ -6479 +6516 @@
                 },
                 "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
                     "dev": true
                 },
@@ -6554 +6591 @@
             "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "decompress-tar": "^4.0.0",
@@ -6571 +6607 @@
                     "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "pify": "^3.0.0"
@@ -6580 +6615 @@
                             "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
                             "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                            "dev": true,
-                            "optional": true
+                            "dev": true
                         }
                     }
@@ -6589 +6623 @@
                     "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                     "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -6599 +6632 @@
             "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "mimic-response": "^1.0.0"
@@ -6609 +6641 @@
             "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "file-type": "^5.2.0",
@@ -6620 +6651 @@
                     "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
                     "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -6630 +6660 @@
             "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "decompress-tar": "^4.1.0",
@@ -6643 +6672 @@
                     "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
                     "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -6653 +6681 @@
             "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "decompress-tar": "^4.1.1",
@@ -6664 +6691 @@
                     "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
                     "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -6674 +6700 @@
             "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "file-type": "^3.8.0",
@@ -6687 +6712 @@
                     "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "pend": "~1.2.0"
@@ -6696 +6720 @@
                     "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
                     "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "get-stream": {
@@ -6704 +6727 @@
                     "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "object-assign": "^4.0.1",
@@ -6714 +6736 @@
                     "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                     "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "yauzl": {
@@ -6722 +6743 @@
                     "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "buffer-crc32": "~0.2.3",
@@ -6901 +6921 @@
                 },
                 "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+                    "version": "6.0.3",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                    "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                     "dev": true
                 }
@@ -7228 +7248 @@
                     "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
                     "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -7261 +7280 @@
             "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
             "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "duplexify": {
@@ -8253 +8271 @@
             "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "cross-spawn": "^5.0.1",
@@ -8416 +8433 @@
             "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "mime-db": "^1.28.0"
@@ -8426 +8442 @@
             "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "ext-list": "^2.0.0",
@@ -8697 +8712 @@
             "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
             "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "filenamify": {
@@ -8705 +8719 @@
             "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "filename-reserved-regex": "^2.0.0",
@@ -9098 +9111 @@
             "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
             "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "fs-exists-sync": {
@@ -9155 +9167 @@
                     "version": "2.1.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "aproba": {
@@ -9177 +9188 @@
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "brace-expansion": {
@@ -9184 +9194 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
@@ -9199 +9208 @@
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "core-util-is": {
@@ -9329 +9335 @@
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "ini": {
@@ -9342 +9347 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
@@ -9357 +9361 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
@@ -9365 +9368 @@
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "minipass": {
@@ -9372 +9374 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
@@ -9391 +9392 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
@@ -9472 +9472 @@
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "object-assign": {
@@ -9485 +9484 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "wrappy": "1"
@@ -9571 +9569 @@
                     "version": "5.1.2",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "safer-buffer": {
@@ -9608 +9605 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
@@ -9628 +9624 @@
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
@@ -9672 +9667 @@
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "yallist": {
                     "version": "3.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -9848 +9841 @@
             "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "npm-conf": "^1.1.0"
@@ -9871 +9863 @@
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
             "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "get-value": {
@@ -10257 +10248 @@
             "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
             "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "gradient-parser": {
@@ -11009 +10999 @@
             "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
             "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "has-symbols": {
@@ -11022 +11011 @@
             "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "has-symbol-support-x": "^1.4.1"
@@ -12148 +12136 @@
             "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
             "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "is-number": {
@@ -12176 +12163 @@
             "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
             "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "is-path-cwd": {
@@ -12254 +12240 @@
             "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
             "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "is-stream": {
@@ -12486 +12471 @@
             "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "has-to-string-tag-x": "^1.2.0",
@@ -13797 +13781 @@
             "resolved": "https://registry.npmjs.org/js-polyfills/-/js-polyfills-0.1.42.tgz",
             "integrity": "sha1-XUhJArNh489gH9I60PMLr8yT8Ug="
+        },
+        "js-reporters": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/js-reporters/-/js-reporters-1.2.1.tgz",
+            "integrity": "sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs=",
+            "dev": true
         },
         "js-tokens": {
@@ -14102 +14092 @@
             }
         },
+        "just-extend": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz",
+            "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==",
+            "dev": true
+        },
         "kew": {
             "version": "0.7.0",
@@ -14281 +14277 @@
                 },
                 "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
                     "dev": true
                 }
@@ -14326 +14322 @@
             "dev": true
         },
+        "lodash.get": {
+            "version": "4.4.2",
+            "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+            "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+            "dev": true
+        },
         "lodash.isequal": {
             "version": "4.5.0",
@@ -14477 +14479 @@
             "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
             "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "lpad-align": {
@@ -14515 +14516 @@
                     "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                     "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "indent-string": {
@@ -14523 +14523 @@
                     "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "repeating": "^2.0.0"
@@ -14532 +14531 @@
                     "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
                     "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "meow": {
@@ -14555 +14553 @@
                 },
                 "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
                     "dev": true,
                     "optional": true
@@ -14996 +14994 @@
             "dependencies": {
                 "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+                    "version": "6.0.3",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                    "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                     "dev": true
                 }
@@ -15044 +15042 @@
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
             "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "min-indent": {
@@ -15264 +15261 @@
             "dependencies": {
                 "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+                    "version": "6.0.3",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                    "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                     "dev": true
                 }
@@ -15318 +15315 @@
             "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
             "dev": true
+        },
+        "nise": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.3.tgz",
+            "integrity": "sha512-EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==",
+            "dev": true,
+            "requires": {
+                "@sinonjs/commons": "^1.7.0",
+                "@sinonjs/fake-timers": "^6.0.0",
+                "@sinonjs/text-encoding": "^0.7.1",
+                "just-extend": "^4.0.2",
+                "path-to-regexp": "^1.7.0"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "0.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+                    "dev": true
+                },
+                "path-to-regexp": {
+                    "version": "1.8.0",
+                    "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+                    "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+                    "dev": true,
+                    "requires": {
+                        "isarray": "0.0.1"
+                    }
+                }
+            }
         },
         "node-fetch": {
@@ -15518 +15545 @@
                 },
                 "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
                     "dev": true
                 },
@@ -15550 +15577 @@
             }
         },
+        "node-watch": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.6.1.tgz",
+            "integrity": "sha512-gwQiR7weFRV8mAtT0x0kXkZ18dfRLB45xH7q0hCOVQMLfLb2f1ZaSvR57q4/b/Vj6B0RwMNJYbvb69e1yM7qEA==",
+            "dev": true
+        },
         "nopt": {
             "version": "3.0.6",
@@ -15600 +15633 @@
             "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "config-chain": "^1.1.11",
@@ -15610 +15642 @@
                     "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
                     "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
@@ -16347 +16378 @@
             "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "p-finally": "^1.0.0"
@@ -17519 +17549 @@
             "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
             "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "proxy-addr": {
@@ -17712 +17741 @@
             "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
             "dev": true
+        },
+        "qunit": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.9.3.tgz",
+            "integrity": "sha512-RH4VYSaVsNRDthMFFboTJAJ8q4kJM5LvOqWponKUYPEAeOcmc/YFV1QsZ7ikknA3TjqliWFJYEV63vvVXaALmQ==",
+            "dev": true,
+            "requires": {
+                "commander": "2.12.2",
+                "js-reporters": "1.2.1",
+                "minimatch": "3.0.4",
+                "node-watch": "0.6.1",
+                "resolve": "1.9.0"
+            },
+            "dependencies": {
+                "commander": {
+                    "version": "2.12.2",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+                    "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+                    "dev": true
+                },
+                "resolve": {
+                    "version": "1.9.0",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz",
+                    "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==",
+                    "dev": true,
+                    "requires": {
+                        "path-parse": "^1.0.6"
+                    }
+                }
+            }
         },
         "raf": {
@@ -19005 +19064 @@
             "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "commander": "~2.8.1"
@@ -19015 +19073 @@
                     "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "graceful-readlink": ">= 1.0.0"
@@ -19363 +19420 @@
             }
         },
+        "sinon": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.0.1.tgz",
+            "integrity": "sha512-iTTyiQo5T94jrOx7X7QLBZyucUJ2WvL9J13+96HMfm2CGoJYbIPqRfl6wgNcqmzk0DI28jeGx5bUTXizkrqBmg==",
+            "dev": true,
+            "requires": {
+                "@sinonjs/commons": "^1.7.0",
+                "@sinonjs/fake-timers": "^6.0.0",
+                "@sinonjs/formatio": "^5.0.1",
+                "@sinonjs/samsam": "^5.0.3",
+                "diff": "^4.0.2",
+                "nise": "^4.0.1",
+                "supports-color": "^7.1.0"
+            },
+            "dependencies": {
+                "diff": {
+                    "version": "4.0.2",
+                    "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+                    "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+                    "dev": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "sinon-test": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/sinon-test/-/sinon-test-3.0.0.tgz",
+            "integrity": "sha512-k2V042JwIS6SC3M8Ih3Uo6+6mlL5FKqvvobxoWQobFkACr61WpyAMKsfqXecLL+DrDD3s9T+eYSZdVQzMH1pkA==",
+            "dev": true
+        },
         "sisteransi": {
             "version": "1.0.5",
@@ -19559 +19660 @@
             "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-plain-obj": "^1.0.0"
@@ -19569 +19669 @@
             "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "sort-keys": "^1.0.0"
@@ -20195 +20294 @@
             "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-natural-number": "^4.0.1"
@@ -20226 +20324 @@
             "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "escape-string-regexp": "^1.0.2"
@@ -20866 +20963 @@
             "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "bl": "^1.0.0",
@@ -20881 +20977 @@
             "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
             "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "tempfile": {
@@ -20889 +20984 @@
             "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "temp-dir": "^1.0.0",
@@ -21049 +21143 @@
             "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
             "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "timers-browserify": {
@@ -21133 +21226 @@
             "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
             "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "to-fast-properties": {
@@ -21266 +21358 @@
             "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "escape-string-regexp": "^1.0.2"
@@ -21391 +21482 @@
             }
         },
+        "type-detect": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+            "dev": true
+        },
         "type-fest": {
             "version": "0.8.1",
@@ -21488 +21585 @@
             "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "buffer": "^5.2.1",
@@ -21499 +21595 @@
                     "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "base64-js": "^1.0.2",
@@ -21799 +21894 @@
             "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
             "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "use": {
@@ -21986 +22080 @@
                 },
                 "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
                     "dev": true
                 }
@@ -22128 +22222 @@
             "dependencies": {
                 "acorn": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-                    "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+                    "version": "6.4.1",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+                    "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
                     "dev": true
                 },

trunk/package.json

@@ -64 +64 @@
         "matchdep": "~2.0.0",
         "node-sass": "~4.13.1",
+        "qunit": "~2.9.0",
+        "sinon": "~9.0.0",
+        "sinon-test": "~3.0.0",
         "source-map-loader": "^0.2.4",
         "uglify-js": "^3.6.0",

trunk/tests/qunit/index.html

@@ -57 +57 @@
 
         <!-- QUnit -->
-        <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
-        <script src="vendor/qunit.js"></script>
-        <script src="vendor/sinon.js"></script>
-        <script src="vendor/sinon-qunit.js"></script>
-        <script>QUnit.config.hidepassed = false;</script>
+        <link rel="stylesheet" href="../../node_modules/qunit/qunit/qunit.css" type="text/css" media="screen" />
+        <script src="../../node_modules/qunit/qunit/qunit.js"></script>
+        <script src="../../node_modules/sinon/pkg/sinon.js"></script>
+        <script src="../../node_modules/sinon-test/dist/sinon-test.js"></script>
+        <script>
+            var qTest = QUnit.test, sTest = sinonTest( sinon );
+
+            QUnit.config.hidepassed = false;
+
+            QUnit.test = function( testName, callback ) {
+                return qTest( testName, sTest(callback) );
+            };
+        </script>
     </head>
     <body>

trunk/tests/qunit/wp-admin/js/customize-base.js

@@ -1 @@
-/* global wp, test, ok, equal, module */
+/* global wp */
 
 jQuery( function( $ ) {
@@ -5 +5 @@
     firstInitialValue, firstValueInstance, valuesInstance, wasCallbackFired, mockValueCallback;
 
-    module( 'Customize Base: Class' );
+    QUnit.module( 'Customize Base: Class' );
 
     FooSuperClass = wp.customize.Class.extend(
         {
-            initialize: function ( instanceProps ) {
+            initialize: function( instanceProps ) {
                 $.extend( this, instanceProps || {} );
             },
@@ -18 +18 @@
         }
     );
-    test( 'FooSuperClass is a function ', function () {
-        equal( typeof FooSuperClass, 'function' );
-    });
-    test( 'FooSuperClass prototype has protoProp', function () {
-        equal( FooSuperClass.prototype.protoProp, 'protoPropValue' );
-    });
-    test( 'FooSuperClass does not have protoProp', function () {
-        equal( typeof FooSuperClass.protoProp, 'undefined' );
-    });
-    test( 'FooSuperClass has staticProp', function () {
-        equal( FooSuperClass.staticProp, 'staticPropValue' );
-    });
-    test( 'FooSuperClass prototype does not have staticProp', function () {
-        equal( typeof FooSuperClass.prototype.staticProp, 'undefined' );
+    QUnit.test( 'FooSuperClass is a function', function( assert ) {
+        assert.equal( typeof FooSuperClass, 'function' );
+    });
+    QUnit.test( 'FooSuperClass prototype has protoProp', function( assert ) {
+        assert.equal( FooSuperClass.prototype.protoProp, 'protoPropValue' );
+    });
+    QUnit.test( 'FooSuperClass does not have protoProp', function( assert ) {
+        assert.equal( typeof FooSuperClass.protoProp, 'undefined' );
+    });
+    QUnit.test( 'FooSuperClass has staticProp', function( assert ) {
+        assert.equal( FooSuperClass.staticProp, 'staticPropValue' );
+    });
+    QUnit.test( 'FooSuperClass prototype does not have staticProp', function( assert ) {
+        assert.equal( typeof FooSuperClass.prototype.staticProp, 'undefined' );
     });
 
     foo = new FooSuperClass( { instanceProp: 'instancePropValue' } );
-    test( 'FooSuperClass instance foo extended Class', function () {
-        equal( foo.extended( wp.customize.Class ), true );
-    });
-    test( 'foo instance has protoProp', function () {
-        equal( foo.protoProp, 'protoPropValue' );
-    });
-    test( 'foo instance does not have staticProp', function () {
-        equal( typeof foo.staticProp, 'undefined' );
-    });
-    test( 'FooSuperClass instance foo ran initialize() and has supplied instanceProp', function () {
-        equal( foo.instanceProp, 'instancePropValue' );
+    QUnit.test( 'FooSuperClass instance foo extended Class', function( assert ) {
+        assert.equal( foo.extended( wp.customize.Class ), true );
+    });
+    QUnit.test( 'foo instance has protoProp', function( assert ) {
+        assert.equal( foo.protoProp, 'protoPropValue' );
+    });
+    QUnit.test( 'foo instance does not have staticProp', function( assert ) {
+        assert.equal( typeof foo.staticProp, 'undefined' );
+    });
+    QUnit.test( 'FooSuperClass instance foo ran initialize() and has supplied instanceProp', function( assert ) {
+        assert.equal( foo.instanceProp, 'instancePropValue' );
     });
 
@@ -51 +51 @@
     // @todo Do we test object.instance?
 
-    module( 'Customize Base: Subclass' );
+    QUnit.module( 'Customize Base: Subclass' );
 
     BarSubClass = FooSuperClass.extend(
@@ -65 +65 @@
         }
     );
-    test( 'BarSubClass prototype has subProtoProp', function () {
-        equal( BarSubClass.prototype.subProtoProp, 'subProtoPropValue' );
-    });
-    test( 'BarSubClass prototype has parent FooSuperClass protoProp', function () {
-        equal( BarSubClass.prototype.protoProp, 'protoPropValue' );
+    QUnit.test( 'BarSubClass prototype has subProtoProp', function( assert ) {
+        assert.equal( BarSubClass.prototype.subProtoProp, 'subProtoPropValue' );
+    });
+    QUnit.test( 'BarSubClass prototype has parent FooSuperClass protoProp', function( assert ) {
+        assert.equal( BarSubClass.prototype.protoProp, 'protoPropValue' );
     });
 
     bar = new BarSubClass( { instanceProp: 'instancePropValue' } );
-    test( 'BarSubClass instance bar its initialize() and parent initialize() run', function () {
-        equal( bar.instanceProp, 'instancePropValue' );
-        equal( bar.subInstanceProp, 'subInstancePropValue' );
-    });
-
-    test( 'BarSubClass instance bar extended FooSuperClass', function () {
-        equal( bar.extended( FooSuperClass ), true );
+    QUnit.test( 'BarSubClass instance bar its initialize() and parent initialize() run', function( assert ) {
+        assert.equal( bar.instanceProp, 'instancePropValue' );
+        assert.equal( bar.subInstanceProp, 'subInstancePropValue' );
+    });
+
+    QUnit.test( 'BarSubClass instance bar extended FooSuperClass', function( assert ) {
+        assert.equal( bar.extended( FooSuperClass ), true );
     });
 
 
     // Implements todo: Test Class.constructor() manipulation.
-    module( 'Customize Base: Constructor Manipulation' );
+    QUnit.module( 'Customize Base: Constructor Manipulation' );
 
     newConstructor = function ( instanceProps ) {
@@ -100 +100 @@
     );
 
-    test( 'New constructor added to class' , function () {
-        equal( ConstructorTestClass.prototype.constructor , newConstructor );
-    });
-    test( 'Class with new constructor has protoPropValue' , function () {
-        equal( ConstructorTestClass.prototype.protoProp , 'protoPropValue' );
+    QUnit.test( 'New constructor added to class', function( assert ) {
+        assert.equal( ConstructorTestClass.prototype.constructor , newConstructor );
+    });
+    QUnit.test( 'Class with new constructor has protoPropValue', function( assert ) {
+        assert.equal( ConstructorTestClass.prototype.protoProp , 'protoPropValue' );
     });
 
     constructorTest = new ConstructorTestClass( { instanceProp: 'instancePropValue' } );
-        test( 'ConstructorTestClass instance constructorTest has the new constructor', function () {
-        equal( constructorTest.constructor, newConstructor );
-    });
-
-    test( 'ConstructorTestClass instance constructorTest extended Class', function () {
-        equal( constructorTest.extended( wp.customize.Class ), true );
-    });
-
-    test( 'ConstructorTestClass instance constructorTest has the added instance property', function () {
-        equal( constructorTest.instanceProp , 'instancePropValue' );
-    });
-
-
-    module( 'Customize Base: wp.customizer.ensure' );
+        QUnit.test( 'ConstructorTestClass instance constructorTest has the new constructor', function( assert ) {
+        assert.equal( constructorTest.constructor, newConstructor );
+    });
+
+    QUnit.test( 'ConstructorTestClass instance constructorTest extended Class', function( assert ) {
+        assert.equal( constructorTest.extended( wp.customize.Class ), true );
+    });
+
+    QUnit.test( 'ConstructorTestClass instance constructorTest has the added instance property', function( assert ) {
+        assert.equal( constructorTest.instanceProp , 'instancePropValue' );
+    });
+
+
+    QUnit.module( 'Customize Base: wp.customizer.ensure' );
 
     $mockElement = $( '<div id="mockElement"></div>' );
 
-    test( 'Handles jQuery argument' , function() {
-        equal( wp.customize.ensure( $mockElement ) , $mockElement );
+    QUnit.test( 'Handles jQuery argument', function( assert ) {
+        assert.equal( wp.customize.ensure( $mockElement ) , $mockElement );
     });
 
     mockString = '<div class="mockString"></div>';
 
-    test( 'Handles string argument' , function() {
-        ok( wp.customize.ensure( mockString ) instanceof jQuery );
-    });
-
-
-    module( 'Customize Base: Value Class' );
+    QUnit.test( 'Handles string argument', function( assert ) {
+        assert.ok( wp.customize.ensure( mockString ) instanceof jQuery );
+    });
+
+
+    QUnit.module( 'Customize Base: Value Class' );
 
     firstInitialValue = true;
     firstValueInstance = new wp.customize.Value( firstInitialValue );
 
-    test( 'Initialized with the right value' , function() {
-        equal( firstValueInstance.get() , firstInitialValue );
-    });
-
-    test( '.set() works' , function() {
+    QUnit.test( 'Initialized with the right value', function( assert ) {
+        assert.equal( firstValueInstance.get() , firstInitialValue );
+    });
+
+    QUnit.test( '.set() works', function( assert ) {
         firstValueInstance.set( false );
-        equal( firstValueInstance.get() , false );
-    });
-
-    test( '.bind() adds new callback that fires on set()' , function() {
+        assert.equal( firstValueInstance.get() , false );
+    });
+
+    QUnit.test( '.bind() adds new callback that fires on set()', function( assert ) {
         wasCallbackFired = false;
         mockValueCallback = function() {
@@ -157 +157 @@
         firstValueInstance.bind( mockValueCallback );
         firstValueInstance.set( 'newValue' );
-        ok( wasCallbackFired );
-    });
-
-    module( 'Customize Base: Values Class' );
+        assert.ok( wasCallbackFired );
+    });
+
+    QUnit.module( 'Customize Base: Values Class' );
 
     valuesInstance = new wp.customize.Values();
 
-    test( 'Correct events are triggered when adding to or removing from Values collection', function() {
+    QUnit.test( 'Correct events are triggered when adding to or removing from Values collection', function( assert ) {
         var hasFooOnAdd = false,
             hasFooOnRemove = false,
@@ -180 +180 @@
         } );
         valuesInstance.add( 'foo', fooValue );
-        ok( hasFooOnAdd );
-        equal( valuePassedToAdd.get(), fooValue.get() );
+        assert.ok( hasFooOnAdd );
+        assert.equal( valuePassedToAdd.get(), fooValue.get() );
 
         // Test events when removing the value.
@@ -195 +195 @@
         } );
         valuesInstance.remove( 'foo' );
-        ok( hasFooOnRemove );
-        equal( valuePassedToRemove.get(), fooValue.get() );
-        ok( ! hasFooOnRemoved );
-        equal( valuePassedToRemoved.get(), fooValue.get() );
+        assert.ok( hasFooOnRemove );
+        assert.equal( valuePassedToRemove.get(), fooValue.get() );
+        assert.ok( ! hasFooOnRemoved );
+        assert.equal( valuePassedToRemoved.get(), fooValue.get() );
 
         // Confirm no events are fired when nonexistent value is removed.
         wasEventFiredOnRemoval = false;
         valuesInstance.remove( 'bar' );
-        ok( ! wasEventFiredOnRemoval );
-    });
-
-    module( 'Customize Base: Notification' );
-    test( 'Notification object exists and has expected properties', function ( assert ) {
+        assert.ok( ! wasEventFiredOnRemoval );
+    });
+
+    QUnit.module( 'Customize Base: Notification' );
+    QUnit.test( 'Notification object exists and has expected properties', function ( assert ) {
         var notification = new wp.customize.Notification( 'mycode', {
             'message': 'Hello World',
@@ -232 +232 @@
     } );
 
-    module( 'Customize Base: utils.parseQueryString' );
-    test( 'wp.customize.utils.parseQueryString works', function( assert ) {
+    QUnit.module( 'Customize Base: utils.parseQueryString' );
+    QUnit.test( 'wp.customize.utils.parseQueryString works', function( assert ) {
         var queryParams;
         queryParams = wp.customize.utils.parseQueryString( 'a=1&b=2' );

trunk/tests/qunit/wp-admin/js/customize-controls-utils.js

@@ -5 +5 @@
         BubbleTester, BubbleTesterTwoValues, bubbleTesterParent, firstBubbleTester, secondBubbleTester;
 
-    module( 'Customizer Model Utility functions' );
+    QUnit.module( 'Customizer Model Utility functions' );
 
     trueMockEvent = {
@@ -17 +17 @@
     };
 
-    test( 'isKeydownButNotEnterEvent returns true' , function () {
-        ok( wp.customize.utils.isKeydownButNotEnterEvent( trueMockEvent ) );
+    QUnit.test( 'isKeydownButNotEnterEvent returns true', function( assert ) {
+        assert.ok( wp.customize.utils.isKeydownButNotEnterEvent( trueMockEvent ) );
     });
 
-    test( 'isKeydownButNotEnterEvent returns false' , function () {
-        equal( wp.customize.utils.isKeydownButNotEnterEvent( falseMockEvent ) , false );
+    QUnit.test( 'isKeydownButNotEnterEvent returns false', function( assert ) {
+        assert.equal( wp.customize.utils.isKeydownButNotEnterEvent( falseMockEvent ) , false );
     });
 
@@ -37 +37 @@
     };
 
-    test( 'areElementListsEqual returns true' , function () {
-        ok( wp.customize.utils.areElementListsEqual( mockElementLists.first , mockElementLists.first ) );
+    QUnit.test( 'areElementListsEqual returns true', function( assert ) {
+        assert.ok( wp.customize.utils.areElementListsEqual( mockElementLists.first , mockElementLists.first ) );
     });
 
-    test( 'areElementListsEqual returns false' , function () {
-        equal( wp.customize.utils.areElementListsEqual( mockElementLists.first , mockElementLists.second ) , false );
+    QUnit.test( 'areElementListsEqual returns false', function( assert ) {
+        assert.equal( wp.customize.utils.areElementListsEqual( mockElementLists.first , mockElementLists.second ) , false );
     });
 
-    test( 'areElementListsEqual: lists have same values, but in reverse order' , function () {
-        equal( wp.customize.utils.areElementListsEqual( mockElementLists.first , mockElementLists.firstInReverseOrder ) , false );
+    QUnit.test( 'areElementListsEqual: lists have same values, but in reverse order', function( assert ) {
+        assert.equal( wp.customize.utils.areElementListsEqual( mockElementLists.first , mockElementLists.firstInReverseOrder ) , false );
     });
 
-    test( 'areElementListsEqual: lists have same values, but one is longer' , function () {
-        equal( wp.customize.utils.areElementListsEqual( mockElementLists.third , mockElementLists.thirdButLonger ) , false );
+    QUnit.test( 'areElementListsEqual: lists have same values, but one is longer', function( assert ) {
+        assert.equal( wp.customize.utils.areElementListsEqual( mockElementLists.third , mockElementLists.thirdButLonger ) , false );
     });
 
@@ -73 +73 @@
     );
 
-    test( 'bubbleChildValueChanges notifies parent of change' , function() {
+    QUnit.test( 'bubbleChildValueChanges notifies parent of change', function( assert ) {
         firstBubbleTester = new BubbleTester();
         wp.customize.utils.bubbleChildValueChanges( firstBubbleTester , [ 'fooValue' ] );
         firstBubbleTester.fooValue.set( 'new value' );
-        ok( firstBubbleTester.parent.wasChangeTriggered );
+        assert.ok( firstBubbleTester.parent.wasChangeTriggered );
     });
 
-    test( 'bubbleChildValueChanges passes a reference to its instance' , function() {
-        ok( firstBubbleTester.parent.instancePassedInTrigger instanceof BubbleTester );
+    QUnit.test( 'bubbleChildValueChanges passes a reference to its instance', function( assert ) {
+        assert.ok( firstBubbleTester.parent.instancePassedInTrigger instanceof BubbleTester );
     });
 
@@ -99 +99 @@
     secondBubbleTester.barValue.set( 'new value' );
 
-    test( 'bubbleChildValueChanges notifies parent of change when two values are bound' , function() {
-        ok( secondBubbleTester.parent.wasChangeTriggered );
+    QUnit.test( 'bubbleChildValueChanges notifies parent of change when two values are bound', function( assert ) {
+        assert.ok( secondBubbleTester.parent.wasChangeTriggered );
     });
 
-    test( 'bubbleChildValueChanges passes a reference to its instance when two values are bound' , function() {
-        ok( secondBubbleTester.parent.instancePassedInTrigger instanceof BubbleTesterTwoValues );
+    QUnit.test( 'bubbleChildValueChanges passes a reference to its instance when two values are bound', function( assert ) {
+        assert.ok( secondBubbleTester.parent.instancePassedInTrigger instanceof BubbleTesterTwoValues );
     });
 });

trunk/tests/qunit/wp-admin/js/customize-controls.js

@@ -1 @@
-/* global JSON, wp, test, ok, equal, module */
+/* global JSON, wp */
 
 wp.customize.settingConstructor.abbreviation = wp.customize.Setting.extend({
@@ -7 +7 @@
 });
 
-jQuery( window ).load( function (){
+jQuery( window ).load( function() {
     'use strict';
 
@@ -20 +20 @@
         }
         var type = expectedValues.type;
-        test( 'Model extends proper type', function () {
-            ok( model.extended( wp.customize[ type ] ) );
+        QUnit.test( 'Model extends proper type', function( assert ) {
+            assert.ok( model.extended( wp.customize[ type ] ) );
         } );
 
         if ( expectedValues.hasOwnProperty( 'id' ) ) {
-            test( type + ' instance has the right id', function () {
-                equal( model.id, expectedValues.id );
+            QUnit.test( type + ' instance has the right id', function( assert ) {
+                assert.equal( model.id, expectedValues.id );
             });
         }
         if ( expectedValues.hasOwnProperty( 'title') ) {
-            test( type + ' instance has the right title.', function () {
-                equal( model.params.title, expectedValues.title );
+            QUnit.test( type + ' instance has the right title.', function( assert ) {
+                assert.equal( model.params.title, expectedValues.title );
             });
         }
         if ( expectedValues.hasOwnProperty( 'description' ) ) {
-            test( type + ' instance has the right description.', function () {
-                equal( model.params.description, expectedValues.description );
+            QUnit.test( type + ' instance has the right description.', function( assert ) {
+                assert.equal( model.params.description, expectedValues.description );
             });
         }
         if ( expectedValues.hasOwnProperty( 'content' ) ) {
-            test( type + ' instance has the right content.', function () {
-                equal( model.params.content, expectedValues.content );
+            QUnit.test( type + ' instance has the right content.', function( assert ) {
+                assert.equal( model.params.content, expectedValues.content );
             });
         }
         if ( expectedValues.hasOwnProperty( 'priority' ) ) {
-            test( type + ' instance has the right priority.', function () {
-                equal( model.priority(), expectedValues.priority );
+            QUnit.test( type + ' instance has the right priority.', function( assert ) {
+                assert.equal( model.priority(), expectedValues.priority );
             });
         }
         if ( expectedValues.hasOwnProperty( 'active' ) ) {
-            test( type + ' instance has the right active state.', function () {
-                equal( model.active(), expectedValues.active );
+            QUnit.test( type + ' instance has the right active state.', function( assert ) {
+                assert.equal( model.active(), expectedValues.active );
             });
         }
-        test( type + ' can be deactivated', function () {
+        QUnit.test( type + ' can be deactivated', function( assert ) {
             model.activate();
             model.deactivate();
-            equal( model.active(), false );
+            assert.equal( model.active(), false );
             model.activate();
-            equal( model.active(), true );
-            ok(true);
+            assert.equal( model.active(), true );
+            assert.ok(true);
         });
 
         if ( type === 'Panel' || type === 'Section' ) {
             if ( expectedValues.hasOwnProperty( 'expanded' ) ) {
-                test( type + ' instance has the right expanded state.', function () {
-                    equal( model.expanded(), expectedValues.expanded );
+                QUnit.test( type + ' instance has the right expanded state.', function( assert ) {
+                    assert.equal( model.expanded(), expectedValues.expanded );
                 } );
             }
 
-            test( type + ' instance is collapsed after calling .collapse()', function () {
+            QUnit.test( type + ' instance is collapsed after calling .collapse()', function( assert ) {
                 model.collapse();
-                ok( ! model.expanded() );
+                assert.ok( ! model.expanded() );
             });
 
-            test( type + ' instance is expanded after calling .expand()', function () {
+            QUnit.test( type + ' instance is expanded after calling .expand()', function( assert ) {
                 model.expand();
-                ok( model.expanded() );
+                assert.ok( model.expanded() );
             });
         }
@@ -83 +83 @@
     };
 
-    module( 'Customizer notifications collection' );
-    test( 'Notifications collection exists', function() {
-        ok( wp.customize.notifications );
-        equal( wp.customize.notifications.defaultConstructor, wp.customize.Notification );
-    } );
-
-    test( 'Notification objects are rendered as part of notifications collection', function() {
+    QUnit.module( 'Customizer notifications collection' );
+    QUnit.test( 'Notifications collection exists', function( assert ) {
+        assert.ok( wp.customize.notifications );
+        assert.equal( wp.customize.notifications.defaultConstructor, wp.customize.Notification );
+    } );
+
+    QUnit.test( 'Notification objects are rendered as part of notifications collection', function( assert ) {
         var container = jQuery( '#customize-notifications-test' ), items, collection;
 
@@ -98 +98 @@
         collection.render();
         items = collection.container.find( 'li' );
-        equal( items.length, 1 );
-        equal( items.first().data( 'code' ), 'mycode-1' );
+        assert.equal( items.length, 1 );
+        assert.equal( items.first().data( 'code' ), 'mycode-1' );
 
         collection.add( 'mycode-2', new wp.customize.Notification( 'mycode-2', {
@@ -107 +107 @@
         collection.render();
         items = collection.container.find( 'li' );
-        equal( items.length, 2 );
-        equal( items.first().data( 'code' ), 'mycode-2' );
-        equal( items.last().data( 'code' ), 'mycode-1' );
-
-        equal( items.first().find( '.notice-dismiss' ).length, 1 );
-        equal( items.last().find( '.notice-dismiss' ).length, 0 );
+        assert.equal( items.length, 2 );
+        assert.equal( items.first().data( 'code' ), 'mycode-2' );
+        assert.equal( items.last().data( 'code' ), 'mycode-1' );
+
+        assert.equal( items.first().find( '.notice-dismiss' ).length, 1 );
+        assert.equal( items.last().find( '.notice-dismiss' ).length, 0 );
 
         collection.remove( 'mycode-2' );
         collection.render();
         items = collection.container.find( 'li' );
-        equal( items.length, 1 );
-        equal( items.first().data( 'code' ), 'mycode-1' );
+        assert.equal( items.length, 1 );
+        assert.equal( items.first().data( 'code' ), 'mycode-1' );
 
         collection.remove( 'mycode-1' );
         collection.render();
-        ok( collection.container.is( ':hidden' ), 'Notifications area is hidden.' );
-    } );
-
-    module( 'Customizer Previewed Device' );
-    test( 'Previewed device defaults to desktop.', function () {
-        equal( wp.customize.previewedDevice.get(), 'desktop' );
-    } );
-
-    module( 'Customizer Setting in Fixture' );
-    test( 'Setting has fixture value', function () {
-        equal( wp.customize( 'fixture-setting' )(), 'Lorem Ipsum' );
-    } );
-    test( 'Setting has notifications', function () {
+        assert.ok( collection.container.is( ':hidden' ), 'Notifications area is hidden.' );
+    } );
+
+    QUnit.module( 'Customizer Previewed Device' );
+    QUnit.test( 'Previewed device defaults to desktop.', function( assert ) {
+        assert.equal( wp.customize.previewedDevice.get(), 'desktop' );
+    } );
+
+    QUnit.module( 'Customizer Setting in Fixture' );
+    QUnit.test( 'Setting has fixture value', function( assert ) {
+        assert.equal( wp.customize( 'fixture-setting' )(), 'Lorem Ipsum' );
+    } );
+    QUnit.test( 'Setting has notifications', function( assert ) {
         var setting = wp.customize( 'fixture-setting' );
-        ok( setting.notifications.extended( wp.customize.Values ) );
-        equal( wp.customize.Notification, setting.notifications.prototype.constructor.defaultConstructor );
-    } );
-    test( 'Setting has findControls method', function() {
+        assert.ok( setting.notifications.extended( wp.customize.Values ) );
+        assert.equal( wp.customize.Notification, setting.notifications.prototype.constructor.defaultConstructor );
+    } );
+    QUnit.test( 'Setting has findControls method', function( assert ) {
         var controls, setting = wp.customize( 'fixture-setting' );
-        equal( 'function', typeof setting.findControls );
+        assert.equal( 'function', typeof setting.findControls );
         controls = setting.findControls();
-        equal( 1, controls.length );
-        equal( 'fixture-control', controls[0].id );
-    } );
-    test( 'Setting constructor object exists', function( assert ) {
+        assert.equal( 1, controls.length );
+        assert.equal( 'fixture-control', controls[0].id );
+    } );
+    QUnit.test( 'Setting constructor object exists', function( assert ) {
         assert.ok( _.isObject( wp.customize.settingConstructor ) );
     } );
-    test( 'Custom setting constructor is used', function( assert ) {
+    QUnit.test( 'Custom setting constructor is used', function( assert ) {
         var setting = wp.customize( 'fixture-setting-abbr' );
         assert.ok( setting.extended( wp.customize.settingConstructor.abbreviation ) );
@@ -156 +156 @@
     } );
 
-    module( 'Customizer Control in Fixture' );
-    test( 'Control exists', function () {
-        ok( wp.customize.control.has( 'fixture-control' ) );
-    } );
-    test( 'Control has the fixture setting', function () {
+    QUnit.module( 'Customizer Control in Fixture' );
+    QUnit.test( 'Control exists', function( assert ) {
+        assert.ok( wp.customize.control.has( 'fixture-control' ) );
+    } );
+    QUnit.test( 'Control has the fixture setting', function( assert ) {
         var control = wp.customize.control( 'fixture-control' );
-        equal( control.setting(), 'Lorem Ipsum' );
-        equal( control.setting.id, 'fixture-setting' );
-    } );
-    test( 'Control has the section fixture section ID', function () {
+        assert.equal( control.setting(), 'Lorem Ipsum' );
+        assert.equal( control.setting.id, 'fixture-setting' );
+    } );
+    QUnit.test( 'Control has the section fixture section ID', function( assert ) {
         var control = wp.customize.control( 'fixture-control' );
-        equal( control.section(), 'fixture-section' );
-    } );
-    test( 'Control has notifications', function ( assert ) {
+        assert.equal( control.section(), 'fixture-section' );
+    } );
+    QUnit.test( 'Control has notifications', function ( assert ) {
         var control = wp.customize.control( 'fixture-control' ), settingNotification, controlOnlyNotification, doneEmbedded;
         assert.ok( control.notifications.extended( wp.customize.Values ) );
@@ -216 +216 @@
     } );
 
-    module( 'Customizer control without associated settings' );
-    test( 'Control can be created without settings', function() {
+    QUnit.module( 'Customizer control without associated settings' );
+    QUnit.test( 'Control can be created without settings', function( assert ) {
         var control = new wp.customize.Control( 'settingless', {
             params: {
@@ -225 +225 @@
         } );
         wp.customize.control.add( control.id, control );
-        equal( control.deferred.embedded.state(), 'resolved' );
-        ok( null === control.setting );
-        ok( jQuery.isEmptyObject( control.settings ) );
+        assert.equal( control.deferred.embedded.state(), 'resolved' );
+        assert.ok( null === control.setting );
+        assert.ok( jQuery.isEmptyObject( control.settings ) );
     } );
 
     // Begin sections.
-    module( 'Customizer Section in Fixture' );
-    test( 'Fixture section exists', function () {
-        ok( wp.customize.section.has( 'fixture-section' ) );
-    } );
-    test( 'Fixture section has control among controls()', function () {
+    QUnit.module( 'Customizer Section in Fixture' );
+    QUnit.test( 'Fixture section exists', function( assert ) {
+        assert.ok( wp.customize.section.has( 'fixture-section' ) );
+    } );
+    QUnit.test( 'Fixture section has control among controls()', function( assert ) {
         var section = wp.customize.section( 'fixture-section' );
-        ok( -1 !== _.pluck( section.controls(), 'id' ).indexOf( 'fixture-control' ) );
-    } );
-    test( 'Fixture section has has expected panel', function () {
+        assert.ok( -1 !== _.pluck( section.controls(), 'id' ).indexOf( 'fixture-control' ) );
+    } );
+    QUnit.test( 'Fixture section has has expected panel', function( assert ) {
         var section = wp.customize.section( 'fixture-section' );
-        equal( section.panel(), 'fixture-panel' );
-    } );
-
-    module( 'Customizer Default Section with Template in Fixture' );
-    test( 'Fixture section exists', function () {
-        ok( wp.customize.section.has( 'fixture-section-default-templated' ) );
-    } );
-    test( 'Fixture section has expected content', function () {
+        assert.equal( section.panel(), 'fixture-panel' );
+    } );
+
+    QUnit.module( 'Customizer Default Section with Template in Fixture' );
+    QUnit.test( 'Fixture section exists', function( assert ) {
+        assert.ok( wp.customize.section.has( 'fixture-section-default-templated' ) );
+    } );
+    QUnit.test( 'Fixture section has expected content', function( assert ) {
         var id = 'fixture-section-default-templated', section;
         section = wp.customize.section( id );
-        ok( ! section.params.content );
-        ok( !! section.container );
-        ok( !! section.headContainer );
-        ok( !! section.contentContainer );
-        ok( section.container.has( section.headContainer ) );
-        ok( section.container.has( section.contentContainer ) );
-        ok( section.headContainer.is( '.control-section.control-section-default' ) );
-        ok( 1 === section.headContainer.find( '> .accordion-section-title' ).length );
-        ok( section.contentContainer.is( '.accordion-section-content' ) );
-        equal( section.headContainer.attr( 'aria-owns' ), section.contentContainer.attr( 'id' ) );
-    } );
-
-    module( 'Customizer Custom Type (titleless) Section with Template in Fixture' );
-    test( 'Fixture section exists', function () {
-        ok( wp.customize.section.has( 'fixture-section-titleless-templated' ) );
-    } );
-    test( 'Fixture section has expected content', function () {
+        assert.ok( ! section.params.content );
+        assert.ok( !! section.container );
+        assert.ok( !! section.headContainer );
+        assert.ok( !! section.contentContainer );
+        assert.ok( section.container.has( section.headContainer ) );
+        assert.ok( section.container.has( section.contentContainer ) );
+        assert.ok( section.headContainer.is( '.control-section.control-section-default' ) );
+        assert.ok( 1 === section.headContainer.find( '> .accordion-section-title' ).length );
+        assert.ok( section.contentContainer.is( '.accordion-section-content' ) );
+        assert.equal( section.headContainer.attr( 'aria-owns' ), section.contentContainer.attr( 'id' ) );
+    } );
+
+    QUnit.module( 'Customizer Custom Type (titleless) Section with Template in Fixture' );
+    QUnit.test( 'Fixture section exists', function( assert ) {
+        assert.ok( wp.customize.section.has( 'fixture-section-titleless-templated' ) );
+    } );
+    QUnit.test( 'Fixture section has expected content', function( assert ) {
         var id = 'fixture-section-titleless-templated', section;
         section = wp.customize.section( id );
-        ok( ! section.params.content );
-        ok( !! section.container );
-        ok( !! section.headContainer );
-        ok( !! section.contentContainer );
-        ok( section.container.has( section.headContainer ) );
-        ok( section.container.has( section.contentContainer ) );
-        ok( section.container.is( '.control-section.control-section-titleless' ) );
-        ok( 0 === section.headContainer.find( '> .accordion-section-title' ).length );
-        ok( section.contentContainer.is( '.accordion-section-content' ) );
-        equal( section.headContainer.attr( 'aria-owns' ), section.contentContainer.attr( 'id' ) );
-    } );
-    module( 'Customizer Custom Type Section Lacking Specific Template' );
-    test( 'Fixture section has expected content', function () {
+        assert.ok( ! section.params.content );
+        assert.ok( !! section.container );
+        assert.ok( !! section.headContainer );
+        assert.ok( !! section.contentContainer );
+        assert.ok( section.container.has( section.headContainer ) );
+        assert.ok( section.container.has( section.contentContainer ) );
+        assert.ok( section.container.is( '.control-section.control-section-titleless' ) );
+        assert.ok( 0 === section.headContainer.find( '> .accordion-section-title' ).length );
+        assert.ok( section.contentContainer.is( '.accordion-section-content' ) );
+        assert.equal( section.headContainer.attr( 'aria-owns' ), section.contentContainer.attr( 'id' ) );
+    } );
+    QUnit.module( 'Customizer Custom Type Section Lacking Specific Template' );
+    QUnit.test( 'Fixture section has expected content', function( assert ) {
         var id = 'fixture-section-reusing-default-template', section;
         section = wp.customize.section( id );
-        ok( ! section.params.content );
-        ok( !! section.container );
-        ok( !! section.headContainer );
-        ok( !! section.contentContainer );
-        ok( section.container.has( section.headContainer ) );
-        ok( section.container.has( section.contentContainer ) );
-        ok( section.headContainer.is( '.control-section.control-section-' + section.params.type ) );
-        ok( 1 === section.headContainer.find( '> .accordion-section-title' ).length );
-        ok( section.contentContainer.is( '.accordion-section-content' ) );
-        equal( section.headContainer.attr( 'aria-owns' ), section.contentContainer.attr( 'id' ) );
-    } );
-    module( 'Customizer Section lacking any params' );
-    test( 'Fixture section has default params supplied', function () {
+        assert.ok( ! section.params.content );
+        assert.ok( !! section.container );
+        assert.ok( !! section.headContainer );
+        assert.ok( !! section.contentContainer );
+        assert.ok( section.container.has( section.headContainer ) );
+        assert.ok( section.container.has( section.contentContainer ) );
+        assert.ok( section.headContainer.is( '.control-section.control-section-' + section.params.type ) );
+        assert.ok( 1 === section.headContainer.find( '> .accordion-section-title' ).length );
+        assert.ok( section.contentContainer.is( '.accordion-section-content' ) );
+        assert.equal( section.headContainer.attr( 'aria-owns' ), section.contentContainer.attr( 'id' ) );
+    } );
+    QUnit.module( 'Customizer Section lacking any params' );
+    QUnit.test( 'Fixture section has default params supplied', function( assert ) {
         var id = 'fixture-section-without-params', section, defaultParams;
         section = wp.customize.section( id );
@@ -311 +311 @@
         };
         jQuery.each( defaultParams, function ( key, value ) {
-            ok( 'undefined' !== typeof section.params[ key ] );
-            equal( value, section.params[ key ] );
-        } );
-        ok( _.isNumber( section.params.instanceNumber ) );
+            assert.ok( 'undefined' !== typeof section.params[ key ] );
+            assert.equal( value, section.params[ key ] );
+        } );
+        assert.ok( _.isNumber( section.params.instanceNumber ) );
     } );
 
 
     // Begin panels.
-    module( 'Customizer Panel in Fixture' );
-    test( 'Fixture panel exists', function () {
-        ok( wp.customize.panel.has( 'fixture-panel' ) );
-    } );
-    test( 'Fixture panel has content', function () {
+    QUnit.module( 'Customizer Panel in Fixture' );
+    QUnit.test( 'Fixture panel exists', function( assert ) {
+        assert.ok( wp.customize.panel.has( 'fixture-panel' ) );
+    } );
+    QUnit.test( 'Fixture panel has content', function( assert ) {
         var panel = wp.customize.panel( 'fixture-panel' );
-        ok( !! panel.params.content );
-        ok( !! panel.container );
-        ok( !! panel.headContainer );
-        ok( !! panel.contentContainer );
-        ok( panel.container.has( panel.headContainer ) );
-        ok( panel.container.has( panel.contentContainer ) );
-    } );
-    test( 'Fixture panel has section among its sections()', function () {
+        assert.ok( !! panel.params.content );
+        assert.ok( !! panel.container );
+        assert.ok( !! panel.headContainer );
+        assert.ok( !! panel.contentContainer );
+        assert.ok( panel.container.has( panel.headContainer ) );
+        assert.ok( panel.container.has( panel.contentContainer ) );
+    } );
+    QUnit.test( 'Fixture panel has section among its sections()', function( assert ) {
         var panel = wp.customize.panel( 'fixture-panel' );
-        ok( -1 !== _.pluck( panel.sections(), 'id' ).indexOf( 'fixture-section' ) );
-    } );
-    test( 'Panel is not expanded by default', function () {
+        assert.ok( -1 !== _.pluck( panel.sections(), 'id' ).indexOf( 'fixture-section' ) );
+    } );
+    QUnit.test( 'Panel is not expanded by default', function( assert ) {
         var panel = wp.customize.panel( 'fixture-panel' );
-        ok( ! panel.expanded() );
-    } );
-    test( 'Panel is not expanded by default', function () {
+        assert.ok( ! panel.expanded() );
+    } );
+    QUnit.test( 'Panel is not expanded by default', function( assert ) {
         var panel = wp.customize.panel( 'fixture-panel' );
-        ok( ! panel.expanded() );
-    } );
-    test( 'Focusing on a control will expand the panel and section', function () {
+        assert.ok( ! panel.expanded() );
+    } );
+    QUnit.test( 'Focusing on a control will expand the panel and section', function( assert ) {
         var panel, section, control;
         panel = wp.customize.panel( 'fixture-panel' );
         section = wp.customize.section( 'fixture-section' );
         control = wp.customize.control( 'fixture-control' );
-        ok( ! panel.expanded() );
-        ok( ! section.expanded() );
+        assert.ok( ! panel.expanded() );
+        assert.ok( ! section.expanded() );
         control.focus();
-        ok( section.expanded() );
-        ok( panel.expanded() );
-    } );
-
-    module( 'Customizer Default Panel with Template in Fixture' );
-    test( 'Fixture section exists', function () {
-        ok( wp.customize.panel.has( 'fixture-panel-default-templated' ) );
-    } );
-    test( 'Fixture panel has expected content', function () {
+        assert.ok( section.expanded() );
+        assert.ok( panel.expanded() );
+    } );
+
+    QUnit.module( 'Customizer Default Panel with Template in Fixture' );
+    QUnit.test( 'Fixture section exists', function( assert ) {
+        assert.ok( wp.customize.panel.has( 'fixture-panel-default-templated' ) );
+    } );
+    QUnit.test( 'Fixture panel has expected content', function( assert ) {
         var id = 'fixture-panel-default-templated', panel;
         panel = wp.customize.panel( id );
-        ok( ! panel.params.content );
-        ok( !! panel.container );
-        ok( !! panel.headContainer );
-        ok( !! panel.contentContainer );
-        ok( panel.container.has( panel.headContainer ) );
-        ok( panel.container.has( panel.contentContainer ) );
-        ok( panel.headContainer.is( '.control-panel.control-panel-default' ) );
-        ok( 1 === panel.headContainer.find( '> .accordion-section-title' ).length );
-        ok( panel.contentContainer.is( '.control-panel-content' ) );
-        equal( panel.headContainer.attr( 'aria-owns' ), panel.contentContainer.attr( 'id' ) );
-    } );
-
-    module( 'Customizer Custom Type Panel (titleless) with Template in Fixture' );
-    test( 'Fixture panel exists', function () {
-        ok( wp.customize.panel.has( 'fixture-panel-titleless-templated' ) );
-    } );
-    test( 'Fixture panel has expected content', function () {
+        assert.ok( ! panel.params.content );
+        assert.ok( !! panel.container );
+        assert.ok( !! panel.headContainer );
+        assert.ok( !! panel.contentContainer );
+        assert.ok( panel.container.has( panel.headContainer ) );
+        assert.ok( panel.container.has( panel.contentContainer ) );
+        assert.ok( panel.headContainer.is( '.control-panel.control-panel-default' ) );
+        assert.ok( 1 === panel.headContainer.find( '> .accordion-section-title' ).length );
+        assert.ok( panel.contentContainer.is( '.control-panel-content' ) );
+        assert.equal( panel.headContainer.attr( 'aria-owns' ), panel.contentContainer.attr( 'id' ) );
+    } );
+
+    QUnit.module( 'Customizer Custom Type Panel (titleless) with Template in Fixture' );
+    QUnit.test( 'Fixture panel exists', function( assert ) {
+        assert.ok( wp.customize.panel.has( 'fixture-panel-titleless-templated' ) );
+    } );
+    QUnit.test( 'Fixture panel has expected content', function( assert ) {
         var id = 'fixture-panel-titleless-templated', panel;
         panel = wp.customize.panel( id );
-        ok( ! panel.params.content );
-        ok( !! panel.container );
-        ok( !! panel.headContainer );
-        ok( !! panel.contentContainer );
-        ok( panel.container.has( panel.headContainer ) );
-        ok( panel.container.has( panel.contentContainer ) );
-        ok( panel.headContainer.is( '.control-panel.control-panel-titleless' ) );
-        ok( 0 === panel.headContainer.find( '> .accordion-section-title' ).length );
-        ok( panel.contentContainer.is( '.control-panel-content' ) );
-        equal( panel.headContainer.attr( 'aria-owns' ), panel.contentContainer.attr( 'id' ) );
-    } );
-
-    module( 'Customizer Custom Type Panel Lacking Specific Template' );
-    test( 'Fixture panel has expected content', function () {
+        assert.ok( ! panel.params.content );
+        assert.ok( !! panel.container );
+        assert.ok( !! panel.headContainer );
+        assert.ok( !! panel.contentContainer );
+        assert.ok( panel.container.has( panel.headContainer ) );
+        assert.ok( panel.container.has( panel.contentContainer ) );
+        assert.ok( panel.headContainer.is( '.control-panel.control-panel-titleless' ) );
+        assert.ok( 0 === panel.headContainer.find( '> .accordion-section-title' ).length );
+        assert.ok( panel.contentContainer.is( '.control-panel-content' ) );
+        assert.equal( panel.headContainer.attr( 'aria-owns' ), panel.contentContainer.attr( 'id' ) );
+    } );
+
+    QUnit.module( 'Customizer Custom Type Panel Lacking Specific Template' );
+    QUnit.test( 'Fixture panel has expected content', function( assert ) {
         var id = 'fixture-panel-reusing-default-template', panel;
         panel = wp.customize.panel( id );
-        ok( ! panel.params.content );
-        ok( !! panel.container );
-        ok( !! panel.headContainer );
-        ok( !! panel.contentContainer );
-        ok( panel.container.has( panel.headContainer ) );
-        ok( panel.container.has( panel.contentContainer ) );
-        ok( panel.headContainer.is( '.control-panel.control-panel-' + panel.params.type ) );
-        ok( 1 === panel.headContainer.find( '> .accordion-section-title' ).length );
-        ok( panel.contentContainer.is( '.control-panel-content' ) );
-        equal( panel.headContainer.attr( 'aria-owns' ), panel.contentContainer.attr( 'id' ) );
-    } );
-    module( 'Customizer Panel lacking any params' );
-    test( 'Fixture panel has default params supplied', function () {
+        assert.ok( ! panel.params.content );
+        assert.ok( !! panel.container );
+        assert.ok( !! panel.headContainer );
+        assert.ok( !! panel.contentContainer );
+        assert.ok( panel.container.has( panel.headContainer ) );
+        assert.ok( panel.container.has( panel.contentContainer ) );
+        assert.ok( panel.headContainer.is( '.control-panel.control-panel-' + panel.params.type ) );
+        assert.ok( 1 === panel.headContainer.find( '> .accordion-section-title' ).length );
+        assert.ok( panel.contentContainer.is( '.control-panel-content' ) );
+        assert.equal( panel.headContainer.attr( 'aria-owns' ), panel.contentContainer.attr( 'id' ) );
+    } );
+    QUnit.module( 'Customizer Panel lacking any params' );
+    QUnit.test( 'Fixture panel has default params supplied', function( assert ) {
         var id = 'fixture-panel-without-params', panel, defaultParams;
         panel = wp.customize.panel( id );
@@ -422 +422 @@
         };
         jQuery.each( defaultParams, function ( key, value ) {
-            ok( 'undefined' !== typeof panel.params[ key ] );
-            equal( value, panel.params[ key ] );
-        } );
-        ok( _.isNumber( panel.params.instanceNumber ) );
-    } );
-
-    module( 'Dynamically-created Customizer Setting Model' );
+            assert.ok( 'undefined' !== typeof panel.params[ key ] );
+            assert.equal( value, panel.params[ key ] );
+        } );
+        assert.ok( _.isNumber( panel.params.instanceNumber ) );
+    } );
+
+    QUnit.module( 'Dynamically-created Customizer Setting Model' );
     settingId = 'new_blogname';
     settingValue = 'Hello World';
 
-    test( 'Create a new setting', function () {
+    QUnit.test( 'Create a new setting', function( assert ) {
         mockSetting = wp.customize.create(
             settingId,
@@ -442 +442 @@
             }
         );
-        equal( mockSetting(), settingValue );
-        equal( mockSetting.id, settingId );
-    } );
-
-    module( 'Dynamically-created Customizer Section Model' );
+        assert.equal( mockSetting(), settingValue );
+        assert.equal( mockSetting.id, settingId );
+    } );
+
+    QUnit.module( 'Dynamically-created Customizer Section Model' );
 
     sectionId = 'mock_title_tagline';
@@ -468 +468 @@
     testCustomizerModel( mockSection, sectionExpectedValues );
 
-    test( 'Section has been embedded', function () {
-        equal( mockSection.deferred.embedded.state(), 'resolved' );
+    QUnit.test( 'Section has been embedded', function( assert ) {
+        assert.equal( mockSection.deferred.embedded.state(), 'resolved' );
     } );
 
     wp.customize.section.add( sectionId, mockSection );
 
-    test( 'Section instance added to the wp.customize.section object', function () {
-        ok( wp.customize.section.has( sectionId ) );
+    QUnit.test( 'Section instance added to the wp.customize.section object', function( assert ) {
+        assert.ok( wp.customize.section.has( sectionId ) );
     });
 
     sectionInstance = wp.customize.section( sectionId );
 
-    test( 'Section instance has right content when accessed from wp.customize.section()', function () {
-        equal( sectionInstance.params.content, sectionContent );
-    });
-
-    test( 'Section instance has no children yet', function () {
-        equal( sectionInstance.controls().length, 0 );
-    });
-
-    module( 'Dynamically-created Customizer Control Model' );
+    QUnit.test( 'Section instance has right content when accessed from wp.customize.section()', function( assert ) {
+        assert.equal( sectionInstance.params.content, sectionContent );
+    });
+
+    QUnit.test( 'Section instance has no children yet', function( assert ) {
+        assert.equal( sectionInstance.controls().length, 0 );
+    });
+
+    QUnit.module( 'Dynamically-created Customizer Control Model' );
 
     controlId = 'new_blogname';
@@ -521 +521 @@
     testCustomizerModel( mockControl, controlExpectedValues );
 
-    test( 'Control instance does not yet belong to a section.', function () {
-        equal( mockControl.section(), undefined );
-    });
-    test( 'Control has not been embedded yet', function () {
-        equal( mockControl.deferred.embedded.state(), 'pending' );
-    } );
-
-    test( 'Control instance has the right selector.', function () {
-        equal( mockControl.selector, '#customize-control-new_blogname' );
+    QUnit.test( 'Control instance does not yet belong to a section.', function( assert ) {
+        assert.equal( mockControl.section(), undefined );
+    });
+    QUnit.test( 'Control has not been embedded yet', function( assert ) {
+        assert.equal( mockControl.deferred.embedded.state(), 'pending' );
+    } );
+
+    QUnit.test( 'Control instance has the right selector.', function( assert ) {
+        assert.equal( mockControl.selector, '#customize-control-new_blogname' );
     });
 
     wp.customize.control.add( controlId, mockControl );
 
-    test( 'Control instance was added to the control class.', function () {
-        ok( wp.customize.control.has( controlId ) );
+    QUnit.test( 'Control instance was added to the control class.', function( assert ) {
+        assert.ok( wp.customize.control.has( controlId ) );
     });
 
     mockControlInstance = wp.customize.control( controlId );
 
-    test( 'Control instance has the right id when accessed from api.control().', function () {
-        equal( mockControlInstance.id, controlId );
-    });
-
-    test( 'Control section can be set as expected', function () {
+    QUnit.test( 'Control instance has the right id when accessed from api.control().', function( assert ) {
+        assert.equal( mockControlInstance.id, controlId );
+    });
+
+    QUnit.test( 'Control section can be set as expected', function( assert ) {
         mockControl.section( mockSection.id );
-        equal( mockControl.section(), mockSection.id );
-    });
-    test( 'Associating a control with a section allows it to be embedded', function () {
-        equal( mockControl.deferred.embedded.state(), 'resolved' );
-    });
-
-    test( 'Control is now available on section.controls()', function () {
-        equal( sectionInstance.controls().length, 1 );
-        equal( sectionInstance.controls()[0], mockControl );
-    });
-
-    module( 'Dynamically-created Customizer Panel Model' );
+        assert.equal( mockControl.section(), mockSection.id );
+    });
+    QUnit.test( 'Associating a control with a section allows it to be embedded', function( assert ) {
+        assert.equal( mockControl.deferred.embedded.state(), 'resolved' );
+    });
+
+    QUnit.test( 'Control is now available on section.controls()', function( assert ) {
+        assert.equal( sectionInstance.controls().length, 1 );
+        assert.equal( sectionInstance.controls()[0], mockControl );
+    });
+
+    QUnit.module( 'Dynamically-created Customizer Panel Model' );
 
     panelId = 'mockPanelId';
@@ -585 +585 @@
     testCustomizerModel( mockPanel, panelExpectedValues );
 
-    test( 'Panel instance is not contextuallyActive', function () {
-        equal( mockPanel.isContextuallyActive(), false );
-    });
-
-    module( 'Test wp.customize.findControlsForSettings' );
-    test( 'findControlsForSettings(blogname)', function() {
+    QUnit.test( 'Panel instance is not contextuallyActive', function( assert ) {
+        assert.equal( mockPanel.isContextuallyActive(), false );
+    });
+
+    QUnit.module( 'Test wp.customize.findControlsForSettings' );
+    QUnit.test( 'findControlsForSettings(blogname)', function( assert ) {
         var controlsForSettings, settingId = 'fixture-setting', controlId = 'fixture-control';
-        ok( wp.customize.control.has( controlId ) );
-        ok( wp.customize.has( settingId ) );
+        assert.ok( wp.customize.control.has( controlId ) );
+        assert.ok( wp.customize.has( settingId ) );
         controlsForSettings = wp.customize.findControlsForSettings( [ settingId ] );
-        ok( _.isObject( controlsForSettings ), 'Response is object' );
-        ok( _.isArray( controlsForSettings['fixture-setting'] ), 'Response has a fixture-setting array' );
-        equal( 1, controlsForSettings['fixture-setting'].length );
-        equal( wp.customize.control( controlId ), controlsForSettings['fixture-setting'][0] );
-    } );
-
-    module( 'Customize Controls wp.customize.dirtyValues' );
-    test( 'dirtyValues() returns expected values', function() {
+        assert.ok( _.isObject( controlsForSettings ), 'Response is object' );
+        assert.ok( _.isArray( controlsForSettings['fixture-setting'] ), 'Response has a fixture-setting array' );
+        assert.equal( 1, controlsForSettings['fixture-setting'].length );
+        assert.equal( wp.customize.control( controlId ), controlsForSettings['fixture-setting'][0] );
+    } );
+
+    QUnit.module( 'Customize Controls wp.customize.dirtyValues' );
+    QUnit.test( 'dirtyValues() returns expected values', function( assert ) {
         wp.customize.state( 'changesetStatus' ).set( 'auto-draft' );
         wp.customize.each( function( setting ) {
             setting._dirty = false;
         } );
-        ok( _.isEmpty( wp.customize.dirtyValues() ) );
-        ok( _.isEmpty( wp.customize.dirtyValues( { unsaved: false } ) ) );
+        assert.ok( _.isEmpty( wp.customize.dirtyValues() ) );
+        assert.ok( _.isEmpty( wp.customize.dirtyValues( { unsaved: false } ) ) );
 
         wp.customize( 'fixture-setting' )._dirty = true;
-        ok( ! _.isEmpty( wp.customize.dirtyValues() ) );
-        ok( _.isEmpty( wp.customize.dirtyValues( { unsaved: true } ) ) );
+        assert.ok( ! _.isEmpty( wp.customize.dirtyValues() ) );
+        assert.ok( _.isEmpty( wp.customize.dirtyValues( { unsaved: true } ) ) );
 
         wp.customize( 'fixture-setting' ).set( 'Modified' );
-        ok( ! _.isEmpty( wp.customize.dirtyValues() ) );
-        ok( ! _.isEmpty( wp.customize.dirtyValues( { unsaved: true } ) ) );
-        equal( 'Modified', wp.customize.dirtyValues()['fixture-setting'] );
+        assert.ok( ! _.isEmpty( wp.customize.dirtyValues() ) );
+        assert.ok( ! _.isEmpty( wp.customize.dirtyValues( { unsaved: true } ) ) );
+        assert.equal( 'Modified', wp.customize.dirtyValues()['fixture-setting'] );
 
         // When the changeset does not exist, all dirty settings are necessarily unsaved.
         wp.customize.state( 'changesetStatus' ).set( '' );
         wp.customize( 'fixture-setting' )._dirty = true;
-        ok( ! _.isEmpty( wp.customize.dirtyValues() ) );
-        ok( ! _.isEmpty( wp.customize.dirtyValues( { unsaved: true } ) ) );
-    } );
-
-    module( 'Customize Controls: wp.customize.requestChangesetUpdate()' );
-    test( 'requestChangesetUpdate makes request and returns promise', function( assert ) {
+        assert.ok( ! _.isEmpty( wp.customize.dirtyValues() ) );
+        assert.ok( ! _.isEmpty( wp.customize.dirtyValues( { unsaved: true } ) ) );
+    } );
+
+    QUnit.module( 'Customize Controls: wp.customize.requestChangesetUpdate()' );
+    QUnit.test( 'requestChangesetUpdate makes request and returns promise', function( assert ) {
         var request, originalBeforeSetup = jQuery.ajaxSettings.beforeSend;
 
@@ -678 +678 @@
     } );
 
-    module( 'Customize Utils: wp.customize.utils.getRemainingTime()' );
-    test( 'utils.getRemainingTime calculates time correctly', function( assert ) {
+    QUnit.module( 'Customize Utils: wp.customize.utils.getRemainingTime()' );
+    QUnit.test( 'utils.getRemainingTime calculates time correctly', function( assert ) {
         var datetime = '2599-08-06 12:12:13', timeRemaining, timeRemainingWithDateInstance, timeRemaingingWithTimestamp;
 
@@ -693 +693 @@
     });
 
-    module( 'Customize Utils: wp.customize.utils.getCurrentTimestamp()' );
-    test( 'utils.getCurrentTimestamp returns timestamp', function( assert ) {
+    QUnit.module( 'Customize Utils: wp.customize.utils.getCurrentTimestamp()' );
+    QUnit.test( 'utils.getCurrentTimestamp returns timestamp', function( assert ) {
         var currentTimeStamp;
         currentTimeStamp = wp.customize.utils.getCurrentTimestamp();
@@ -700 +700 @@
     });
 
-    module( 'Customize Controls: wp.customize.DateTimeControl' );
-    test( 'Test DateTimeControl creation and its methods', function( assert ) {
+    QUnit.module( 'Customize Controls: wp.customize.DateTimeControl' );
+    QUnit.test( 'Test DateTimeControl creation and its methods', function( assert ) {
         var control, controlId = 'date_time', section, sectionId = 'fixture-section',
             datetime = '2599-08-06 18:12:13', dateTimeArray, dateTimeArrayInampm, timeString,
@@ -865 +865 @@
     });
 
-    module( 'Customize Sections: wp.customize.OuterSection' );
-    test( 'Test OuterSection', function( assert ) {
+    QUnit.module( 'Customize Sections: wp.customize.OuterSection' );
+    QUnit.test( 'Test OuterSection', function( assert ) {
         var section, sectionId = 'test_outer_section', body = jQuery( 'body' ),
             defaultSection, defaultSectionId = 'fixture-section';
@@ -900 +900 @@
     });
 
-    module( 'Customize Controls: PreviewLinkControl' );
-    test( 'Test PreviewLinkControl creation and its methods', function( assert ) {
+    QUnit.module( 'Customize Controls: PreviewLinkControl' );
+    QUnit.test( 'Test PreviewLinkControl creation and its methods', function( assert ) {
         var section, sectionId = 'publish_settings', newLink;
 

trunk/tests/qunit/wp-admin/js/customize-header.js

@@ -2 +2 @@
 
 jQuery( function() {
-    module('Custom Header: ChoiceList', {
-        setup: function() {
+    QUnit.module('Custom Header: ChoiceList', {
+        beforeEach: function() {
             wp.customize.HeaderTool.currentHeader = new wp.customize.HeaderTool.ImageModel();
             this.apiStub = sinon.stub(wp.customize, 'get').returns('foo');
             this.choiceList = new wp.customize.HeaderTool.ChoiceList();
         },
-        teardown: function() {
+        afterEach: function() {
             this.apiStub.restore();
         }
     });
 
-    test('should parse _wpCustomizeHeader.uploads into itself', function() {
-        equal(this.choiceList.length, 4);
+    QUnit.test('should parse _wpCustomizeHeader.uploads into itself', function( assert ) {
+        assert.equal(this.choiceList.length, 4);
     });
 
-    test('should sort by newest first', function() {
-        equal(this.choiceList.at(2).get('header').attachment_id, 1);
-        equal(this.choiceList.first().get('header').attachment_id, 3);
+    QUnit.test('should sort by newest first', function( assert ) {
+        assert.equal(this.choiceList.at(2).get('header').attachment_id, 1);
+        assert.equal(this.choiceList.first().get('header').attachment_id, 3);
     });
 
-    module('Custom Header: DefaultsList', {
-        setup: function() {
+    QUnit.module('Custom Header: DefaultsList', {
+        beforeEach: function() {
             wp.customize.HeaderTool.currentHeader = new wp.customize.HeaderTool.ImageModel();
             this.apiStub = sinon.stub(wp.customize, 'get').returns('foo');
             this.choiceList = new wp.customize.HeaderTool.DefaultsList();
         },
-        teardown: function() {
+        afterEach: function() {
             this.apiStub.restore();
         }
     });
 
-    test('it should parse _wpCustomizeHeader.defaults into itself', function() {
-        equal(this.choiceList.length, 4);
+    QUnit.test('it should parse _wpCustomizeHeader.defaults into itself', function( assert ) {
+        assert.equal(this.choiceList.length, 4);
     });
 
-    test('it parses the default image names', function() {
-        equal(this.choiceList.first().get('header').defaultName, 'circle');
-        equal(this.choiceList.at(2).get('header').defaultName, 'star');
+    QUnit.test('it parses the default image names', function( assert ) {
+        assert.equal(this.choiceList.first().get('header').defaultName, 'circle');
+        assert.equal(this.choiceList.at(2).get('header').defaultName, 'star');
     });
 
-    module('Custom Header: HeaderImage shouldBeCropped()', {
-        setup: function() {
+    QUnit.module('Custom Header: HeaderImage shouldBeCropped()', {
+        beforeEach: function() {
             wp.customize.HeaderTool.currentHeader = new wp.customize.HeaderTool.ImageModel();
             this.model = new wp.customize.HeaderTool.ImageModel();
@@ -53 +53 @@
     });
 
-    test('should not be cropped when the theme does not support flex width or height and the image has the same dimensions of the theme image', function() {
+    QUnit.test('should not be cropped when the theme does not support flex width or height and the image has the same dimensions of the theme image', function( assert ) {
         this.model.set({
             themeFlexWidth: false,
@@ -61 +61 @@
         });
 
-        equal(this.model.shouldBeCropped(), false);
+        assert.equal(this.model.shouldBeCropped(), false);
     });
 
-    test('should be cropped when the image has the same dimensions of the theme image', function() {
+    QUnit.test('should be cropped when the image has the same dimensions of the theme image', function( assert ) {
         this.model.set({
             themeFlexWidth: false,
@@ -72 +72 @@
         });
 
-        equal(this.model.shouldBeCropped(), true);
+        assert.equal(this.model.shouldBeCropped(), true);
     });
 
-    test('should not be cropped when the theme only supports flex width and the image has the same height as the theme image', function() {
+    QUnit.test('should not be cropped when the theme only supports flex width and the image has the same height as the theme image', function( assert ) {
         this.model.set({
             themeFlexWidth: true,
@@ -83 +83 @@
         });
 
-        equal(this.model.shouldBeCropped(), false);
+        assert.equal(this.model.shouldBeCropped(), false);
     });
 
-    test('should not be cropped when the theme only supports flex height and the image has the same width as the theme image', function() {
+    QUnit.test('should not be cropped when the theme only supports flex height and the image has the same width as the theme image', function( assert ) {
         this.model.set({
             themeFlexWidth: false,
@@ -94 +94 @@
         });
 
-        equal(this.model.shouldBeCropped(), false);
+        assert.equal(this.model.shouldBeCropped(), false);
     });
 
-    test('should not be cropped when the theme supports flex height AND width', function() {
+    QUnit.test('should not be cropped when the theme supports flex height AND width', function( assert ) {
         this.model.set({
             themeFlexWidth: true,
@@ -105 +105 @@
         });
 
-        equal(this.model.shouldBeCropped(), false);
+        assert.equal(this.model.shouldBeCropped(), false);
     });
 
-    test('should not be cropped when the image width is smaller than or equal to theme width', function() {
+    QUnit.test('should not be cropped when the image width is smaller than or equal to theme width', function( assert ) {
         this.model.set({
             themeFlexWidth: false,
@@ -116 +116 @@
         });
 
-        equal(this.model.shouldBeCropped(), false);
+        assert.equal(this.model.shouldBeCropped(), false);
     });
 
-    test('should not be cropped when the image width is smaller than or equal to theme width, theme supports flex height and width', function() {
+    QUnit.test('should not be cropped when the image width is smaller than or equal to theme width, theme supports flex height and width', function( assert ) {
         this.model.set({
             themeFlexWidth: true,
@@ -127 +127 @@
         });
 
-        equal(this.model.shouldBeCropped(), false);
+        assert.equal(this.model.shouldBeCropped(), false);
     });
 });

trunk/tests/qunit/wp-admin/js/customize-nav-menus.js

@@ -1 +1 @@
 /* global wp */
-jQuery( window ).load( function (){
+jQuery( window ).load( function() {
 
     var api = wp.customize,
@@ -6 +6 @@
         socialMenuId = 2;
 
-    module( 'Customize Nav Menus' );
+    QUnit.module( 'Customize Nav Menus' );
 
     /**
      * Generate 20 IDs and verify they are all unique.
      */
-    test( 'generatePlaceholderAutoIncrementId generates unique IDs', function() {
+    QUnit.test( 'generatePlaceholderAutoIncrementId generates unique IDs', function( assert ) {
         var testIterations = 20,
             ids = [ api.Menus.generatePlaceholderAutoIncrementId() ];
@@ -18 +18 @@
             var placeholderID = api.Menus.generatePlaceholderAutoIncrementId();
 
-            ok( -1 === ids.indexOf( placeholderID ) );
+            assert.ok( -1 === ids.indexOf( placeholderID ) );
             ids.push( placeholderID );
             testIterations -= 1;
@@ -25 +25 @@
     } );
 
-    test( 'it should parse _wpCustomizeMenusSettings.defaults into itself', function() {
-        deepEqual( window._wpCustomizeNavMenusSettings, api.Menus.data );
+    QUnit.test( 'it should parse _wpCustomizeMenusSettings.defaults into itself', function( assert ) {
+        assert.deepEqual( window._wpCustomizeNavMenusSettings, api.Menus.data );
     } );
 
-    test( 'empty menus should have no Menu Item Controls', function() {
-        ok( 0 === wp.customize.Menus.getMenuControl( socialMenuId ).getMenuItemControls().length, 'empty menus' );
+    QUnit.test( 'empty menus should have no Menu Item Controls', function( assert ) {
+        assert.ok( 0 === wp.customize.Menus.getMenuControl( socialMenuId ).getMenuItemControls().length, 'empty menus' );
     } );
 
-    test( 'populated menus should have no Menu Item Controls', function() {
-        ok( 0 !== wp.customize.Menus.getMenuControl( primaryMenuId ).getMenuItemControls().length, 'non-empty menus' );
+    QUnit.test( 'populated menus should have no Menu Item Controls', function( assert ) {
+        assert.ok( 0 !== wp.customize.Menus.getMenuControl( primaryMenuId ).getMenuItemControls().length, 'non-empty menus' );
     } );
 
@@ -40 +40 @@
     // (and api.Menus.AvailableItemCollection, api.Menus.AvailableItemModel).
 
-    test( 'there is a properly configured MenusPanel', function() {
+    QUnit.test( 'there is a properly configured MenusPanel', function( assert ) {
         var panel, sections;
 
         panel = api.panel( 'nav_menus' );
-        ok( panel );
-        ok( panel.extended( api.Menus.MenusPanel ) );
+        assert.ok( panel );
+        assert.ok( panel.extended( api.Menus.MenusPanel ) );
 
         sections = panel.sections();
-        ok( 'menu_locations' === sections[0].id, 'first section is menu_locations' );
-        ok( sections[1].extended( api.Menus.MenuSection ), 'second section is MenuSection' );
-        ok( sections[ sections.length - 1 ].extended( api.Menus.NewMenuSection ), 'last section is NewMenuSection' );
+        assert.ok( 'menu_locations' === sections[0].id, 'first section is menu_locations' );
+        assert.ok( sections[1].extended( api.Menus.MenuSection ), 'second section is MenuSection' );
+        assert.ok( sections[ sections.length - 1 ].extended( api.Menus.NewMenuSection ), 'last section is NewMenuSection' );
     } );
     // @todo Add more tests for api.Menus.MenusPanel behaviors.
 
-    test( 'there an expected MenuSection for the primary menu', function() {
+    QUnit.test( 'there an expected MenuSection for the primary menu', function( assert ) {
         var section, controls, lastControl;
 
         section = api.section( 'nav_menu[' + primaryMenuId + ']' );
-        ok( section, 'section exists' );
-        ok( section.extended( api.Menus.MenuSection ), 'section is a api.Menus.MenuSection' );
-        ok( section.deferred.initSortables, 'has section.deferred.initSortables' );
-        ok( section.active(), 'section active() is true' );
-        ok( section.active.set( false ).get(), 'section active() cannot be set false' );
+        assert.ok( section, 'section exists' );
+        assert.ok( section.extended( api.Menus.MenuSection ), 'section is a api.Menus.MenuSection' );
+        assert.ok( section.deferred.initSortables, 'has section.deferred.initSortables' );
+        assert.ok( section.active(), 'section active() is true' );
+        assert.ok( section.active.set( false ).get(), 'section active() cannot be set false' );
 
         controls = section.controls();
-        ok( controls[0].extended( api.Menus.MenuNameControl ), 'first control in menu section is MenuNameControl' );
-        ok( controls[1].extended( api.Menus.MenuItemControl ), 'second control in menu section is MenuItemControl' );
+        assert.ok( controls[0].extended( api.Menus.MenuNameControl ), 'first control in menu section is MenuNameControl' );
+        assert.ok( controls[1].extended( api.Menus.MenuItemControl ), 'second control in menu section is MenuItemControl' );
 
         lastControl = controls[ controls.length - 1 ];
-        ok( lastControl.extended( api.Control ), 'last control in menu section is a base Control' );
-        ok( lastControl.params.templateId === 'nav-menu-delete-button', 'last control in menu section has a delete-button template' );
+        assert.ok( lastControl.extended( api.Control ), 'last control in menu section is a base Control' );
+        assert.ok( lastControl.params.templateId === 'nav-menu-delete-button', 'last control in menu section has a delete-button template' );
     } );
     // @todo Add more tests for api.Menus.MenuSection behaviors.
 
-    test( 'changing a MenuNameControl change the corresponding menu value', function() {
+    QUnit.test( 'changing a MenuNameControl change the corresponding menu value', function( assert ) {
         var section, control;
 
         section = api.section( 'nav_menu[' + primaryMenuId + ']' );
         control = section.controls()[0];
-        ok( control.extended( api.Menus.MenuNameControl ), 'control is a MenuNameControl' );
-        equal( control.setting().name, 'Primary menu' );
-        ok( ! control.setting._dirty );
+        assert.ok( control.extended( api.Menus.MenuNameControl ), 'control is a MenuNameControl' );
+        assert.equal( control.setting().name, 'Primary menu' );
+        assert.ok( ! control.setting._dirty );
         control.container.find( 'input[type=text]:first' ).val( 'Main menu' ).trigger( 'change' );
-        equal( control.setting().name, 'Main menu' );
-        ok( control.setting._dirty );
+        assert.equal( control.setting().name, 'Main menu' );
+        assert.ok( control.setting._dirty );
     } );
     // @todo Add more tests for api.Menus.MenuNameControl
 
-    test( 'manipulating a MenuItemControl works', function() {
+    QUnit.test( 'manipulating a MenuItemControl works', function( assert ) {
         var section, control, value;
         section = api.section( 'nav_menu[' + primaryMenuId + ']' );
-        ok( section );
+        assert.ok( section );
 
         control = section.controls()[1];
-        ok( control.extended( api.Menus.MenuItemControl ), 'control is a MenuItemControl' );
+        assert.ok( control.extended( api.Menus.MenuItemControl ), 'control is a MenuItemControl' );
 
         control.actuallyEmbed();
 
         control.container.find( '.edit-menu-item-title' ).val( 'Hello World' ).trigger( 'change' );
-        equal( control.setting().title, 'Hello World' );
+        assert.equal( control.setting().title, 'Hello World' );
         value = _.clone( control.setting() );
         value.title = 'Hola Mundo';
-        equal( control.container.find( '.edit-menu-item-title' ).val(), 'Hello World' );
-        equal( value.position, 1 );
-        equal( control.priority(), 1 );
+        assert.equal( control.container.find( '.edit-menu-item-title' ).val(), 'Hello World' );
+        assert.equal( value.position, 1 );
+        assert.equal( control.priority(), 1 );
 
         // @todo Test control.moveDown().
@@ -119 +119 @@
     // @todo Add tests for api.Menus.createNavMenu.
 
-    test( 'api.Menus.getMenuControl() should return the expected control', function() {
+    QUnit.test( 'api.Menus.getMenuControl() should return the expected control', function( assert ) {
         var control = api.Menus.getMenuControl( primaryMenuId );
-        ok( !! control, 'control is returned' );
-        ok( control.extended( api.Menus.MenuControl ), 'control is a MenuControl' );
+        assert.ok( !! control, 'control is returned' );
+        assert.ok( control.extended( api.Menus.MenuControl ), 'control is a MenuControl' );
     } );
 
-    test( 'api.Menus.getMenuItemControl() should return the expected control', function() {
+    QUnit.test( 'api.Menus.getMenuItemControl() should return the expected control', function( assert ) {
         var control = api.Menus.getMenuItemControl( 2000 );
-        ok( !! control, 'control is returned' );
-        ok( control.extended( api.Menus.MenuItemControl ), 'control is a MenuItemControl' );
+        assert.ok( !! control, 'control is returned' );
+        assert.ok( control.extended( api.Menus.MenuItemControl ), 'control is a MenuItemControl' );
     } );
 

trunk/tests/qunit/wp-admin/js/customize-widgets.js

@@ -4 +4 @@
     var api = wp.customize, $ = jQuery;
 
-    module( 'Customize Widgets' );
+    QUnit.module( 'Customize Widgets' );
 
-    test( 'fixtures should be present', function() {
+    QUnit.test( 'fixtures should be present', function( assert ) {
         var widgetControl;
-        ok( api.panel( 'widgets' ) );
-        ok( api.section( 'sidebar-widgets-sidebar-1' ) );
+        assert.ok( api.panel( 'widgets' ) );
+        assert.ok( api.section( 'sidebar-widgets-sidebar-1' ) );
         widgetControl = api.control( 'widget_search[2]' );
-        ok( widgetControl );
-        ok( api.control( 'sidebars_widgets[sidebar-1]' ) );
-        ok( api( 'widget_search[2]' ) );
-        ok( api( 'sidebars_widgets[sidebar-1]' ) );
-        ok( widgetControl.params.content );
-        ok( widgetControl.params.widget_control );
-        ok( widgetControl.params.widget_content );
-        ok( widgetControl.params.widget_id );
-        ok( widgetControl.params.widget_id_base );
+        assert.ok( widgetControl );
+        assert.ok( api.control( 'sidebars_widgets[sidebar-1]' ) );
+        assert.ok( api( 'widget_search[2]' ) );
+        assert.ok( api( 'sidebars_widgets[sidebar-1]' ) );
+        assert.ok( widgetControl.params.content );
+        assert.ok( widgetControl.params.widget_control );
+        assert.ok( widgetControl.params.widget_content );
+        assert.ok( widgetControl.params.widget_id );
+        assert.ok( widgetControl.params.widget_id_base );
     });
 
-    test( 'widget contents should embed (with widget-added event) when section and control expand', function() {
+    QUnit.test( 'widget contents should embed (with widget-added event) when section and control expand', function( assert ) {
         var control, section, widgetAddedEvent = null, widgetControlRootElement = null;
         control = api.control( 'widget_search[2]' );
@@ -32 +32 @@
         });
 
-        ok( ! section.expanded() );
-        ok( 0 === control.container.find( '> .widget' ).length );
+        assert.ok( ! section.expanded() );
+        assert.ok( 0 === control.container.find( '> .widget' ).length );
 
         // Preview sets the active state.
@@ -41 +41 @@
 
         section.expand();
-        ok( ! widgetAddedEvent, 'expected widget added event not fired' );
-        ok( 1 === control.container.find( '> .widget' ).length, 'expected there to be one .widget element in the container' );
-        ok( 0 === control.container.find( '.widget-content' ).children().length );
+        assert.ok( ! widgetAddedEvent, 'expected widget added event not fired' );
+        assert.ok( 1 === control.container.find( '> .widget' ).length, 'expected there to be one .widget element in the container' );
+        assert.ok( 0 === control.container.find( '.widget-content' ).children().length );
 
         control.expand();
-        ok( 1 === control.container.find( '.widget-content' ).children().length );
-        ok( widgetAddedEvent );
-        ok( widgetControlRootElement.is( control.container.find( '> .widget' ) ) );
-        ok( 1 === control.container.find( '.widget-content #widget-search-2-title' ).length );
+        assert.ok( 1 === control.container.find( '.widget-content' ).children().length );
+        assert.ok( widgetAddedEvent );
+        assert.ok( widgetControlRootElement.is( control.container.find( '> .widget' ) ) );
+        assert.ok( 1 === control.container.find( '.widget-content #widget-search-2-title' ).length );
 
         $( document ).off( 'widget-added' );
     });
 
-    test( 'widgets panel should have notice', function() {
+    QUnit.test( 'widgets panel should have notice', function( assert ) {
         var panel = api.panel( 'widgets' );
-        ok( panel.extended( api.Widgets.WidgetsPanel ) );
+        assert.ok( panel.extended( api.Widgets.WidgetsPanel ) );
 
         panel.deferred.embedded.done( function() {
-            ok( 1 === panel.contentContainer.find( '.no-widget-areas-rendered-notice' ).length );
-            ok( panel.contentContainer.find( '.no-widget-areas-rendered-notice' ).is( ':visible' ) );
+            assert.ok( 1 === panel.contentContainer.find( '.no-widget-areas-rendered-notice' ).length );
+            assert.ok( panel.contentContainer.find( '.no-widget-areas-rendered-notice' ).is( ':visible' ) );
             api.section( 'sidebar-widgets-sidebar-1' ).active( true );
             api.control( 'sidebars_widgets[sidebar-1]' ).active( true );
             api.trigger( 'pane-contents-reflowed' );
-            ok( ! panel.contentContainer.find( '.no-widget-areas-rendered-notice' ).is( ':visible' ) );
+            assert.ok( ! panel.contentContainer.find( '.no-widget-areas-rendered-notice' ).is( ':visible' ) );
         } );
 
-        expect( 4 );
+        assert.expect( 4 );
     });
 });

trunk/tests/qunit/wp-admin/js/nav-menu.js

@@ -7 +7 @@
 
     // Fail if we don't see the expected number of events triggered in 3 seconds.
-    setTimeout( function() {
+    setTimeout( function( assert ) {
         // QUnit may load this file without running it, in which case `assert`
         // will never be set to `assertPassed` below.

trunk/tests/qunit/wp-admin/js/password-strength-meter.js

@@ -1 +1 @@
 /* global passwordStrength, wp, jQuery */
 jQuery( function() {
-    module( 'password-strength-meter' );
+    QUnit.module( 'password-strength-meter' );
 
-    test( 'mismatched passwords should return 5', function() {
-        equal( passwordStrength( 'password1', 'username', 'password2' ), 5, 'mismatched passwords return 5' );
+    QUnit.test( 'mismatched passwords should return 5', function( assert ) {
+        assert.equal( passwordStrength( 'password1', 'username', 'password2' ), 5, 'mismatched passwords return 5' );
     });
 
-    test( 'passwords shorter than 4 characters should return 0', function() {
-        equal( passwordStrength( 'abc', 'username', 'abc' ), 0, 'short passwords return 0' );
+    QUnit.test( 'passwords shorter than 4 characters should return 0', function( assert ) {
+        assert.equal( passwordStrength( 'abc', 'username', 'abc' ), 0, 'short passwords return 0' );
     });
 
-    test( 'long complicated passwords should return 4', function() {
+    QUnit.test( 'long complicated passwords should return 4', function( assert ) {
         var password = function( length ) {
             var i, n, retVal = '',
@@ -22 +22 @@
         twofifty = password( 250 );
 
-        equal( passwordStrength( twofifty, 'username', twofifty ), 4, '250 character complicated password returns 4' );
+        assert.equal( passwordStrength( twofifty, 'username', twofifty ), 4, '250 character complicated password returns 4' );
     });
 
-    test( 'short uncomplicated passwords should return 0', function() {
+    QUnit.test( 'short uncomplicated passwords should return 0', function( assert ) {
         var letters = 'aaaa',
             numbers = '1111',
             password = 'password',
             uppercase = 'AAAA';
-        equal( passwordStrength( letters, 'username', letters ), 0, 'password of `' + letters + '` returns 0' );
-        equal( passwordStrength( numbers, 'username', numbers ), 0, 'password of `' + numbers + '` returns 0' );
-        equal( passwordStrength( uppercase, 'username', uppercase ), 0, 'password of `' + uppercase + '` returns 0' );
-        equal( passwordStrength( password, 'username', password ), 0, 'password of `' + password + '` returns 0' );
+        assert.equal( passwordStrength( letters, 'username', letters ), 0, 'password of `' + letters + '` returns 0' );
+        assert.equal( passwordStrength( numbers, 'username', numbers ), 0, 'password of `' + numbers + '` returns 0' );
+        assert.equal( passwordStrength( uppercase, 'username', uppercase ), 0, 'password of `' + uppercase + '` returns 0' );
+        assert.equal( passwordStrength( password, 'username', password ), 0, 'password of `' + password + '` returns 0' );
     });
 
-    test( 'zxcvbn password tests should return the score we expect', function() {
+    QUnit.test( 'zxcvbn password tests should return the score we expect', function( assert ) {
         var passwords, i;
         passwords = [
@@ -77 +77 @@
 
         for ( i = 0; i < passwords.length; i++ ) {
-            equal( passwordStrength( passwords[i].pw, 'username', passwords[i].pw ), passwords[i].score, 'password of `' + passwords[i].pw + '` returns ' + passwords[i].score );
+            assert.equal( passwordStrength( passwords[i].pw, 'username', passwords[i].pw ), passwords[i].score, 'password of `' + passwords[i].pw + '` returns ' + passwords[i].score );
         }
     });
 
-    test( 'blacklisted words in password should be penalized', function() {
+    QUnit.test( 'blacklisted words in password should be penalized', function( assert ) {
         var allowedPasswordScore, penalizedPasswordScore,
             allowedPassword   = 'a[janedoefoe]4',
@@ -90 +90 @@
         penalizedPasswordScore = passwordStrength( penalizedPassword, blacklist, penalizedPassword );
 
-        ok( penalizedPasswordScore < allowedPasswordScore, 'Penalized password scored ' + penalizedPasswordScore + '; allowed password scored: ' + allowedPasswordScore );
+        assert.ok( penalizedPasswordScore < allowedPasswordScore, 'Penalized password scored ' + penalizedPasswordScore + '; allowed password scored: ' + allowedPasswordScore );
     });
 
-    test( 'user input blacklist array should contain expected words', function() {
+    QUnit.test( 'user input blacklist array should contain expected words', function( assert ) {
         var blacklist = wp.passwordStrength.userInputBlacklist();
 
-        ok( jQuery.isArray( blacklist ), 'blacklist is an array' );
-        ok( jQuery.inArray( 'WordPress', blacklist ) > -1, 'blacklist contains "WordPress" from page title' );
-        ok( jQuery.inArray( 'tests', blacklist ) > -1, 'blacklist contains "tests" from site URL' );
+        assert.ok( jQuery.isArray( blacklist ), 'blacklist is an array' );
+        assert.ok( jQuery.inArray( 'WordPress', blacklist ) > -1, 'blacklist contains "WordPress" from page title' );
+        assert.ok( jQuery.inArray( 'tests', blacklist ) > -1, 'blacklist contains "tests" from site URL' );
     });
 });

trunk/tests/qunit/wp-admin/js/widgets/test-media-gallery-widget.js

@@ -7 +7 @@
     'use strict';
 
-    module( 'Gallery Media Widget' );
+    QUnit.module( 'Gallery Media Widget' );
 
-    test( 'gallery widget control', function() {
+    QUnit.test( 'gallery widget control', function( assert ) {
         var GalleryWidgetControl;
-        equal( typeof wp.mediaWidgets.controlConstructors.media_gallery, 'function', 'wp.mediaWidgets.controlConstructors.media_gallery is a function' );
+        assert.equal( typeof wp.mediaWidgets.controlConstructors.media_gallery, 'function', 'wp.mediaWidgets.controlConstructors.media_gallery is a function' );
         GalleryWidgetControl = wp.mediaWidgets.controlConstructors.media_gallery;
-        ok( GalleryWidgetControl.prototype instanceof wp.mediaWidgets.MediaWidgetControl, 'wp.mediaWidgets.controlConstructors.media_gallery subclasses wp.mediaWidgets.MediaWidgetControl' );
+        assert.ok( GalleryWidgetControl.prototype instanceof wp.mediaWidgets.MediaWidgetControl, 'wp.mediaWidgets.controlConstructors.media_gallery subclasses wp.mediaWidgets.MediaWidgetControl' );
     });
 
-    test( 'gallery media model', function() {
+    QUnit.test( 'gallery media model', function( assert ) {
         var GalleryWidgetModel, galleryWidgetModelInstance;
-        equal( typeof wp.mediaWidgets.modelConstructors.media_gallery, 'function', 'wp.mediaWidgets.modelConstructors.media_gallery is a function' );
+        assert.equal( typeof wp.mediaWidgets.modelConstructors.media_gallery, 'function', 'wp.mediaWidgets.modelConstructors.media_gallery is a function' );
         GalleryWidgetModel = wp.mediaWidgets.modelConstructors.media_gallery;
-        ok( GalleryWidgetModel.prototype instanceof wp.mediaWidgets.MediaWidgetModel, 'wp.mediaWidgets.modelConstructors.media_gallery subclasses wp.mediaWidgets.MediaWidgetModel' );
+        assert.ok( GalleryWidgetModel.prototype instanceof wp.mediaWidgets.MediaWidgetModel, 'wp.mediaWidgets.modelConstructors.media_gallery subclasses wp.mediaWidgets.MediaWidgetModel' );
 
         galleryWidgetModelInstance = new GalleryWidgetModel();
         _.each( galleryWidgetModelInstance.attributes, function( value, key ) {
-            equal( value, GalleryWidgetModel.prototype.schema[ key ][ 'default' ], 'Should properly set default for ' + key );
+            assert.equal( value, GalleryWidgetModel.prototype.schema[ key ][ 'default' ], 'Should properly set default for ' + key );
         });
     });

trunk/tests/qunit/wp-admin/js/widgets/test-media-image-widget.js

@@ -7 +7 @@
     'use strict';
 
-    module( 'Image Media Widget' );
+    QUnit.module( 'Image Media Widget' );
 
-    test( 'image widget control', function() {
+    QUnit.test( 'image widget control', function( assert ) {
         var ImageWidgetControl, imageWidgetControlInstance, imageWidgetModelInstance, mappedProps, testImageUrl, templateProps;
         testImageUrl = 'http://s.w.org/style/images/wp-header-logo.png';
-        equal( typeof wp.mediaWidgets.controlConstructors.media_image, 'function', 'wp.mediaWidgets.controlConstructors.media_image is a function' );
+        assert.equal( typeof wp.mediaWidgets.controlConstructors.media_image, 'function', 'wp.mediaWidgets.controlConstructors.media_image is a function' );
         ImageWidgetControl = wp.mediaWidgets.controlConstructors.media_image;
-        ok( ImageWidgetControl.prototype instanceof wp.mediaWidgets.MediaWidgetControl, 'wp.mediaWidgets.controlConstructors.media_image subclasses wp.mediaWidgets.MediaWidgetControl' );
+        assert.ok( ImageWidgetControl.prototype instanceof wp.mediaWidgets.MediaWidgetControl, 'wp.mediaWidgets.controlConstructors.media_image subclasses wp.mediaWidgets.MediaWidgetControl' );
 
         imageWidgetModelInstance = new wp.mediaWidgets.modelConstructors.media_image();
@@ -25 +25 @@
         // Test mapModelToPreviewTemplateProps() when no data is set.
         templateProps = imageWidgetControlInstance.mapModelToPreviewTemplateProps();
-        equal( templateProps.caption, undefined, 'mapModelToPreviewTemplateProps should not return attributes that are should_preview_update false' );
-        equal( templateProps.attachment_id, 0, 'mapModelToPreviewTemplateProps should return default values' );
-        equal( templateProps.currentFilename, '', 'mapModelToPreviewTemplateProps should return a currentFilename' );
+        assert.equal( templateProps.caption, undefined, 'mapModelToPreviewTemplateProps should not return attributes that are should_preview_update false' );
+        assert.equal( templateProps.attachment_id, 0, 'mapModelToPreviewTemplateProps should return default values' );
+        assert.equal( templateProps.currentFilename, '', 'mapModelToPreviewTemplateProps should return a currentFilename' );
 
         // Test mapModelToPreviewTemplateProps() when data is set on model.
         imageWidgetControlInstance.model.set( { url: testImageUrl, alt: 'some alt text', link_type: 'none' } );
         templateProps = imageWidgetControlInstance.mapModelToPreviewTemplateProps();
-        equal( templateProps.currentFilename, 'wp-header-logo.png', 'mapModelToPreviewTemplateProps should set currentFilename based off of url' );
-        equal( templateProps.url, testImageUrl, 'mapModelToPreviewTemplateProps should return the proper url' );
-        equal( templateProps.alt, 'some alt text', 'mapModelToPreviewTemplateProps should return the proper alt text' );
-        equal( templateProps.link_type, undefined, 'mapModelToPreviewTemplateProps should ignore attributes that are not needed in the preview' );
-        equal( templateProps.error, false, 'mapModelToPreviewTemplateProps should return error state' );
+        assert.equal( templateProps.currentFilename, 'wp-header-logo.png', 'mapModelToPreviewTemplateProps should set currentFilename based off of url' );
+        assert.equal( templateProps.url, testImageUrl, 'mapModelToPreviewTemplateProps should return the proper url' );
+        assert.equal( templateProps.alt, 'some alt text', 'mapModelToPreviewTemplateProps should return the proper alt text' );
+        assert.equal( templateProps.link_type, undefined, 'mapModelToPreviewTemplateProps should ignore attributes that are not needed in the preview' );
+        assert.equal( templateProps.error, false, 'mapModelToPreviewTemplateProps should return error state' );
 
         // Test mapModelToPreviewTemplateProps() when error is set on model.
         imageWidgetControlInstance.model.set( 'error', 'missing_attachment' );
         templateProps = imageWidgetControlInstance.mapModelToPreviewTemplateProps();
-        equal( templateProps.error, 'missing_attachment', 'mapModelToPreviewTemplateProps should return error string' );
+        assert.equal( templateProps.error, 'missing_attachment', 'mapModelToPreviewTemplateProps should return error string' );
 
         // Reset model.
@@ -47 +47 @@
 
         // Test isSelected().
-        equal( imageWidgetControlInstance.isSelected(), false, 'media_image.isSelected() should return false when no media is selected' );
+        assert.equal( imageWidgetControlInstance.isSelected(), false, 'media_image.isSelected() should return false when no media is selected' );
         imageWidgetControlInstance.model.set({ error: 'missing_attachment', attachment_id: 777 });
-        equal( imageWidgetControlInstance.isSelected(), false, 'media_image.isSelected() should return false when media is selected and error is set' );
+        assert.equal( imageWidgetControlInstance.isSelected(), false, 'media_image.isSelected() should return false when media is selected and error is set' );
         imageWidgetControlInstance.model.set({ error: false, attachment_id: 777 });
-        equal( imageWidgetControlInstance.isSelected(), true, 'media_image.isSelected() should return true when media is selected and no error exists' );
+        assert.equal( imageWidgetControlInstance.isSelected(), true, 'media_image.isSelected() should return true when media is selected and no error exists' );
         imageWidgetControlInstance.model.set({ error: false, attachment_id: 0, url: testImageUrl });
-        equal( imageWidgetControlInstance.isSelected(), true, 'media_image.isSelected() should return true when url is set and no error exists' );
+        assert.equal( imageWidgetControlInstance.isSelected(), true, 'media_image.isSelected() should return true when url is set and no error exists' );
 
         // Reset model.
@@ -61 +61 @@
         imageWidgetControlInstance.render();
         imageWidgetControlInstance.$el.find( '.title' ).val( 'Chicken and Ribs' ).trigger( 'input' );
-        equal( imageWidgetModelInstance.get( 'title' ), 'Chicken and Ribs', 'Changing title should update model title attribute' );
+        assert.equal( imageWidgetModelInstance.get( 'title' ), 'Chicken and Ribs', 'Changing title should update model title attribute' );
 
         // Test mapMediaToModelProps.
         mappedProps = imageWidgetControlInstance.mapMediaToModelProps( { link: 'file', url: testImageUrl } );
-        equal( mappedProps.link_url, testImageUrl, 'mapMediaToModelProps should set file link_url according to mediaFrameProps.link' );
+        assert.equal( mappedProps.link_url, testImageUrl, 'mapMediaToModelProps should set file link_url according to mediaFrameProps.link' );
         mappedProps = imageWidgetControlInstance.mapMediaToModelProps( { link: 'post', postUrl: 'https://wordpress.org/image-2/' } );
-        equal( mappedProps.link_url, 'https://wordpress.org/image-2/', 'mapMediaToModelProps should set file link_url according to mediaFrameProps.link' );
+        assert.equal( mappedProps.link_url, 'https://wordpress.org/image-2/', 'mapMediaToModelProps should set file link_url according to mediaFrameProps.link' );
         mappedProps = imageWidgetControlInstance.mapMediaToModelProps( { link: 'custom', linkUrl: 'https://wordpress.org' } );
-        equal( mappedProps.link_url, 'https://wordpress.org', 'mapMediaToModelProps should set custom link_url according to mediaFrameProps.linkUrl' );
+        assert.equal( mappedProps.link_url, 'https://wordpress.org', 'mapMediaToModelProps should set custom link_url according to mediaFrameProps.linkUrl' );
 
         // Test mapModelToMediaFrameProps().
         imageWidgetControlInstance.model.set({ error: false, url: testImageUrl, 'link_type': 'custom', 'link_url': 'https://wordpress.org', 'size': 'custom', 'width': 100, 'height': 150, 'title': 'widget title', 'image_title': 'title of image' });
         mappedProps = imageWidgetControlInstance.mapModelToMediaFrameProps( imageWidgetControlInstance.model.toJSON() );
-        equal( mappedProps.linkUrl, 'https://wordpress.org', 'mapModelToMediaFrameProps should set linkUrl from model.link_url' );
-        equal( mappedProps.link, 'custom', 'mapModelToMediaFrameProps should set link from model.link_type' );
-        equal( mappedProps.width, 100, 'mapModelToMediaFrameProps should set width when model.size is custom' );
-        equal( mappedProps.height, 150, 'mapModelToMediaFrameProps should set height when model.size is custom' );
-        equal( mappedProps.title, 'title of image', 'mapModelToMediaFrameProps should set title from model.image_title' );
+        assert.equal( mappedProps.linkUrl, 'https://wordpress.org', 'mapModelToMediaFrameProps should set linkUrl from model.link_url' );
+        assert.equal( mappedProps.link, 'custom', 'mapModelToMediaFrameProps should set link from model.link_type' );
+        assert.equal( mappedProps.width, 100, 'mapModelToMediaFrameProps should set width when model.size is custom' );
+        assert.equal( mappedProps.height, 150, 'mapModelToMediaFrameProps should set height when model.size is custom' );
+        assert.equal( mappedProps.title, 'title of image', 'mapModelToMediaFrameProps should set title from model.image_title' );
     });
 
-    test( 'image widget control renderPreview', function( assert ) {
+    QUnit.test( 'image widget control renderPreview', function( assert ) {
         var imageWidgetControlInstance, imageWidgetModelInstance, done;
         done = assert.async();
@@ -91 +91 @@
             model: imageWidgetModelInstance
         });
-        equal( imageWidgetControlInstance.$el.find( 'img' ).length, 0, 'No images should be rendered' );
+        assert.equal( imageWidgetControlInstance.$el.find( 'img' ).length, 0, 'No images should be rendered' );
         imageWidgetControlInstance.model.set({ error: false, url: 'http://s.w.org/style/images/wp-header-logo.png' });
 
         // Due to renderPreview being deferred.
         setTimeout( function() {
-            equal( imageWidgetControlInstance.$el.find( 'img[src="http://s.w.org/style/images/wp-header-logo.png"]' ).length, 1, 'One image should be rendered' );
+            assert.equal( imageWidgetControlInstance.$el.find( 'img[src="http://s.w.org/style/images/wp-header-logo.png"]' ).length, 1, 'One image should be rendered' );
             done();
         }, 50 );
 
-        start();
+        done();
     });
 
-    test( 'image media model', function() {
+    QUnit.test( 'image media model', function( assert ) {
         var ImageWidgetModel, imageWidgetModelInstance;
-        equal( typeof wp.mediaWidgets.modelConstructors.media_image, 'function', 'wp.mediaWidgets.modelConstructors.media_image is a function' );
+        assert.equal( typeof wp.mediaWidgets.modelConstructors.media_image, 'function', 'wp.mediaWidgets.modelConstructors.media_image is a function' );
         ImageWidgetModel = wp.mediaWidgets.modelConstructors.media_image;
-        ok( ImageWidgetModel.prototype instanceof wp.mediaWidgets.MediaWidgetModel, 'wp.mediaWidgets.modelConstructors.media_image subclasses wp.mediaWidgets.MediaWidgetModel' );
+        assert.ok( ImageWidgetModel.prototype instanceof wp.mediaWidgets.MediaWidgetModel, 'wp.mediaWidgets.modelConstructors.media_image subclasses wp.mediaWidgets.MediaWidgetModel' );
 
         imageWidgetModelInstance = new ImageWidgetModel();
         _.each( imageWidgetModelInstance.attributes, function( value, key ) {
-            equal( value, ImageWidgetModel.prototype.schema[ key ][ 'default' ], 'Should properly set default for ' + key );
+            assert.equal( value, ImageWidgetModel.prototype.schema[ key ][ 'default' ], 'Should properly set default for ' + key );
         });
     });

trunk/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js

@@ -7 +7 @@
     'use strict';
 
-    module( 'Video Media Widget' );
+    QUnit.module( 'Video Media Widget' );
 
-    test( 'video widget control', function() {
+    QUnit.test( 'video widget control', function( assert ) {
         var VideoWidgetControl, videoWidgetControlInstance, videoWidgetModelInstance, mappedProps, testVideoUrl;
         testVideoUrl = 'https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4';
-        equal( typeof wp.mediaWidgets.controlConstructors.media_video, 'function', 'wp.mediaWidgets.controlConstructors.media_video is a function' );
+        assert.equal( typeof wp.mediaWidgets.controlConstructors.media_video, 'function', 'wp.mediaWidgets.controlConstructors.media_video is a function' );
         VideoWidgetControl = wp.mediaWidgets.controlConstructors.media_video;
-        ok( VideoWidgetControl.prototype instanceof wp.mediaWidgets.MediaWidgetControl, 'wp.mediaWidgets.controlConstructors.media_video subclasses wp.mediaWidgets.MediaWidgetControl' );
+        assert.ok( VideoWidgetControl.prototype instanceof wp.mediaWidgets.MediaWidgetControl, 'wp.mediaWidgets.controlConstructors.media_video subclasses wp.mediaWidgets.MediaWidgetControl' );
 
         videoWidgetModelInstance = new wp.mediaWidgets.modelConstructors.media_video();
@@ -26 +26 @@
         videoWidgetControlInstance.model.set({ error: false, url: testVideoUrl, loop: false, preload: 'meta' });
         mappedProps = videoWidgetControlInstance.mapModelToMediaFrameProps( videoWidgetControlInstance.model.toJSON() );
-        equal( mappedProps.url, testVideoUrl, 'mapModelToMediaFrameProps should set url' );
-        equal( mappedProps.loop, false, 'mapModelToMediaFrameProps should set loop' );
-        equal( mappedProps.preload, 'meta', 'mapModelToMediaFrameProps should set preload' );
+        assert.equal( mappedProps.url, testVideoUrl, 'mapModelToMediaFrameProps should set url' );
+        assert.equal( mappedProps.loop, false, 'mapModelToMediaFrameProps should set loop' );
+        assert.equal( mappedProps.preload, 'meta', 'mapModelToMediaFrameProps should set preload' );
 
         // Test mapMediaToModelProps().
         mappedProps = videoWidgetControlInstance.mapMediaToModelProps( { loop: false, preload: 'meta', url: testVideoUrl, title: 'random movie file title' } );
-        equal( mappedProps.title, undefined, 'mapMediaToModelProps should ignore title inputs' );
-        equal( mappedProps.loop, false, 'mapMediaToModelProps should set loop' );
-        equal( mappedProps.preload, 'meta', 'mapMediaToModelProps should set preload' );
+        assert.equal( mappedProps.title, undefined, 'mapMediaToModelProps should ignore title inputs' );
+        assert.equal( mappedProps.loop, false, 'mapMediaToModelProps should set loop' );
+        assert.equal( mappedProps.preload, 'meta', 'mapMediaToModelProps should set preload' );
     });
 
-    test( 'video widget control renderPreview', function( assert ) {
+    QUnit.test( 'video widget control renderPreview', function( assert ) {
         var videoWidgetControlInstance, videoWidgetModelInstance, done;
         done = assert.async();
@@ -47 +47 @@
             model: videoWidgetModelInstance
         });
-        equal( videoWidgetControlInstance.$el.find( 'a' ).length, 0, 'No video links should be rendered' );
+        assert.equal( videoWidgetControlInstance.$el.find( 'a' ).length, 0, 'No video links should be rendered' );
         videoWidgetControlInstance.model.set({ error: false, url: 'https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4' });
 
         // Due to renderPreview being deferred.
         setTimeout( function() {
-            equal( videoWidgetControlInstance.$el.find( 'a[href="https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4"]' ).length, 1, 'One video link should be rendered' );
+            assert.equal( videoWidgetControlInstance.$el.find( 'a[href="https://videos.files.wordpress.com/AHz0Ca46/wp4-7-vaughan-r8-mastered_hd.mp4"]' ).length, 1, 'One video link should be rendered' );
             done();
         }, 50 );
-        start();
+
+        done();
     });
 
-    test( 'video media model', function() {
+    QUnit.test( 'video media model', function( assert ) {
         var VideoWidgetModel, videoWidgetModelInstance;
-        equal( typeof wp.mediaWidgets.modelConstructors.media_video, 'function', 'wp.mediaWidgets.modelConstructors.media_video is a function' );
+        assert.equal( typeof wp.mediaWidgets.modelConstructors.media_video, 'function', 'wp.mediaWidgets.modelConstructors.media_video is a function' );
         VideoWidgetModel = wp.mediaWidgets.modelConstructors.media_video;
-        ok( VideoWidgetModel.prototype instanceof wp.mediaWidgets.MediaWidgetModel, 'wp.mediaWidgets.modelConstructors.media_video subclasses wp.mediaWidgets.MediaWidgetModel' );
+        assert.ok( VideoWidgetModel.prototype instanceof wp.mediaWidgets.MediaWidgetModel, 'wp.mediaWidgets.modelConstructors.media_video subclasses wp.mediaWidgets.MediaWidgetModel' );
 
         videoWidgetModelInstance = new VideoWidgetModel();
         _.each( videoWidgetModelInstance.attributes, function( value, key ) {
-            equal( value, VideoWidgetModel.prototype.schema[ key ][ 'default' ], 'Should properly set default for ' + key );
+            assert.equal( value, VideoWidgetModel.prototype.schema[ key ][ 'default' ], 'Should properly set default for ' + key );
         });
     });

trunk/tests/qunit/wp-admin/js/widgets/test-media-widgets.js

@@ -3 +3 @@
 /* eslint-env qunit */
 
-(function() {
+( function() {
     'use strict';
 
-    module( 'Media Widgets' );
+    QUnit.module( 'Media Widgets' );
 
-    test( 'namespace', function() {
-        equal( typeof wp.mediaWidgets, 'object', 'wp.mediaWidgets is an object' );
-        equal( typeof wp.mediaWidgets.controlConstructors, 'object', 'wp.mediaWidgets.controlConstructors is an object' );
-        equal( typeof wp.mediaWidgets.modelConstructors, 'object', 'wp.mediaWidgets.modelConstructors is an object' );
-        equal( typeof wp.mediaWidgets.widgetControls, 'object', 'wp.mediaWidgets.widgetControls is an object' );
-        equal( typeof wp.mediaWidgets.handleWidgetAdded, 'function', 'wp.mediaWidgets.handleWidgetAdded is an function' );
-        equal( typeof wp.mediaWidgets.handleWidgetUpdated, 'function', 'wp.mediaWidgets.handleWidgetUpdated is an function' );
-        equal( typeof wp.mediaWidgets.init, 'function', 'wp.mediaWidgets.init is an function' );
+    QUnit.test( 'namespace', function( assert ) {
+        assert.equal( typeof wp.mediaWidgets, 'object', 'wp.mediaWidgets is an object' );
+        assert.equal( typeof wp.mediaWidgets.controlConstructors, 'object', 'wp.mediaWidgets.controlConstructors is an object' );
+        assert.equal( typeof wp.mediaWidgets.modelConstructors, 'object', 'wp.mediaWidgets.modelConstructors is an object' );
+        assert.equal( typeof wp.mediaWidgets.widgetControls, 'object', 'wp.mediaWidgets.widgetControls is an object' );
+        assert.equal( typeof wp.mediaWidgets.handleWidgetAdded, 'function', 'wp.mediaWidgets.handleWidgetAdded is an function' );
+        assert.equal( typeof wp.mediaWidgets.handleWidgetUpdated, 'function', 'wp.mediaWidgets.handleWidgetUpdated is an function' );
+        assert.equal( typeof wp.mediaWidgets.init, 'function', 'wp.mediaWidgets.init is an function' );
     });
 
-    test( 'media widget control', function() {
-        equal( typeof wp.mediaWidgets.MediaWidgetControl, 'function', 'wp.mediaWidgets.MediaWidgetControl' );
-        ok( wp.mediaWidgets.MediaWidgetControl.prototype instanceof Backbone.View, 'wp.mediaWidgets.MediaWidgetControl subclasses Backbone.View' );
+    QUnit.test( 'media widget control', function( assert ) {
+        assert.equal( typeof wp.mediaWidgets.MediaWidgetControl, 'function', 'wp.mediaWidgets.MediaWidgetControl' );
+        assert.ok( wp.mediaWidgets.MediaWidgetControl.prototype instanceof Backbone.View, 'wp.mediaWidgets.MediaWidgetControl subclasses Backbone.View' );
     });
 
-    test( 'media widget model', function() {
+    QUnit.test( 'media widget model', function( assert ) {
         var widgetModelInstance;
-        equal( typeof wp.mediaWidgets.MediaWidgetModel, 'function', 'wp.mediaWidgets.MediaWidgetModel is a function' );
-        ok( wp.mediaWidgets.MediaWidgetModel.prototype instanceof Backbone.Model, 'wp.mediaWidgets.MediaWidgetModel subclasses Backbone.Model' );
+        assert.equal( typeof wp.mediaWidgets.MediaWidgetModel, 'function', 'wp.mediaWidgets.MediaWidgetModel is a function' );
+        assert.ok( wp.mediaWidgets.MediaWidgetModel.prototype instanceof Backbone.Model, 'wp.mediaWidgets.MediaWidgetModel subclasses Backbone.Model' );
 
         widgetModelInstance = new wp.mediaWidgets.MediaWidgetModel();
-        equal( widgetModelInstance.get( 'title' ), '', 'wp.mediaWidgets.MediaWidgetModel defaults title to empty string' );
-        equal( widgetModelInstance.get( 'attachment_id' ), 0, 'wp.mediaWidgets.MediaWidgetModel defaults attachment_id to 0' );
-        equal( widgetModelInstance.get( 'url' ), 0, 'wp.mediaWidgets.MediaWidgetModel defaults url to empty string' );
+        assert.equal( widgetModelInstance.get( 'title' ), '', 'wp.mediaWidgets.MediaWidgetModel defaults title to empty string' );
+        assert.equal( widgetModelInstance.get( 'attachment_id' ), 0, 'wp.mediaWidgets.MediaWidgetModel defaults attachment_id to 0' );
+        assert.equal( widgetModelInstance.get( 'url' ), 0, 'wp.mediaWidgets.MediaWidgetModel defaults url to empty string' );
 
         widgetModelInstance.set({
@@ -38 +38 @@
             url: 'https://wordpress.org'
         });
-        equal( widgetModelInstance.get( 'title' ), 'chicken and ribs', 'wp.mediaWidgets.MediaWidgetModel properly sets the title attribute' );
-        equal( widgetModelInstance.get( 'url' ), 'https://wordpress.org', 'wp.mediaWidgets.MediaWidgetModel properly sets the url attribute' );
-        equal( widgetModelInstance.get( 'attachment_id' ), 1, 'wp.mediaWidgets.MediaWidgetModel properly sets and casts the attachment_id attribute' );
+        assert.equal( widgetModelInstance.get( 'title' ), 'chicken and ribs', 'wp.mediaWidgets.MediaWidgetModel properly sets the title attribute' );
+        assert.equal( widgetModelInstance.get( 'url' ), 'https://wordpress.org', 'wp.mediaWidgets.MediaWidgetModel properly sets the url attribute' );
+        assert.equal( widgetModelInstance.get( 'attachment_id' ), 1, 'wp.mediaWidgets.MediaWidgetModel properly sets and casts the attachment_id attribute' );
     });
 

trunk/tests/qunit/wp-includes/js/shortcode.js

@@ -1 +1 @@
 /* global wp, jQuery */
 jQuery( function() {
-    module( 'shortcode' );
-
-    test( 'next() should find the shortcode', function() {
+    QUnit.module( 'shortcode' );
+
+    QUnit.test( 'next() should find the shortcode', function( assert ) {
         var result;
 
         // Basic.
         result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode' );
-        equal( result.index, 13, 'foo shortcode found at index 13' );
+        assert.equal( result.index, 13, 'foo shortcode found at index 13' );
 
         result = wp.shortcode.next( 'foo', 'this has the [foo param="foo"] shortcode' );
-        equal( result.index, 13, 'foo shortcode with params found at index 13' );
-    });
-
-    test( 'next() should not find shortcodes that are not there', function() {
+        assert.equal( result.index, 13, 'foo shortcode with params found at index 13' );
+    });
+
+    QUnit.test( 'next() should not find shortcodes that are not there', function( assert ) {
         var result;
 
         // Not found.
         result = wp.shortcode.next( 'bar', 'this has the [foo] shortcode' );
-        equal( result, undefined, 'bar shortcode not found' );
+        assert.equal( result, undefined, 'bar shortcode not found' );
 
         result = wp.shortcode.next( 'bar', 'this has the [foo param="bar"] shortcode' );
-        equal( result, undefined, 'bar shortcode not found with params' );
-    });
-
-    test( 'next() should find the shortcode when told to start looking beyond the start of the string', function() {
+        assert.equal( result, undefined, 'bar shortcode not found with params' );
+    });
+
+    QUnit.test( 'next() should find the shortcode when told to start looking beyond the start of the string', function( assert ) {
         var result;
 
         // Starting at indices.
         result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode', 12 );
-        equal( result.index, 13, 'foo shortcode found before index 13' );
+        assert.equal( result.index, 13, 'foo shortcode found before index 13' );
 
         result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode', 13 );
-        equal( result.index, 13, 'foo shortcode found at index 13' );
+        assert.equal( result.index, 13, 'foo shortcode found at index 13' );
 
         result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode', 14 );
-        equal( result, undefined, 'foo shortcode not found after index 13' );
-    });
-
-    test( 'next() should find the second instances of the shortcode when the starting indice is after the start of the first one', function() {
+        assert.equal( result, undefined, 'foo shortcode not found after index 13' );
+    });
+
+    QUnit.test( 'next() should find the second instances of the shortcode when the starting indice is after the start of the first one', function( assert ) {
         var result;
 
         result = wp.shortcode.next( 'foo', 'this has the [foo] shortcode [foo] twice', 14 );
-        equal( result.index, 29, 'foo shortcode found the second foo at index 29' );
-    });
-
-
-    test( 'next() should not find escaped shortcodes', function() {
+        assert.equal( result.index, 29, 'foo shortcode found the second foo at index 29' );
+    });
+
+
+    QUnit.test( 'next() should not find escaped shortcodes', function( assert ) {
         var result;
 
         // Escaped.
         result = wp.shortcode.next( 'foo', 'this has the [[foo]] shortcode' );
-        equal( result, undefined, 'foo shortcode not found when escaped' );
+        assert.equal( result, undefined, 'foo shortcode not found when escaped' );
 
         result = wp.shortcode.next( 'foo', 'this has the [[foo param="foo"]] shortcode' );
-        equal( result, undefined, 'foo shortcode not found when escaped with params' );
-    });
-
-    test( 'next() should find shortcodes that are incorrectly escaped by newlines', function() {
+        assert.equal( result, undefined, 'foo shortcode not found when escaped with params' );
+    });
+
+    QUnit.test( 'next() should find shortcodes that are incorrectly escaped by newlines', function( assert ) {
         var result;
 
         result = wp.shortcode.next( 'foo', 'this has the [\n[foo]] shortcode' );
-        equal( result.index, 15, 'shortcode found when incorrectly escaping the start of it' );
+        assert.equal( result.index, 15, 'shortcode found when incorrectly escaping the start of it' );
 
         result = wp.shortcode.next( 'foo', 'this has the [[foo]\n] shortcode' );
-        equal( result.index, 14, 'shortcode found when incorrectly escaping the end of it' );
-    });
-
-    test( 'next() should still work when there are not equal ammounts of square brackets', function() {
+        assert.equal( result.index, 14, 'shortcode found when incorrectly escaping the end of it' );
+    });
+
+    QUnit.test( 'next() should still work when there are not equal ammounts of square brackets', function( assert ) {
         var result;
 
         result = wp.shortcode.next( 'foo', 'this has the [[foo] shortcode' );
-        equal( result.index, 14, 'shortcode found when there are offset square brackets' );
+        assert.equal( result.index, 14, 'shortcode found when there are offset square brackets' );
 
         result = wp.shortcode.next( 'foo', 'this has the [foo]] shortcode' );
-        equal( result.index, 13, 'shortcode found when there are offset square brackets' );
-    });
-
-    test( 'next() should find the second instances of the shortcode when the first one is escaped', function() {
+        assert.equal( result.index, 13, 'shortcode found when there are offset square brackets' );
+    });
+
+    QUnit.test( 'next() should find the second instances of the shortcode when the first one is escaped', function( assert ) {
         var result;
 
 
         result = wp.shortcode.next( 'foo', 'this has the [[foo]] shortcode [foo] twice' );
-        equal( result.index, 31, 'foo shortcode found the non-escaped foo at index 31' );
-    });
-
-    test( 'next() should not find shortcodes that are not full matches', function() {
+        assert.equal( result.index, 31, 'foo shortcode found the non-escaped foo at index 31' );
+    });
+
+    QUnit.test( 'next() should not find shortcodes that are not full matches', function( assert ) {
         var result;
 
         // Stubs.
         result = wp.shortcode.next( 'foo', 'this has the [foobar] shortcode' );
-        equal( result, undefined, 'stub does not trigger match' );
+        assert.equal( result, undefined, 'stub does not trigger match' );
 
         result = wp.shortcode.next( 'foobar', 'this has the [foo] shortcode' );
-        equal( result, undefined, 'stub does not trigger match' );
-    });
-
-    test( 'replace() should replace the shortcode', function() {
+        assert.equal( result, undefined, 'stub does not trigger match' );
+    });
+
+    QUnit.test( 'replace() should replace the shortcode', function( assert ) {
         var result;
 
         // Basic.
         result = wp.shortcode.replace( 'foo', 'this has the [foo] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the bar shortcode', 'foo replaced with bar' );
+        assert.equal( result, 'this has the bar shortcode', 'foo replaced with bar' );
 
         result = wp.shortcode.replace( 'foo', 'this has the [foo param="foo"] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the bar shortcode', 'foo and params replaced with bar' );
-    });
-
-    test( 'replace() should not replace the shortcode when it does not match', function() {
+        assert.equal( result, 'this has the bar shortcode', 'foo and params replaced with bar' );
+    });
+
+    QUnit.test( 'replace() should not replace the shortcode when it does not match', function( assert ) {
         var result;
 
         // Not found.
         result = wp.shortcode.replace( 'bar', 'this has the [foo] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the [foo] shortcode', 'bar not found' );
+        assert.equal( result, 'this has the [foo] shortcode', 'bar not found' );
 
         result = wp.shortcode.replace( 'bar', 'this has the [foo param="bar"] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the [foo param="bar"] shortcode', 'bar not found with params' );
-    });
-
-    test( 'replace() should replace the shortcode in all instances of its use', function() {
+        assert.equal( result, 'this has the [foo param="bar"] shortcode', 'bar not found with params' );
+    });
+
+    QUnit.test( 'replace() should replace the shortcode in all instances of its use', function( assert ) {
         var result;
 
         // Multiple instances.
         result = wp.shortcode.replace( 'foo', 'this has the [foo] shortcode [foo] twice', shortcodeReplaceCallback );
-        equal( result, 'this has the bar shortcode bar twice', 'foo replaced with bar twice' );
+        assert.equal( result, 'this has the bar shortcode bar twice', 'foo replaced with bar twice' );
 
         result = wp.shortcode.replace( 'foo', 'this has the [foo param="foo"] shortcode [foo] twice', shortcodeReplaceCallback );
-        equal( result, 'this has the bar shortcode bar twice', 'foo and params replaced with bar twice' );
-    });
-
-    test( 'replace() should not replace the escaped shortcodes', function() {
+        assert.equal( result, 'this has the bar shortcode bar twice', 'foo and params replaced with bar twice' );
+    });
+
+    QUnit.test( 'replace() should not replace the escaped shortcodes', function( assert ) {
         var result;
 
         // Escaped.
         result = wp.shortcode.replace( 'foo', 'this has the [[foo]] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the [[foo]] shortcode', 'escaped foo not replaced' );
+        assert.equal( result, 'this has the [[foo]] shortcode', 'escaped foo not replaced' );
 
         result = wp.shortcode.replace( 'foo', 'this has the [[foo param="bar"]] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the [[foo param="bar"]] shortcode', 'escaped foo with params not replaced' );
+        assert.equal( result, 'this has the [[foo param="bar"]] shortcode', 'escaped foo with params not replaced' );
 
         result = wp.shortcode.replace( 'foo', 'this [foo] has the [[foo param="bar"]] shortcode escaped', shortcodeReplaceCallback );
-        equal( result, 'this bar has the [[foo param="bar"]] shortcode escaped', 'escaped foo with params not replaced but unescaped foo replaced' );
-    });
-
-    test( 'replace() should replace improperly escaped shortcodes that include newlines', function() {
+        assert.equal( result, 'this bar has the [[foo param="bar"]] shortcode escaped', 'escaped foo with params not replaced but unescaped foo replaced' );
+    });
+
+    QUnit.test( 'replace() should replace improperly escaped shortcodes that include newlines', function( assert ) {
         var result;
 
         result = wp.shortcode.replace( 'foo', 'this [foo] has the [[foo param="bar"]\n] shortcode ', shortcodeReplaceCallback );
-        equal( result, 'this bar has the [bar\n] shortcode ', 'escaping with newlines should not actually escape the content' );
+        assert.equal( result, 'this bar has the [bar\n] shortcode ', 'escaping with newlines should not actually escape the content' );
 
         result = wp.shortcode.replace( 'foo', 'this [foo] has the [\n[foo param="bar"]] shortcode ', shortcodeReplaceCallback );
-        equal( result, 'this bar has the [\nbar] shortcode ', 'escaping with newlines should not actually escape the content' );
-    });
-
-    test( 'replace() should not replace the shortcode when it is an incomplete match', function() {
+        assert.equal( result, 'this bar has the [\nbar] shortcode ', 'escaping with newlines should not actually escape the content' );
+    });
+
+    QUnit.test( 'replace() should not replace the shortcode when it is an incomplete match', function( assert ) {
         var result;
 
         // Stubs.
         result = wp.shortcode.replace( 'foo', 'this has the [foobar] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the [foobar] shortcode', 'stub not replaced' );
+        assert.equal( result, 'this has the [foobar] shortcode', 'stub not replaced' );
 
         result = wp.shortcode.replace( 'foobar', 'this has the [foo] shortcode', shortcodeReplaceCallback );
-        equal( result, 'this has the [foo] shortcode', 'stub not replaced' );
+        assert.equal( result, 'this has the [foo] shortcode', 'stub not replaced' );
     });
 
@@ -172 +172 @@
     }
 
-    test( 'attrs() should return named attributes created with single, double, and no quotes', function() {
+    QUnit.test( 'attrs() should return named attributes created with single, double, and no quotes', function( assert ) {
         var expected = {
             'named': {
@@ -181 +181 @@
         };
 
-        deepEqual( wp.shortcode.attrs('param="foo" another=\'bar\' andagain=baz'), expected, 'attr parsed all three named types');
+        assert.deepEqual( wp.shortcode.attrs('param="foo" another=\'bar\' andagain=baz'), expected, 'attr parsed all three named types');
     });
 
-    test( 'attrs() should return numeric attributes in the order they are used', function() {
+    QUnit.test( 'attrs() should return numeric attributes in the order they are used', function( assert ) {
         var expected = {
             'named': {}, 'numeric' : ['foo', 'bar', 'baz']
         };
 
-        deepEqual( wp.shortcode.attrs('foo bar baz'), expected, 'attr parsed numeric attributes');
+        assert.deepEqual( wp.shortcode.attrs('foo bar baz'), expected, 'attr parsed numeric attributes');
     });
 
-    test( 'attrs() should return numeric attributes in the order they are used when they have named attributes in between', function() {
+    QUnit.test( 'attrs() should return numeric attributes in the order they are used when they have named attributes in between', function( assert ) {
         var expected = {
             'named': { 'not': 'a blocker'  }, 'numeric' : ['foo', 'bar', 'baz']
         };
 
-        deepEqual( wp.shortcode.attrs('foo not="a blocker" bar baz'), expected, 'attr parsed numeric attributes');
+        assert.deepEqual( wp.shortcode.attrs('foo not="a blocker" bar baz'), expected, 'attr parsed numeric attributes');
     });
 
-    test( 'attrs() should return numeric attributes created with single, double, and no quotes', function() {
+    QUnit.test( 'attrs() should return numeric attributes created with single, double, and no quotes', function( assert ) {
         var expected = {
             'named': {}, 'numeric' : ['foo', 'bar', 'baz']
         };
 
-        deepEqual( wp.shortcode.attrs('foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
+        assert.deepEqual( wp.shortcode.attrs('foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
     });
     
-    test( 'attrs() should return mixed attributes created with single, double, and no quotes', function() {
+    QUnit.test( 'attrs() should return mixed attributes created with single, double, and no quotes', function( assert ) {
         var expected = {
             'named': { a: 'foo', b: 'bar', c: 'baz' }, 'numeric' : ['foo', 'bar', 'baz']
         };
 
-        deepEqual( wp.shortcode.attrs('a="foo" b=\'bar\' c=baz foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
-    });
-
-    test( 'string() should accept attrs in any order', function() {
+        assert.deepEqual( wp.shortcode.attrs('a="foo" b=\'bar\' c=baz foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
+    });
+
+    QUnit.test( 'string() should accept attrs in any order', function( assert ) {
         var expected = '[short abc123 foo="bar"]';
         var result;
@@ -228 +228 @@
             }
         });
-        deepEqual( result, expected, 'attributes are accepted in any order' );
+        assert.deepEqual( result, expected, 'attributes are accepted in any order' );
 
         result = wp.shortcode.string({
@@ -238 +238 @@
             }
         });
-        deepEqual( result, expected, 'attributes are accepted in any order' );
+        assert.deepEqual( result, expected, 'attributes are accepted in any order' );
     });
 });

trunk/tests/qunit/wp-includes/js/tinymce/tinymce-obsolete.js

@@ -82 +82 @@
     // Ref: http://www.w3.org/TR/html5/obsolete.html, http://developers.whatwg.org/obsolete.html
 
-    QUnit.test('HTML elements non-conforming to HTML 5.0', function() {
+    QUnit.test('HTML elements non-conforming to HTML 5.0', function( assert ) {
         var testString;
 
@@ -110 +110 @@
         */
 
-        expect(6);
+        assert.expect(6);
 
         text = 'acronym';
         testString = '<p><acronym title="www">WWW</acronym></p>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'strike, converted to span';
         editor.setContent( '<strike>test</strike>' );
-        equal( editor.getContent(), '<p><span style="text-decoration: line-through;">test</span></p>', text );
+        assert.equal( editor.getContent(), '<p><span style="text-decoration: line-through;">test</span></p>', text );
 
         text = 'big';
         testString = '<p><big>test</big></p>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'center';
         testString = '<center>test</center>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'font, converted to span';
         editor.setContent( '<p><font size="4">test</font></p>' );
-        equal( editor.getContent(), '<p><span style="font-size: large;">test</span></p>', text );
+        assert.equal( editor.getContent(), '<p><span style="font-size: large;">test</span></p>', text );
 
         text = 'tt';
         testString = '<p><tt>test</tt></p>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
     });
 
-    QUnit.test('Obsolete (but still conforming) HTML attributes', function() {
+    QUnit.test('Obsolete (but still conforming) HTML attributes', function( assert ) {
         var testString;
 
-        expect(3);
+        assert.expect(3);
 
         text = 'border on <img>';
         testString = '<p><img src="../../test.gif" alt="" border="5" /></p>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'Old style anchors';
         testString = '<p><a name="test"></a></p>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'maxlength, size on input type="number"';
         testString = '<p><input maxlength="5" size="10" type="number" value="" /></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { input: 'maxlength size' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { input: 'maxlength size' } ), text );
     });
 
-    QUnit.test('Obsolete attributes in HTML 5.0', function() {
+    QUnit.test('Obsolete attributes in HTML 5.0', function( assert ) {
         var testString, text;
 
-        expect(22);
+        assert.expect(22);
 
         text = 'charset, rev, shape, coords on <a> elements';
         testString = '<p><a href="javascript;:" charset="en" rev="made" shape="rect" coords="5,5">test</a></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { a: 'charset rev shape coords' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { a: 'charset rev shape coords' } ), text );
 
         text = 'name, align, hspace, vspace on img elements';
         testString = '<p><img src="../../test.gif" alt="" name="test" align="left" hspace="5" vspace="5" /></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { img: 'name align hspace vspace' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { img: 'name align hspace vspace' } ), text );
 
         text = 'name, align, hspace, vspace, on embed elements';
         testString = '<p><embed width="100" height="100" src="test.swf" vspace="5" hspace="5" align="left" name="test"></embed></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { embed: 'name align hspace vspace' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { embed: 'name align hspace vspace' } ), text );
 
         text = 'archive, classid, code, codebase, codetype, declare, standby on object elements';
         testString = '<p><object width="100" height="100" classid="clsid" codebase="clsid" standby="standby" codetype="1" code="1" archive="1" declare="declare"></object></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { object: 'archive classid code codebase codetype declare standby' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { object: 'archive classid code codebase codetype declare standby' } ), text );
 
         text = 'type, valuetype on param elements';
         testString = '<p><object width="100" height="100"><param type="" valuetype="" /></object></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { param: 'type valuetype' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { param: 'type valuetype' } ), text );
 
         text = 'align, bgcolor, border, cellpadding, cellspacing, frame, rules, summary, width on table elements';
         testString = '<table border="1" summary="" width="100" frame="" rules="" cellspacing="5" cellpadding="5" align="left" bgcolor="blue"><tbody><tr><td>test</td></tr></tbody></table>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { table: 'align bgcolor border cellpadding cellspacing frame rules summary width' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { table: 'align bgcolor border cellpadding cellspacing frame rules summary width' } ), text );
 
         text = 'align, char, charoff, valign on tbody, thead, and tfoot elements';
         testString = '<table><thead align="left" char="" charoff="" valign="top"></thead><tfoot align="left" char="" charoff="" valign="top"></tfoot><tbody align="left" char="" charoff="" valign="top"><tr><th>test</th><td>test</td></tr></tbody></table>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), {
+        assert.ok( hasAttr( editor.getContent(), {
             thead: 'align char charoff valign',
             tfoot: 'align char charoff valign',
@@ -209 +209 @@
         testString = '<table><tbody><tr><th axis="" align="left" char="" charoff="" valign="top" nowrap="nowrap" bgcolor="blue" width="100" height="10">test</th><td axis="" align="left" char="" charoff="" valign="top" nowrap="nowrap" bgcolor="blue" width="100" height="10" scope="">test</td></tr></tbody></table>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), {
+        assert.ok( hasAttr( editor.getContent(), {
             th: 'axis align bgcolor char charoff height nowrap valign width',
             td: 'axis align bgcolor char charoff height nowrap valign width scope'
@@ -217 +217 @@
         testString = '<table><tbody><tr align="left" char="" charoff="" valign="top" bgcolor="blue"><td>test</td></tr></tbody></table>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { tr: 'align bgcolor char charoff valign' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { tr: 'align bgcolor char charoff valign' } ), text );
 
         text = 'clear on br elements';
         testString = '<p>test<br clear="all" />test</p>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'align on caption elements';
         testString = '<table><caption align="left">test</caption><tbody><tr><td>test</td></tr></tbody></table>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'align, char, charoff, valign, width on col elements';
         testString = '<table><colgroup><col width="100" align="left" char="a" charoff="1" valign="top" /><col /></colgroup><tbody><tr><td>test</td><td>test</td></tr></tbody></table>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { col: 'align char charoff valign width' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { col: 'align char charoff valign width' } ), text );
 
         text = 'align on div, h1—h6, input, legend, p elements';
         testString = '<div align="left">1</div><h3 align="left">1</h3><p align="left">1</p><form><fieldset><legend align="left">test</legend><input type="text" align="left" /></fieldset></form>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'compact on dl elements';
         testString = '<dl compact="compact"><dd>1</dd></dl>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'align, hspace, vspace on embed elements';
         testString = '<p><embed width="100" height="100" vspace="5" hspace="5" align="left"></embed></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { embed: 'align hspace vspace' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { embed: 'align hspace vspace' } ), text );
 
         text = 'align, noshade, size, width on hr elements';
         testString = '<hr align="left" noshade="noshade" size="1" width="100" />';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { hr: 'align noshade size width' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { hr: 'align noshade size width' } ), text );
 
         text = 'align, frameborder, marginheight, marginwidth, scrolling on iframe elements';
         testString = '<p><iframe width="100" height="100" frameborder="1" marginwidth="5" marginheight="5" scrolling="" align="left"></iframe></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { iframe: 'align frameborder marginheight marginwidth scrolling' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { iframe: 'align frameborder marginheight marginwidth scrolling' } ), text );
 
         text = 'type on li elements';
         testString = '<ul><li type="disc">test</li></ul>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'align, border, hspace, vspace on object elements';
         testString = '<p><object width="100" height="100" border="1" vspace="5" hspace="5" align="left"></object></p>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { object: 'align border hspace vspace' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { object: 'align border hspace vspace' } ), text );
 
         text = 'compact on ol elements';
         testString = '<ol compact="compact"><li>test</li></ol>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
 
         text = 'compact, type on ul elements';
         testString = '<ul type="disc" compact="compact"><li>test</li></ul>';
         editor.setContent( testString );
-        ok( hasAttr( editor.getContent(), { ul: 'compact type' } ), text );
+        assert.ok( hasAttr( editor.getContent(), { ul: 'compact type' } ), text );
 
         text = 'width on pre elements';
         testString = '<pre width="100">1</pre>';
         editor.setContent( testString );
-        equal( editor.getContent(), testString, text );
+        assert.equal( editor.getContent(), testString, text );
     });
 

trunk/tests/qunit/wp-includes/js/wp-api.js

@@ -1 +1 @@
 /* global wp, JSON */
 ( function( QUnit ) {
-    module( 'wpapi' );
+    QUnit.module( 'wpapi' );
 
     QUnit.test( 'API Loaded correctly', function( assert ) {
@@ -123 +123 @@
     _.each( modelsWithIdsClassNames, function( className ) {
 
-        QUnit.test( 'Checking ' + className + ' model.' , function( assert ) {
+        QUnit.test( 'Checking ' + className + ' model.', function( assert ) {
             var done = assert.async();
 
@@ -161 +161 @@
     _.each( modelsWithIndexes, function( className ) {
 
-        QUnit.test( 'Testing ' + className + ' model.' , function( assert ) {
+        QUnit.test( 'Testing ' + className + ' model.', function( assert ) {
             var done = assert.async();
 
@@ -297 +297 @@
         // Check that we have and can get each model type.
         _.each( customClasses, function( className ) {
-            QUnit.test( 'Checking ' + className + ' class name.' , function( assert ) {
+            QUnit.test( 'Checking ' + className + ' class name.', function( assert ) {
                 var done = assert.async();
 
@@ -317 +317 @@
     // Check connecting to a second URL.
     wp.api.loadPromise.done( function() {
-        QUnit.test( 'Checking connecting to a remote url.' , function( assert ) {
+        QUnit.test( 'Checking connecting to a remote url.', function( assert ) {
             var done = assert.async();