diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/examples/barebones.html | 47 | ||||
| -rw-r--r-- | test/examples/embedded-media.html | 60 | ||||
| -rw-r--r-- | test/examples/math.html | 349 | ||||
| -rw-r--r-- | test/examples/slide-backgrounds.html | 285 | ||||
| -rw-r--r-- | test/examples/slide-transitions.html | 195 | ||||
| -rw-r--r-- | test/qunit-2.5.0.css | 415 | ||||
| -rw-r--r-- | test/qunit-2.5.0.js | 9234 | ||||
| -rw-r--r-- | test/test-markdown-element-attributes.html | 176 | ||||
| -rw-r--r-- | test/test-markdown-element-attributes.js | 62 | ||||
| -rw-r--r-- | test/test-markdown-external.html | 45 | ||||
| -rw-r--r-- | test/test-markdown-external.js | 26 | ||||
| -rw-r--r-- | test/test-markdown-options.html | 48 | ||||
| -rw-r--r-- | test/test-markdown-options.js | 38 | ||||
| -rw-r--r-- | test/test-markdown-slide-attributes.html | 164 | ||||
| -rw-r--r-- | test/test-markdown-slide-attributes.js | 84 | ||||
| -rw-r--r-- | test/test-markdown.html | 62 | ||||
| -rw-r--r-- | test/test-markdown.js | 12 | ||||
| -rw-r--r-- | test/test-pdf.html | 158 | ||||
| -rw-r--r-- | test/test-pdf.js | 16 | ||||
| -rw-r--r-- | test/test.html | 164 | ||||
| -rw-r--r-- | test/test.js | 840 |
21 files changed, 6262 insertions, 6218 deletions
diff --git a/test/examples/barebones.html b/test/examples/barebones.html index 2bee3cb..3791cae 100644 --- a/test/examples/barebones.html +++ b/test/examples/barebones.html @@ -1,41 +1,42 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Barebones</title> + <title>reveal.js - Barebones</title> - <link rel="stylesheet" href="../../css/reveal.css"> - </head> + <link href="../../css/reveal.css" rel="stylesheet"> +</head> - <body> +<body> - <div class="reveal"> +<div class="reveal"> - <div class="slides"> + <div class="slides"> - <section> - <h2>Barebones Presentation</h2> - <p>This example contains the bare minimum includes and markup required to run a reveal.js presentation.</p> - </section> + <section> + <h2>Barebones Presentation</h2> + <p>This example contains the bare minimum includes and markup required to run a + reveal.js presentation.</p> + </section> - <section> - <h2>No Theme</h2> - <p>There's no theme included, so it will fall back on browser defaults.</p> - </section> + <section> + <h2>No Theme</h2> + <p>There's no theme included, so it will fall back on browser defaults.</p> + </section> - </div> + </div> - </div> +</div> - <script src="../../js/reveal.js"></script> +<script src="../../js/reveal.js"></script> - <script> +<script> - Reveal.initialize(); + Reveal.initialize(); - </script> +</script> - </body> +</body> </html> diff --git a/test/examples/embedded-media.html b/test/examples/embedded-media.html index bbad4be..e260a83 100644 --- a/test/examples/embedded-media.html +++ b/test/examples/embedded-media.html @@ -1,49 +1,51 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Embedded Media</title> + <title>reveal.js - Embedded Media</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> + <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" + name="viewport"> - <link rel="stylesheet" href="../../css/reveal.css"> - <link rel="stylesheet" href="../../css/theme/default.css" id="theme"> - </head> + <link href="../../css/reveal.css" rel="stylesheet"> + <link href="../../css/theme/default.css" id="theme" rel="stylesheet"> +</head> - <body> +<body> - <div class="reveal"> +<div class="reveal"> - <div class="slides"> + <div class="slides"> - <section> - <h2>Embedded Media Test</h2> - </section> + <section> + <h2>Embedded Media Test</h2> + </section> - <section> - <iframe data-autoplay width="420" height="345" src="http://www.youtube.com/embed/l3RQZ4mcr1c"></iframe> - </section> + <section> + <iframe data-autoplay height="345" src="http://www.youtube.com/embed/l3RQZ4mcr1c" + width="420"></iframe> + </section> - <section> - <h2>Empty Slide</h2> - </section> + <section> + <h2>Empty Slide</h2> + </section> - </div> + </div> - </div> +</div> - <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.js"></script> +<script src="../../lib/js/head.min.js"></script> +<script src="../../js/reveal.js"></script> - <script> +<script> - Reveal.initialize({ - transition: 'linear' - }); + Reveal.initialize({ + transition: 'linear' + }); - </script> +</script> - </body> +</body> </html> diff --git a/test/examples/math.html b/test/examples/math.html index d35e827..741cea4 100644 --- a/test/examples/math.html +++ b/test/examples/math.html @@ -1,185 +1,196 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Math Plugin</title> + <title>reveal.js - Math Plugin</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> + <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" + name="viewport"> - <link rel="stylesheet" href="../../css/reveal.css"> - <link rel="stylesheet" href="../../css/theme/night.css" id="theme"> - </head> + <link href="../../css/reveal.css" rel="stylesheet"> + <link href="../../css/theme/night.css" id="theme" rel="stylesheet"> +</head> - <body> +<body> - <div class="reveal"> +<div class="reveal"> - <div class="slides"> + <div class="slides"> - <section> - <h2>reveal.js Math Plugin</h2> - <p>A thin wrapper for MathJax</p> - </section> + <section> + <h2>reveal.js Math Plugin</h2> + <p>A thin wrapper for MathJax</p> + </section> - <section> - <h3>The Lorenz Equations</h3> + <section> + <h3>The Lorenz Equations</h3> - \[\begin{aligned} - \dot{x} & = \sigma(y-x) \\ - \dot{y} & = \rho x - y - xz \\ - \dot{z} & = -\beta z + xy - \end{aligned} \] - </section> + \[\begin{aligned} + \dot{x} & = \sigma(y-x) \\ + \dot{y} & = \rho x - y - xz \\ + \dot{z} & = -\beta z + xy + \end{aligned} \] + </section> - <section> - <h3>The Cauchy-Schwarz Inequality</h3> + <section> + <h3>The Cauchy-Schwarz Inequality</h3> - <script type="math/tex; mode=display"> + <script type="math/tex; mode=display"> \left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right) - </script> - </section> - - <section> - <h3>A Cross Product Formula</h3> - - \[\mathbf{V}_1 \times \mathbf{V}_2 = \begin{vmatrix} - \mathbf{i} & \mathbf{j} & \mathbf{k} \\ - \frac{\partial X}{\partial u} & \frac{\partial Y}{\partial u} & 0 \\ - \frac{\partial X}{\partial v} & \frac{\partial Y}{\partial v} & 0 - \end{vmatrix} \] - </section> - - <section> - <h3>The probability of getting \(k\) heads when flipping \(n\) coins is</h3> - - \[P(E) = {n \choose k} p^k (1-p)^{ n-k} \] - </section> - - <section> - <h3>An Identity of Ramanujan</h3> - - \[ \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = - 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} - {1+\frac{e^{-8\pi}} {1+\ldots} } } } \] - </section> - - <section> - <h3>A Rogers-Ramanujan Identity</h3> - - \[ 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = - \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}\] - </section> - - <section> - <h3>Maxwell’s Equations</h3> - - \[ \begin{aligned} - \nabla \times \vec{\mathbf{B}} -\, \frac1c\, \frac{\partial\vec{\mathbf{E}}}{\partial t} & = \frac{4\pi}{c}\vec{\mathbf{j}} \\ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi \rho \\ - \nabla \times \vec{\mathbf{E}}\, +\, \frac1c\, \frac{\partial\vec{\mathbf{B}}}{\partial t} & = \vec{\mathbf{0}} \\ - \nabla \cdot \vec{\mathbf{B}} & = 0 \end{aligned} - \] - </section> - - <section> - <section> - <h3>The Lorenz Equations</h3> - - <div class="fragment"> - \[\begin{aligned} - \dot{x} & = \sigma(y-x) \\ - \dot{y} & = \rho x - y - xz \\ - \dot{z} & = -\beta z + xy - \end{aligned} \] - </div> - </section> - - <section> - <h3>The Cauchy-Schwarz Inequality</h3> - - <div class="fragment"> - \[ \left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right) \] - </div> - </section> - - <section> - <h3>A Cross Product Formula</h3> - - <div class="fragment"> - \[\mathbf{V}_1 \times \mathbf{V}_2 = \begin{vmatrix} - \mathbf{i} & \mathbf{j} & \mathbf{k} \\ - \frac{\partial X}{\partial u} & \frac{\partial Y}{\partial u} & 0 \\ - \frac{\partial X}{\partial v} & \frac{\partial Y}{\partial v} & 0 - \end{vmatrix} \] - </div> - </section> - - <section> - <h3>The probability of getting \(k\) heads when flipping \(n\) coins is</h3> - - <div class="fragment"> - \[P(E) = {n \choose k} p^k (1-p)^{ n-k} \] - </div> - </section> - - <section> - <h3>An Identity of Ramanujan</h3> - - <div class="fragment"> - \[ \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = - 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} - {1+\frac{e^{-8\pi}} {1+\ldots} } } } \] - </div> - </section> - - <section> - <h3>A Rogers-Ramanujan Identity</h3> - - <div class="fragment"> - \[ 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = - \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}\] - </div> - </section> - - <section> - <h3>Maxwell’s Equations</h3> - - <div class="fragment"> - \[ \begin{aligned} - \nabla \times \vec{\mathbf{B}} -\, \frac1c\, \frac{\partial\vec{\mathbf{E}}}{\partial t} & = \frac{4\pi}{c}\vec{\mathbf{j}} \\ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi \rho \\ - \nabla \times \vec{\mathbf{E}}\, +\, \frac1c\, \frac{\partial\vec{\mathbf{B}}}{\partial t} & = \vec{\mathbf{0}} \\ - \nabla \cdot \vec{\mathbf{B}} & = 0 \end{aligned} - \] - </div> - </section> - </section> - - </div> - - </div> - - <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.js"></script> - - <script> - - Reveal.initialize({ - history: true, - transition: 'linear', - - math: { - // mathjax: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js', - config: 'TeX-AMS_HTML-full' - }, - - dependencies: [ - { src: '../../lib/js/classList.js' }, - { src: '../../plugin/math/math.js', async: true } - ] - }); - - </script> - - </body> + + + </script> + </section> + + <section> + <h3>A Cross Product Formula</h3> + + \[\mathbf{V}_1 \times \mathbf{V}_2 = \begin{vmatrix} + \mathbf{i} & \mathbf{j} & \mathbf{k} \\ + \frac{\partial X}{\partial u} & \frac{\partial Y}{\partial u} & 0 \\ + \frac{\partial X}{\partial v} & \frac{\partial Y}{\partial v} & 0 + \end{vmatrix} \] + </section> + + <section> + <h3>The probability of getting \(k\) heads when flipping \(n\) coins is</h3> + + \[P(E) = {n \choose k} p^k (1-p)^{ n-k} \] + </section> + + <section> + <h3>An Identity of Ramanujan</h3> + + \[ \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = + 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} + {1+\frac{e^{-8\pi}} {1+\ldots} } } } \] + </section> + + <section> + <h3>A Rogers-Ramanujan Identity</h3> + + \[ 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = + \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}\] + </section> + + <section> + <h3>Maxwell’s Equations</h3> + + \[ \begin{aligned} + \nabla \times \vec{\mathbf{B}} -\, \frac1c\, \frac{\partial\vec{\mathbf{E}}}{\partial t} + & = \frac{4\pi}{c}\vec{\mathbf{j}} \\ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi + \rho \\ + \nabla \times \vec{\mathbf{E}}\, +\, \frac1c\, \frac{\partial\vec{\mathbf{B}}}{\partial + t} & = \vec{\mathbf{0}} \\ + \nabla \cdot \vec{\mathbf{B}} & = 0 \end{aligned} + \] + </section> + + <section> + <section> + <h3>The Lorenz Equations</h3> + + <div class="fragment"> + \[\begin{aligned} + \dot{x} & = \sigma(y-x) \\ + \dot{y} & = \rho x - y - xz \\ + \dot{z} & = -\beta z + xy + \end{aligned} \] + </div> + </section> + + <section> + <h3>The Cauchy-Schwarz Inequality</h3> + + <div class="fragment"> + \[ \left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) + \left( \sum_{k=1}^n b_k^2 \right) \] + </div> + </section> + + <section> + <h3>A Cross Product Formula</h3> + + <div class="fragment"> + \[\mathbf{V}_1 \times \mathbf{V}_2 = \begin{vmatrix} + \mathbf{i} & \mathbf{j} & \mathbf{k} \\ + \frac{\partial X}{\partial u} & \frac{\partial Y}{\partial u} & 0 \\ + \frac{\partial X}{\partial v} & \frac{\partial Y}{\partial v} & 0 + \end{vmatrix} \] + </div> + </section> + + <section> + <h3>The probability of getting \(k\) heads when flipping \(n\) coins is</h3> + + <div class="fragment"> + \[P(E) = {n \choose k} p^k (1-p)^{ n-k} \] + </div> + </section> + + <section> + <h3>An Identity of Ramanujan</h3> + + <div class="fragment"> + \[ \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = + 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} + {1+\frac{e^{-8\pi}} {1+\ldots} } } } \] + </div> + </section> + + <section> + <h3>A Rogers-Ramanujan Identity</h3> + + <div class="fragment"> + \[ 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = + \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}\] + </div> + </section> + + <section> + <h3>Maxwell’s Equations</h3> + + <div class="fragment"> + \[ \begin{aligned} + \nabla \times \vec{\mathbf{B}} -\, \frac1c\, + \frac{\partial\vec{\mathbf{E}}}{\partial t} & = + \frac{4\pi}{c}\vec{\mathbf{j}} \\ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi + \rho \\ + \nabla \times \vec{\mathbf{E}}\, +\, \frac1c\, + \frac{\partial\vec{\mathbf{B}}}{\partial t} & = \vec{\mathbf{0}} \\ + \nabla \cdot \vec{\mathbf{B}} & = 0 \end{aligned} + \] + </div> + </section> + </section> + + </div> + +</div> + +<script src="../../lib/js/head.min.js"></script> +<script src="../../js/reveal.js"></script> + +<script> + + Reveal.initialize({ + history: true, + transition: 'linear', + + math: { + // mathjax: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js', + config: 'TeX-AMS_HTML-full' + }, + + dependencies: [ + {src: '../../lib/js/classList.js'}, + {src: '../../plugin/math/math.js', async: true} + ] + }); + +</script> + +</body> </html> diff --git a/test/examples/slide-backgrounds.html b/test/examples/slide-backgrounds.html index 316c92a..6a55288 100644 --- a/test/examples/slide-backgrounds.html +++ b/test/examples/slide-backgrounds.html @@ -1,144 +1,149 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> - - <title>reveal.js - Slide Backgrounds</title> - - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - - <link rel="stylesheet" href="../../css/reveal.css"> - <link rel="stylesheet" href="../../css/theme/serif.css" id="theme"> - <style type="text/css" media="screen"> - .slides section.has-dark-background, - .slides section.has-dark-background h2 { - color: #fff; - } - .slides section.has-light-background, - .slides section.has-light-background h2 { - color: #222; - } - </style> - </head> - - <body> - - <div class="reveal"> - - <div class="slides"> - - <section data-background="#00ffff"> - <h2>data-background: #00ffff</h2> - </section> - - <section data-background="#bb00bb"> - <h2>data-background: #bb00bb</h2> - </section> - - <section data-background-color="lightblue"> - <h2>data-background: lightblue</h2> - </section> - - <section> - <section data-background="#ff0000"> - <h2>data-background: #ff0000</h2> - </section> - <section data-background="rgba(0, 0, 0, 0.2)"> - <h2>data-background: rgba(0, 0, 0, 0.2)</h2> - </section> - <section data-background="salmon"> - <h2>data-background: salmon</h2> - </section> - </section> - - <section data-background="rgba(0, 100, 100, 0.2)"> - <section> - <h2>Background applied to stack</h2> - </section> - <section> - <h2>Background applied to stack</h2> - </section> - <section data-background="rgb(66, 66, 66)"> - <h2>Background applied to slide inside of stack</h2> - </section> - </section> - - <section data-background-transition="slide" data-background="assets/image1.png"> - <h2>Background image</h2> - </section> - - <section> - <section data-background-transition="slide" data-background="assets/image1.png"> - <h2>Background image</h2> - </section> - <section data-background-transition="slide" data-background="assets/image1.png"> - <h2>Background image</h2> - </section> - </section> - - <section data-background="assets/image2.png" data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"> - <h2>Background image</h2> - <pre>data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"</pre> - </section> - - <section data-background="#888888"> - <h2>Same background twice (1/2)</h2> - </section> - <section data-background="#888888"> - <h2>Same background twice (2/2)</h2> - </section> - - <section data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.webm"> - <h2>Video background</h2> - </section> - - <section data-background-iframe="https://slides.com/news/make-better-presentations/embed?style=hidden&autoSlide=4000"> - <h2>Iframe background</h2> - </section> - - <section> - <section data-background="#417203"> - <h2>Same background twice vertical (1/2)</h2> - </section> - <section data-background="#417203"> - <h2>Same background twice vertical (2/2)</h2> - </section> - </section> - - <section data-background="#934f4d"> - <h2>Same background from horizontal to vertical (1/3)</h2> - </section> - <section> - <section data-background="#934f4d"> - <h2>Same background from horizontal to vertical (2/3)</h2> - </section> - <section data-background="#934f4d"> - <h2>Same background from horizontal to vertical (3/3)</h2> - </section> - </section> - - </div> - - </div> - - <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.js"></script> - - <script> - - // Full list of configuration options available here: - // https://github.com/hakimel/reveal.js#configuration - Reveal.initialize({ - center: true, - // rtl: true, - - transition: 'linear', - // transitionSpeed: 'slow', - // backgroundTransition: 'slide' - }); - - </script> - - </body> +<head> + <meta charset="utf-8"> + + <title>reveal.js - Slide Backgrounds</title> + + <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" + name="viewport"> + + <link href="../../css/reveal.css" rel="stylesheet"> + <link href="../../css/theme/serif.css" id="theme" rel="stylesheet"> + <style media="screen" type="text/css"> + .slides section.has-dark-background, + .slides section.has-dark-background h2 { + color: #fff; + } + + .slides section.has-light-background, + .slides section.has-light-background h2 { + color: #222; + } + </style> +</head> + +<body> + +<div class="reveal"> + + <div class="slides"> + + <section data-background="#00ffff"> + <h2>data-background: #00ffff</h2> + </section> + + <section data-background="#bb00bb"> + <h2>data-background: #bb00bb</h2> + </section> + + <section data-background-color="lightblue"> + <h2>data-background: lightblue</h2> + </section> + + <section> + <section data-background="#ff0000"> + <h2>data-background: #ff0000</h2> + </section> + <section data-background="rgba(0, 0, 0, 0.2)"> + <h2>data-background: rgba(0, 0, 0, 0.2)</h2> + </section> + <section data-background="salmon"> + <h2>data-background: salmon</h2> + </section> + </section> + + <section data-background="rgba(0, 100, 100, 0.2)"> + <section> + <h2>Background applied to stack</h2> + </section> + <section> + <h2>Background applied to stack</h2> + </section> + <section data-background="rgb(66, 66, 66)"> + <h2>Background applied to slide inside of stack</h2> + </section> + </section> + + <section data-background="assets/image1.png" data-background-transition="slide"> + <h2>Background image</h2> + </section> + + <section> + <section data-background="assets/image1.png" data-background-transition="slide"> + <h2>Background image</h2> + </section> + <section data-background="assets/image1.png" data-background-transition="slide"> + <h2>Background image</h2> + </section> + </section> + + <section data-background="assets/image2.png" data-background-color="#111" + data-background-repeat="repeat" data-background-size="100px"> + <h2>Background image</h2> + <pre>data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"</pre> + </section> + + <section data-background="#888888"> + <h2>Same background twice (1/2)</h2> + </section> + <section data-background="#888888"> + <h2>Same background twice (2/2)</h2> + </section> + + <section + data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.webm"> + <h2>Video background</h2> + </section> + + <section + data-background-iframe="https://slides.com/news/make-better-presentations/embed?style=hidden&autoSlide=4000"> + <h2>Iframe background</h2> + </section> + + <section> + <section data-background="#417203"> + <h2>Same background twice vertical (1/2)</h2> + </section> + <section data-background="#417203"> + <h2>Same background twice vertical (2/2)</h2> + </section> + </section> + + <section data-background="#934f4d"> + <h2>Same background from horizontal to vertical (1/3)</h2> + </section> + <section> + <section data-background="#934f4d"> + <h2>Same background from horizontal to vertical (2/3)</h2> + </section> + <section data-background="#934f4d"> + <h2>Same background from horizontal to vertical (3/3)</h2> + </section> + </section> + + </div> + +</div> + +<script src="../../lib/js/head.min.js"></script> +<script src="../../js/reveal.js"></script> + +<script> + + // Full list of configuration options available here: + // https://github.com/hakimel/reveal.js#configuration + Reveal.initialize({ + center: true, + // rtl: true, + + transition: 'linear', + // transitionSpeed: 'slow', + // backgroundTransition: 'slide' + }); + +</script> + +</body> </html> diff --git a/test/examples/slide-transitions.html b/test/examples/slide-transitions.html index 88119dc..74a1964 100644 --- a/test/examples/slide-transitions.html +++ b/test/examples/slide-transitions.html @@ -1,101 +1,102 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> - - <title>reveal.js - Slide Transitions</title> - - <link rel="stylesheet" href="../../css/reveal.css"> - <link rel="stylesheet" href="../../css/theme/white.css" id="theme"> - <style type="text/css" media="screen"> - .slides section.has-dark-background, - .slides section.has-dark-background h3 { - color: #fff; - } - .slides section.has-light-background, - .slides section.has-light-background h3 { - color: #222; - } - </style> - </head> - - <body> - - <div class="reveal"> - - <div class="slides"> - - <section> - <h3>Default</h3> - </section> - - <section> - <h3>Default</h3> - </section> - - <section data-transition="zoom"> - <h3>data-transition: zoom</h3> - </section> - - <section data-transition="zoom-in fade-out"> - <h3>data-transition: zoom-in fade-out</h3> - </section> - - <section> - <h3>Default</h3> - </section> - - <section data-transition="convex"> - <h3>data-transition: convex</h3> - </section> - - <section data-transition="convex-in concave-out"> - <h3>data-transition: convex-in concave-out</h3> - </section> - - <section> - <section data-transition="zoom"> - <h3>Default</h3> - </section> - <section data-transition="concave"> - <h3>data-transition: concave</h3> - </section> - <section data-transition="convex-in fade-out"> - <h3>data-transition: convex-in fade-out</h3> - </section> - <section> - <h3>Default</h3> - </section> - </section> - - <section data-transition="none"> - <h3>data-transition: none</h3> - </section> - - <section> - <h3>Default</h3> - </section> - - </div> - - </div> - - <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.js"></script> - - <script> - - Reveal.initialize({ - center: true, - history: true, - - // transition: 'slide', - // transitionSpeed: 'slow', - // backgroundTransition: 'slide' - }); - - </script> - - </body> +<head> + <meta charset="utf-8"> + + <title>reveal.js - Slide Transitions</title> + + <link href="../../css/reveal.css" rel="stylesheet"> + <link href="../../css/theme/white.css" id="theme" rel="stylesheet"> + <style media="screen" type="text/css"> + .slides section.has-dark-background, + .slides section.has-dark-background h3 { + color: #fff; + } + + .slides section.has-light-background, + .slides section.has-light-background h3 { + color: #222; + } + </style> +</head> + +<body> + +<div class="reveal"> + + <div class="slides"> + + <section> + <h3>Default</h3> + </section> + + <section> + <h3>Default</h3> + </section> + + <section data-transition="zoom"> + <h3>data-transition: zoom</h3> + </section> + + <section data-transition="zoom-in fade-out"> + <h3>data-transition: zoom-in fade-out</h3> + </section> + + <section> + <h3>Default</h3> + </section> + + <section data-transition="convex"> + <h3>data-transition: convex</h3> + </section> + + <section data-transition="convex-in concave-out"> + <h3>data-transition: convex-in concave-out</h3> + </section> + + <section> + <section data-transition="zoom"> + <h3>Default</h3> + </section> + <section data-transition="concave"> + <h3>data-transition: concave</h3> + </section> + <section data-transition="convex-in fade-out"> + <h3>data-transition: convex-in fade-out</h3> + </section> + <section> + <h3>Default</h3> + </section> + </section> + + <section data-transition="none"> + <h3>data-transition: none</h3> + </section> + + <section> + <h3>Default</h3> + </section> + + </div> + +</div> + +<script src="../../lib/js/head.min.js"></script> +<script src="../../js/reveal.js"></script> + +<script> + + Reveal.initialize({ + center: true, + history: true, + + // transition: 'slide', + // transitionSpeed: 'slow', + // backgroundTransition: 'slide' + }); + +</script> + +</body> </html> diff --git a/test/qunit-2.5.0.css b/test/qunit-2.5.0.css index 21ac68b..2873606 100644 --- a/test/qunit-2.5.0.css +++ b/test/qunit-2.5.0.css @@ -12,215 +12,220 @@ /** Font Family and Sizes */ #qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult { - font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; } -#qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; } -#qunit-tests { font-size: smaller; } +#qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { + font-size: small; +} + +#qunit-tests { + font-size: smaller; +} /** Resets */ #qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } /** Header (excluding toolbar) */ #qunit-header { - padding: 0.5em 0 0.5em 1em; + padding: 0.5em 0 0.5em 1em; - color: #8699A4; - background-color: #0D3349; + color: #8699A4; + background-color: #0D3349; - font-size: 1.5em; - line-height: 1em; - font-weight: 400; + font-size: 1.5em; + line-height: 1em; + font-weight: 400; - border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } #qunit-header a { - text-decoration: none; - color: #C2CCD1; + text-decoration: none; + color: #C2CCD1; } #qunit-header a:hover, #qunit-header a:focus { - color: #FFF; + color: #FFF; } #qunit-banner { - height: 5px; + height: 5px; } #qunit-filteredTest { - padding: 0.5em 1em 0.5em 1em; - color: #366097; - background-color: #F4FF77; + padding: 0.5em 1em 0.5em 1em; + color: #366097; + background-color: #F4FF77; } #qunit-userAgent { - padding: 0.5em 1em 0.5em 1em; - color: #FFF; - background-color: #2B81AF; - text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; + padding: 0.5em 1em 0.5em 1em; + color: #FFF; + background-color: #2B81AF; + text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; } /** Toolbar */ #qunit-testrunner-toolbar { - padding: 0.5em 1em 0.5em 1em; - color: #5E740B; - background-color: #EEE; + padding: 0.5em 1em 0.5em 1em; + color: #5E740B; + background-color: #EEE; } #qunit-testrunner-toolbar .clearfix { - height: 0; - clear: both; + height: 0; + clear: both; } #qunit-testrunner-toolbar label { - display: inline-block; + display: inline-block; } #qunit-testrunner-toolbar input[type=checkbox], #qunit-testrunner-toolbar input[type=radio] { - margin: 3px; - vertical-align: -2px; + margin: 3px; + vertical-align: -2px; } #qunit-testrunner-toolbar input[type=text] { - box-sizing: border-box; - height: 1.6em; + box-sizing: border-box; + height: 1.6em; } .qunit-url-config, .qunit-filter, #qunit-modulefilter { - display: inline-block; - line-height: 2.1em; + display: inline-block; + line-height: 2.1em; } .qunit-filter, #qunit-modulefilter { - float: right; - position: relative; - margin-left: 1em; + float: right; + position: relative; + margin-left: 1em; } .qunit-url-config label { - margin-right: 0.5em; + margin-right: 0.5em; } #qunit-modulefilter-search { - box-sizing: border-box; - width: 400px; + box-sizing: border-box; + width: 400px; } #qunit-modulefilter-search-container:after { - position: absolute; - right: 0.3em; - content: "\25bc"; - color: black; + position: absolute; + right: 0.3em; + content: "\25bc"; + color: black; } #qunit-modulefilter-dropdown { - /* align with #qunit-modulefilter-search */ - box-sizing: border-box; - width: 400px; - position: absolute; - right: 0; - top: 50%; - margin-top: 0.8em; - - border: 1px solid #D3D3D3; - border-top: none; - border-radius: 0 0 .25em .25em; - color: #000; - background-color: #F5F5F5; - z-index: 99; + /* align with #qunit-modulefilter-search */ + box-sizing: border-box; + width: 400px; + position: absolute; + right: 0; + top: 50%; + margin-top: 0.8em; + + border: 1px solid #D3D3D3; + border-top: none; + border-radius: 0 0 .25em .25em; + color: #000; + background-color: #F5F5F5; + z-index: 99; } #qunit-modulefilter-dropdown a { - color: inherit; - text-decoration: none; + color: inherit; + text-decoration: none; } #qunit-modulefilter-dropdown .clickable.checked { - font-weight: bold; - color: #000; - background-color: #D2E0E6; + font-weight: bold; + color: #000; + background-color: #D2E0E6; } #qunit-modulefilter-dropdown .clickable:hover { - color: #FFF; - background-color: #0D3349; + color: #FFF; + background-color: #0D3349; } #qunit-modulefilter-actions { - display: block; - overflow: auto; + display: block; + overflow: auto; - /* align with #qunit-modulefilter-dropdown-list */ - font: smaller/1.5em sans-serif; + /* align with #qunit-modulefilter-dropdown-list */ + font: smaller/1.5em sans-serif; } #qunit-modulefilter-dropdown #qunit-modulefilter-actions > * { - box-sizing: border-box; - max-height: 2.8em; - display: block; - padding: 0.4em; + box-sizing: border-box; + max-height: 2.8em; + display: block; + padding: 0.4em; } #qunit-modulefilter-dropdown #qunit-modulefilter-actions > button { - float: right; - font: inherit; + float: right; + font: inherit; } #qunit-modulefilter-dropdown #qunit-modulefilter-actions > :last-child { - /* insert padding to align with checkbox margins */ - padding-left: 3px; + /* insert padding to align with checkbox margins */ + padding-left: 3px; } #qunit-modulefilter-dropdown-list { - max-height: 200px; - overflow-y: auto; - margin: 0; - border-top: 2px groove threedhighlight; - padding: 0.4em 0 0; - font: smaller/1.5em sans-serif; + max-height: 200px; + overflow-y: auto; + margin: 0; + border-top: 2px groove threedhighlight; + padding: 0.4em 0 0; + font: smaller/1.5em sans-serif; } #qunit-modulefilter-dropdown-list li { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #qunit-modulefilter-dropdown-list .clickable { - display: block; - padding-left: 0.15em; + display: block; + padding-left: 0.15em; } /** Tests: Pass/Fail */ #qunit-tests { - list-style-position: inside; + list-style-position: inside; } #qunit-tests li { - padding: 0.4em 1em 0.4em 1em; - border-bottom: 1px solid #FFF; - list-style-position: inside; + padding: 0.4em 1em 0.4em 1em; + border-bottom: 1px solid #FFF; + list-style-position: inside; } #qunit-tests > li { - display: none; + display: none; } #qunit-tests li.running, @@ -228,209 +233,249 @@ #qunit-tests li.fail, #qunit-tests li.skipped, #qunit-tests li.aborted { - display: list-item; + display: list-item; } #qunit-tests.hidepass { - position: relative; + position: relative; } #qunit-tests.hidepass li.running, #qunit-tests.hidepass li.pass:not(.todo) { - visibility: hidden; - position: absolute; - width: 0; - height: 0; - padding: 0; - border: 0; - margin: 0; + visibility: hidden; + position: absolute; + width: 0; + height: 0; + padding: 0; + border: 0; + margin: 0; } #qunit-tests li strong { - cursor: pointer; + cursor: pointer; } #qunit-tests li.skipped strong { - cursor: default; + cursor: default; } #qunit-tests li a { - padding: 0.5em; - color: #C2CCD1; - text-decoration: none; + padding: 0.5em; + color: #C2CCD1; + text-decoration: none; } #qunit-tests li p a { - padding: 0.25em; - color: #6B6464; + padding: 0.25em; + color: #6B6464; } + #qunit-tests li a:hover, #qunit-tests li a:focus { - color: #000; + color: #000; } #qunit-tests li .runtime { - float: right; - font-size: smaller; + float: right; + font-size: smaller; } .qunit-assert-list { - margin-top: 0.5em; - padding: 0.5em; + margin-top: 0.5em; + padding: 0.5em; - background-color: #FFF; + background-color: #FFF; - border-radius: 5px; + border-radius: 5px; } .qunit-source { - margin: 0.6em 0 0.3em; + margin: 0.6em 0 0.3em; } .qunit-collapsed { - display: none; + display: none; } #qunit-tests table { - border-collapse: collapse; - margin-top: 0.2em; + border-collapse: collapse; + margin-top: 0.2em; } #qunit-tests th { - text-align: right; - vertical-align: top; - padding: 0 0.5em 0 0; + text-align: right; + vertical-align: top; + padding: 0 0.5em 0 0; } #qunit-tests td { - vertical-align: top; + vertical-align: top; } #qunit-tests pre { - margin: 0; - white-space: pre-wrap; - word-wrap: break-word; + margin: 0; + white-space: pre-wrap; + word-wrap: break-word; } #qunit-tests del { - color: #374E0C; - background-color: #E0F2BE; - text-decoration: none; + color: #374E0C; + background-color: #E0F2BE; + text-decoration: none; } #qunit-tests ins { - color: #500; - background-color: #FFCACA; - text-decoration: none; + color: #500; + background-color: #FFCACA; + text-decoration: none; } /*** Test Counts */ -#qunit-tests b.counts { color: #000; } -#qunit-tests b.passed { color: #5E740B; } -#qunit-tests b.failed { color: #710909; } +#qunit-tests b.counts { + color: #000; +} + +#qunit-tests b.passed { + color: #5E740B; +} + +#qunit-tests b.failed { + color: #710909; +} #qunit-tests li li { - padding: 5px; - background-color: #FFF; - border-bottom: none; - list-style-position: inside; + padding: 5px; + background-color: #FFF; + border-bottom: none; + list-style-position: inside; } /*** Passing Styles */ #qunit-tests li li.pass { - color: #3C510C; - background-color: #FFF; - border-left: 10px solid #C6E746; + color: #3C510C; + background-color: #FFF; + border-left: 10px solid #C6E746; } -#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; } -#qunit-tests .pass .test-name { color: #366097; } +#qunit-tests .pass { + color: #528CE0; + background-color: #D2E0E6; +} + +#qunit-tests .pass .test-name { + color: #366097; +} #qunit-tests .pass .test-actual, -#qunit-tests .pass .test-expected { color: #999; } +#qunit-tests .pass .test-expected { + color: #999; +} -#qunit-banner.qunit-pass { background-color: #C6E746; } +#qunit-banner.qunit-pass { + background-color: #C6E746; +} /*** Failing Styles */ #qunit-tests li li.fail { - color: #710909; - background-color: #FFF; - border-left: 10px solid #EE5757; - white-space: pre; + color: #710909; + background-color: #FFF; + border-left: 10px solid #EE5757; + white-space: pre; } #qunit-tests > li:last-child { - border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; +} + +#qunit-tests .fail { + color: #000; + background-color: #EE5757; } -#qunit-tests .fail { color: #000; background-color: #EE5757; } #qunit-tests .fail .test-name, -#qunit-tests .fail .module-name { color: #000; } +#qunit-tests .fail .module-name { + color: #000; +} -#qunit-tests .fail .test-actual { color: #EE5757; } -#qunit-tests .fail .test-expected { color: #008000; } +#qunit-tests .fail .test-actual { + color: #EE5757; +} + +#qunit-tests .fail .test-expected { + color: #008000; +} -#qunit-banner.qunit-fail { background-color: #EE5757; } +#qunit-banner.qunit-fail { + background-color: #EE5757; +} /*** Aborted tests */ -#qunit-tests .aborted { color: #000; background-color: orange; } +#qunit-tests .aborted { + color: #000; + background-color: orange; +} + /*** Skipped tests */ #qunit-tests .skipped { - background-color: #EBECE9; + background-color: #EBECE9; } #qunit-tests .qunit-todo-label, #qunit-tests .qunit-skipped-label { - background-color: #F4FF77; - display: inline-block; - font-style: normal; - color: #366097; - line-height: 1.8em; - padding: 0 0.5em; - margin: -0.4em 0.4em -0.4em 0; + background-color: #F4FF77; + display: inline-block; + font-style: normal; + color: #366097; + line-height: 1.8em; + padding: 0 0.5em; + margin: -0.4em 0.4em -0.4em 0; } #qunit-tests .qunit-todo-label { - background-color: #EEE; + background-color: #EEE; } /** Result */ #qunit-testresult { - color: #2B81AF; - background-color: #D2E0E6; + color: #2B81AF; + background-color: #D2E0E6; - border-bottom: 1px solid #FFF; + border-bottom: 1px solid #FFF; } + #qunit-testresult .clearfix { - height: 0; - clear: both; + height: 0; + clear: both; } + #qunit-testresult .module-name { - font-weight: 700; + font-weight: 700; } + #qunit-testresult-display { - padding: 0.5em 1em 0.5em 1em; - width: 85%; - float:left; + padding: 0.5em 1em 0.5em 1em; + width: 85%; + float: left; } + #qunit-testresult-controls { - padding: 0.5em 1em 0.5em 1em; - width: 10%; - float:left; + padding: 0.5em 1em 0.5em 1em; + width: 10%; + float: left; } /** Fixture */ #qunit-fixture { - position: absolute; - top: -10000px; - left: -10000px; - width: 1000px; - height: 1000px; + position: absolute; + top: -10000px; + left: -10000px; + width: 1000px; + height: 1000px; } diff --git a/test/qunit-2.5.0.js b/test/qunit-2.5.0.js index db72a26..3adbaea 100644 --- a/test/qunit-2.5.0.js +++ b/test/qunit-2.5.0.js @@ -23,14 +23,14 @@ var navigator = window && window.navigator; var localSessionStorage = function () { - var x = "qunit-test-string"; - try { - global$1.sessionStorage.setItem(x, x); - global$1.sessionStorage.removeItem(x); - return global$1.sessionStorage; - } catch (e) { - return undefined; - } + var x = "qunit-test-string"; + try { + global$1.sessionStorage.setItem(x, x); + global$1.sessionStorage.removeItem(x); + return global$1.sessionStorage; + } catch (e) { + return undefined; + } }(); var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { @@ -40,15 +40,6 @@ }; - - - - - - - - - var classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); @@ -74,45 +65,6 @@ }(); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - var toConsumableArray = function (arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; @@ -126,30 +78,30 @@ var toString = Object.prototype.toString; var hasOwn = Object.prototype.hasOwnProperty; var now = Date.now || function () { - return new Date().getTime(); + return new Date().getTime(); }; var defined = { - document: window && window.document !== undefined, - setTimeout: setTimeout !== undefined + document: window && window.document !== undefined, + setTimeout: setTimeout !== undefined }; // Returns a new Array with the elements that are in a but not in b function diff(a, b) { - var i, - j, - result = a.slice(); - - for (i = 0; i < result.length; i++) { - for (j = 0; j < b.length; j++) { - if (result[i] === b[j]) { - result.splice(i, 1); - i--; - break; - } - } - } - return result; + var i, + j, + result = a.slice(); + + for (i = 0; i < result.length; i++) { + for (j = 0; j < b.length; j++) { + if (result[i] === b[j]) { + result.splice(i, 1); + i--; + break; + } + } + } + return result; } /** @@ -161,7 +113,7 @@ * @return {Boolean} */ function inArray(elem, array) { - return array.indexOf(elem) !== -1; + return array.indexOf(elem) !== -1; } /** @@ -172,427 +124,427 @@ * @return {Object} New object with only the own properties (recursively). */ function objectValues(obj) { - var key, - val, - vals = is("array", obj) ? [] : {}; - for (key in obj) { - if (hasOwn.call(obj, key)) { - val = obj[key]; - vals[key] = val === Object(val) ? objectValues(val) : val; - } - } - return vals; + var key, + val, + vals = is("array", obj) ? [] : {}; + for (key in obj) { + if (hasOwn.call(obj, key)) { + val = obj[key]; + vals[key] = val === Object(val) ? objectValues(val) : val; + } + } + return vals; } function extend(a, b, undefOnly) { - for (var prop in b) { - if (hasOwn.call(b, prop)) { - if (b[prop] === undefined) { - delete a[prop]; - } else if (!(undefOnly && typeof a[prop] !== "undefined")) { - a[prop] = b[prop]; - } - } - } - - return a; + for (var prop in b) { + if (hasOwn.call(b, prop)) { + if (b[prop] === undefined) { + delete a[prop]; + } else if (!(undefOnly && typeof a[prop] !== "undefined")) { + a[prop] = b[prop]; + } + } + } + + return a; } function objectType(obj) { - if (typeof obj === "undefined") { - return "undefined"; - } - - // Consider: typeof null === object - if (obj === null) { - return "null"; - } - - var match = toString.call(obj).match(/^\[object\s(.*)\]$/), - type = match && match[1]; - - switch (type) { - case "Number": - if (isNaN(obj)) { - return "nan"; - } - return "number"; - case "String": - case "Boolean": - case "Array": - case "Set": - case "Map": - case "Date": - case "RegExp": - case "Function": - case "Symbol": - return type.toLowerCase(); - default: - return typeof obj === "undefined" ? "undefined" : _typeof(obj); - } + if (typeof obj === "undefined") { + return "undefined"; + } + + // Consider: typeof null === object + if (obj === null) { + return "null"; + } + + var match = toString.call(obj).match(/^\[object\s(.*)\]$/), + type = match && match[1]; + + switch (type) { + case "Number": + if (isNaN(obj)) { + return "nan"; + } + return "number"; + case "String": + case "Boolean": + case "Array": + case "Set": + case "Map": + case "Date": + case "RegExp": + case "Function": + case "Symbol": + return type.toLowerCase(); + default: + return typeof obj === "undefined" ? "undefined" : _typeof(obj); + } } // Safe object type checking function is(type, obj) { - return objectType(obj) === type; + return objectType(obj) === type; } // Based on Java's String.hashCode, a simple but not // rigorously collision resistant hashing function function generateHash(module, testName) { - var str = module + "\x1C" + testName; - var hash = 0; - - for (var i = 0; i < str.length; i++) { - hash = (hash << 5) - hash + str.charCodeAt(i); - hash |= 0; - } - - // Convert the possibly negative integer hash code into an 8 character hex string, which isn't - // strictly necessary but increases user understanding that the id is a SHA-like hash - var hex = (0x100000000 + hash).toString(16); - if (hex.length < 8) { - hex = "0000000" + hex; - } - - return hex.slice(-8); + var str = module + "\x1C" + testName; + var hash = 0; + + for (var i = 0; i < str.length; i++) { + hash = (hash << 5) - hash + str.charCodeAt(i); + hash |= 0; + } + + // Convert the possibly negative integer hash code into an 8 character hex string, which isn't + // strictly necessary but increases user understanding that the id is a SHA-like hash + var hex = (0x100000000 + hash).toString(16); + if (hex.length < 8) { + hex = "0000000" + hex; + } + + return hex.slice(-8); } // Test for equality any JavaScript type. // Authors: Philippe Rathé <prathe@gmail.com>, David Chan <david@troi.org> var equiv = (function () { - // Value pairs queued for comparison. Used for breadth-first processing order, recursion - // detection and avoiding repeated comparison (see below for details). - // Elements are { a: val, b: val }. - var pairs = []; - - var getProto = Object.getPrototypeOf || function (obj) { - return obj.__proto__; - }; - - function useStrictEquality(a, b) { - - // This only gets called if a and b are not strict equal, and is used to compare on - // the primitive values inside object wrappers. For example: - // `var i = 1;` - // `var j = new Number(1);` - // Neither a nor b can be null, as a !== b and they have the same type. - if ((typeof a === "undefined" ? "undefined" : _typeof(a)) === "object") { - a = a.valueOf(); - } - if ((typeof b === "undefined" ? "undefined" : _typeof(b)) === "object") { - b = b.valueOf(); - } - - return a === b; - } - - function compareConstructors(a, b) { - var protoA = getProto(a); - var protoB = getProto(b); - - // Comparing constructors is more strict than using `instanceof` - if (a.constructor === b.constructor) { - return true; - } - - // Ref #851 - // If the obj prototype descends from a null constructor, treat it - // as a null prototype. - if (protoA && protoA.constructor === null) { - protoA = null; - } - if (protoB && protoB.constructor === null) { - protoB = null; - } - - // Allow objects with no prototype to be equivalent to - // objects with Object as their constructor. - if (protoA === null && protoB === Object.prototype || protoB === null && protoA === Object.prototype) { - return true; - } - - return false; - } - - function getRegExpFlags(regexp) { - return "flags" in regexp ? regexp.flags : regexp.toString().match(/[gimuy]*$/)[0]; - } - - function isContainer(val) { - return ["object", "array", "map", "set"].indexOf(objectType(val)) !== -1; - } - - function breadthFirstCompareChild(a, b) { - - // If a is a container not reference-equal to b, postpone the comparison to the - // end of the pairs queue -- unless (a, b) has been seen before, in which case skip - // over the pair. - if (a === b) { - return true; - } - if (!isContainer(a)) { - return typeEquiv(a, b); - } - if (pairs.every(function (pair) { - return pair.a !== a || pair.b !== b; - })) { - - // Not yet started comparing this pair - pairs.push({ a: a, b: b }); - } - return true; - } - - var callbacks = { - "string": useStrictEquality, - "boolean": useStrictEquality, - "number": useStrictEquality, - "null": useStrictEquality, - "undefined": useStrictEquality, - "symbol": useStrictEquality, - "date": useStrictEquality, - - "nan": function nan() { - return true; - }, - - "regexp": function regexp(a, b) { - return a.source === b.source && - - // Include flags in the comparison - getRegExpFlags(a) === getRegExpFlags(b); - }, - - // abort (identical references / instance methods were skipped earlier) - "function": function _function() { - return false; - }, - - "array": function array(a, b) { - var i, len; - - len = a.length; - if (len !== b.length) { - - // Safe and faster - return false; - } - - for (i = 0; i < len; i++) { - - // Compare non-containers; queue non-reference-equal containers - if (!breadthFirstCompareChild(a[i], b[i])) { - return false; - } - } - return true; - }, - - // Define sets a and b to be equivalent if for each element aVal in a, there - // is some element bVal in b such that aVal and bVal are equivalent. Element - // repetitions are not counted, so these are equivalent: - // a = new Set( [ {}, [], [] ] ); - // b = new Set( [ {}, {}, [] ] ); - "set": function set$$1(a, b) { - var innerEq, - outerEq = true; - - if (a.size !== b.size) { - - // This optimization has certain quirks because of the lack of - // repetition counting. For instance, adding the same - // (reference-identical) element to two equivalent sets can - // make them non-equivalent. - return false; - } - - a.forEach(function (aVal) { - - // Short-circuit if the result is already known. (Using for...of - // with a break clause would be cleaner here, but it would cause - // a syntax error on older Javascript implementations even if - // Set is unused) - if (!outerEq) { - return; - } - - innerEq = false; - - b.forEach(function (bVal) { - var parentPairs; - - // Likewise, short-circuit if the result is already known - if (innerEq) { - return; - } - - // Swap out the global pairs list, as the nested call to - // innerEquiv will clobber its contents - parentPairs = pairs; - if (innerEquiv(bVal, aVal)) { - innerEq = true; - } - - // Replace the global pairs list - pairs = parentPairs; - }); - - if (!innerEq) { - outerEq = false; - } - }); - - return outerEq; - }, - - // Define maps a and b to be equivalent if for each key-value pair (aKey, aVal) - // in a, there is some key-value pair (bKey, bVal) in b such that - // [ aKey, aVal ] and [ bKey, bVal ] are equivalent. Key repetitions are not - // counted, so these are equivalent: - // a = new Map( [ [ {}, 1 ], [ {}, 1 ], [ [], 1 ] ] ); - // b = new Map( [ [ {}, 1 ], [ [], 1 ], [ [], 1 ] ] ); - "map": function map(a, b) { - var innerEq, - outerEq = true; - - if (a.size !== b.size) { - - // This optimization has certain quirks because of the lack of - // repetition counting. For instance, adding the same - // (reference-identical) key-value pair to two equivalent maps - // can make them non-equivalent. - return false; - } - - a.forEach(function (aVal, aKey) { - - // Short-circuit if the result is already known. (Using for...of - // with a break clause would be cleaner here, but it would cause - // a syntax error on older Javascript implementations even if - // Map is unused) - if (!outerEq) { - return; - } - - innerEq = false; - - b.forEach(function (bVal, bKey) { - var parentPairs; - - // Likewise, short-circuit if the result is already known - if (innerEq) { - return; - } - - // Swap out the global pairs list, as the nested call to - // innerEquiv will clobber its contents - parentPairs = pairs; - if (innerEquiv([bVal, bKey], [aVal, aKey])) { - innerEq = true; - } - - // Replace the global pairs list - pairs = parentPairs; - }); - - if (!innerEq) { - outerEq = false; - } - }); - - return outerEq; - }, - - "object": function object(a, b) { - var i, - aProperties = [], - bProperties = []; - - if (compareConstructors(a, b) === false) { - return false; - } - - // Be strict: don't ensure hasOwnProperty and go deep - for (i in a) { - - // Collect a's properties - aProperties.push(i); - - // Skip OOP methods that look the same - if (a.constructor !== Object && typeof a.constructor !== "undefined" && typeof a[i] === "function" && typeof b[i] === "function" && a[i].toString() === b[i].toString()) { - continue; - } - - // Compare non-containers; queue non-reference-equal containers - if (!breadthFirstCompareChild(a[i], b[i])) { - return false; - } - } - - for (i in b) { - - // Collect b's properties - bProperties.push(i); - } - - // Ensures identical properties name - return typeEquiv(aProperties.sort(), bProperties.sort()); - } - }; - - function typeEquiv(a, b) { - var type = objectType(a); - - // Callbacks for containers will append to the pairs queue to achieve breadth-first - // search order. The pairs queue is also used to avoid reprocessing any pair of - // containers that are reference-equal to a previously visited pair (a special case - // this being recursion detection). - // - // Because of this approach, once typeEquiv returns a false value, it should not be - // called again without clearing the pair queue else it may wrongly report a visited - // pair as being equivalent. - return objectType(b) === type && callbacks[type](a, b); - } - - function innerEquiv(a, b) { - var i, pair; - - // We're done when there's nothing more to compare - if (arguments.length < 2) { - return true; - } - - // Clear the global pair queue and add the top-level values being compared - pairs = [{ a: a, b: b }]; - - for (i = 0; i < pairs.length; i++) { - pair = pairs[i]; - - // Perform type-specific comparison on any pairs that are not strictly - // equal. For container types, that comparison will postpone comparison - // of any sub-container pair to the end of the pair queue. This gives - // breadth-first search order. It also avoids the reprocessing of - // reference-equal siblings, cousins etc, which can have a significant speed - // impact when comparing a container of small objects each of which has a - // reference to the same (singleton) large object. - if (pair.a !== pair.b && !typeEquiv(pair.a, pair.b)) { - return false; - } - } - - // ...across all consecutive argument pairs - return arguments.length === 2 || innerEquiv.apply(this, [].slice.call(arguments, 1)); - } - - return function () { - var result = innerEquiv.apply(undefined, arguments); - - // Release any retained objects - pairs.length = 0; - return result; - }; + // Value pairs queued for comparison. Used for breadth-first processing order, recursion + // detection and avoiding repeated comparison (see below for details). + // Elements are { a: val, b: val }. + var pairs = []; + + var getProto = Object.getPrototypeOf || function (obj) { + return obj.__proto__; + }; + + function useStrictEquality(a, b) { + + // This only gets called if a and b are not strict equal, and is used to compare on + // the primitive values inside object wrappers. For example: + // `var i = 1;` + // `var j = new Number(1);` + // Neither a nor b can be null, as a !== b and they have the same type. + if ((typeof a === "undefined" ? "undefined" : _typeof(a)) === "object") { + a = a.valueOf(); + } + if ((typeof b === "undefined" ? "undefined" : _typeof(b)) === "object") { + b = b.valueOf(); + } + + return a === b; + } + + function compareConstructors(a, b) { + var protoA = getProto(a); + var protoB = getProto(b); + + // Comparing constructors is more strict than using `instanceof` + if (a.constructor === b.constructor) { + return true; + } + + // Ref #851 + // If the obj prototype descends from a null constructor, treat it + // as a null prototype. + if (protoA && protoA.constructor === null) { + protoA = null; + } + if (protoB && protoB.constructor === null) { + protoB = null; + } + + // Allow objects with no prototype to be equivalent to + // objects with Object as their constructor. + if (protoA === null && protoB === Object.prototype || protoB === null && protoA === Object.prototype) { + return true; + } + + return false; + } + + function getRegExpFlags(regexp) { + return "flags" in regexp ? regexp.flags : regexp.toString().match(/[gimuy]*$/)[0]; + } + + function isContainer(val) { + return ["object", "array", "map", "set"].indexOf(objectType(val)) !== -1; + } + + function breadthFirstCompareChild(a, b) { + + // If a is a container not reference-equal to b, postpone the comparison to the + // end of the pairs queue -- unless (a, b) has been seen before, in which case skip + // over the pair. + if (a === b) { + return true; + } + if (!isContainer(a)) { + return typeEquiv(a, b); + } + if (pairs.every(function (pair) { + return pair.a !== a || pair.b !== b; + })) { + + // Not yet started comparing this pair + pairs.push({a: a, b: b}); + } + return true; + } + + var callbacks = { + "string": useStrictEquality, + "boolean": useStrictEquality, + "number": useStrictEquality, + "null": useStrictEquality, + "undefined": useStrictEquality, + "symbol": useStrictEquality, + "date": useStrictEquality, + + "nan": function nan() { + return true; + }, + + "regexp": function regexp(a, b) { + return a.source === b.source && + + // Include flags in the comparison + getRegExpFlags(a) === getRegExpFlags(b); + }, + + // abort (identical references / instance methods were skipped earlier) + "function": function _function() { + return false; + }, + + "array": function array(a, b) { + var i, len; + + len = a.length; + if (len !== b.length) { + + // Safe and faster + return false; + } + + for (i = 0; i < len; i++) { + + // Compare non-containers; queue non-reference-equal containers + if (!breadthFirstCompareChild(a[i], b[i])) { + return false; + } + } + return true; + }, + + // Define sets a and b to be equivalent if for each element aVal in a, there + // is some element bVal in b such that aVal and bVal are equivalent. Element + // repetitions are not counted, so these are equivalent: + // a = new Set( [ {}, [], [] ] ); + // b = new Set( [ {}, {}, [] ] ); + "set": function set$$1(a, b) { + var innerEq, + outerEq = true; + + if (a.size !== b.size) { + + // This optimization has certain quirks because of the lack of + // repetition counting. For instance, adding the same + // (reference-identical) element to two equivalent sets can + // make them non-equivalent. + return false; + } + + a.forEach(function (aVal) { + + // Short-circuit if the result is already known. (Using for...of + // with a break clause would be cleaner here, but it would cause + // a syntax error on older Javascript implementations even if + // Set is unused) + if (!outerEq) { + return; + } + + innerEq = false; + + b.forEach(function (bVal) { + var parentPairs; + + // Likewise, short-circuit if the result is already known + if (innerEq) { + return; + } + + // Swap out the global pairs list, as the nested call to + // innerEquiv will clobber its contents + parentPairs = pairs; + if (innerEquiv(bVal, aVal)) { + innerEq = true; + } + + // Replace the global pairs list + pairs = parentPairs; + }); + + if (!innerEq) { + outerEq = false; + } + }); + + return outerEq; + }, + + // Define maps a and b to be equivalent if for each key-value pair (aKey, aVal) + // in a, there is some key-value pair (bKey, bVal) in b such that + // [ aKey, aVal ] and [ bKey, bVal ] are equivalent. Key repetitions are not + // counted, so these are equivalent: + // a = new Map( [ [ {}, 1 ], [ {}, 1 ], [ [], 1 ] ] ); + // b = new Map( [ [ {}, 1 ], [ [], 1 ], [ [], 1 ] ] ); + "map": function map(a, b) { + var innerEq, + outerEq = true; + + if (a.size !== b.size) { + + // This optimization has certain quirks because of the lack of + // repetition counting. For instance, adding the same + // (reference-identical) key-value pair to two equivalent maps + // can make them non-equivalent. + return false; + } + + a.forEach(function (aVal, aKey) { + + // Short-circuit if the result is already known. (Using for...of + // with a break clause would be cleaner here, but it would cause + // a syntax error on older Javascript implementations even if + // Map is unused) + if (!outerEq) { + return; + } + + innerEq = false; + + b.forEach(function (bVal, bKey) { + var parentPairs; + + // Likewise, short-circuit if the result is already known + if (innerEq) { + return; + } + + // Swap out the global pairs list, as the nested call to + // innerEquiv will clobber its contents + parentPairs = pairs; + if (innerEquiv([bVal, bKey], [aVal, aKey])) { + innerEq = true; + } + + // Replace the global pairs list + pairs = parentPairs; + }); + + if (!innerEq) { + outerEq = false; + } + }); + + return outerEq; + }, + + "object": function object(a, b) { + var i, + aProperties = [], + bProperties = []; + + if (compareConstructors(a, b) === false) { + return false; + } + + // Be strict: don't ensure hasOwnProperty and go deep + for (i in a) { + + // Collect a's properties + aProperties.push(i); + + // Skip OOP methods that look the same + if (a.constructor !== Object && typeof a.constructor !== "undefined" && typeof a[i] === "function" && typeof b[i] === "function" && a[i].toString() === b[i].toString()) { + continue; + } + + // Compare non-containers; queue non-reference-equal containers + if (!breadthFirstCompareChild(a[i], b[i])) { + return false; + } + } + + for (i in b) { + + // Collect b's properties + bProperties.push(i); + } + + // Ensures identical properties name + return typeEquiv(aProperties.sort(), bProperties.sort()); + } + }; + + function typeEquiv(a, b) { + var type = objectType(a); + + // Callbacks for containers will append to the pairs queue to achieve breadth-first + // search order. The pairs queue is also used to avoid reprocessing any pair of + // containers that are reference-equal to a previously visited pair (a special case + // this being recursion detection). + // + // Because of this approach, once typeEquiv returns a false value, it should not be + // called again without clearing the pair queue else it may wrongly report a visited + // pair as being equivalent. + return objectType(b) === type && callbacks[type](a, b); + } + + function innerEquiv(a, b) { + var i, pair; + + // We're done when there's nothing more to compare + if (arguments.length < 2) { + return true; + } + + // Clear the global pair queue and add the top-level values being compared + pairs = [{a: a, b: b}]; + + for (i = 0; i < pairs.length; i++) { + pair = pairs[i]; + + // Perform type-specific comparison on any pairs that are not strictly + // equal. For container types, that comparison will postpone comparison + // of any sub-container pair to the end of the pair queue. This gives + // breadth-first search order. It also avoids the reprocessing of + // reference-equal siblings, cousins etc, which can have a significant speed + // impact when comparing a container of small objects each of which has a + // reference to the same (singleton) large object. + if (pair.a !== pair.b && !typeEquiv(pair.a, pair.b)) { + return false; + } + } + + // ...across all consecutive argument pairs + return arguments.length === 2 || innerEquiv.apply(this, [].slice.call(arguments, 1)); + } + + return function () { + var result = innerEquiv.apply(undefined, arguments); + + // Release any retained objects + pairs.length = 0; + return result; + }; })(); /** @@ -602,57 +554,57 @@ */ var config = { - // The queue of tests to run - queue: [], + // The queue of tests to run + queue: [], - // Block until document ready - blocking: true, + // Block until document ready + blocking: true, - // By default, run previously failed tests first - // very useful in combination with "Hide passed tests" checked - reorder: true, + // By default, run previously failed tests first + // very useful in combination with "Hide passed tests" checked + reorder: true, - // By default, modify document.title when suite is done - altertitle: true, + // By default, modify document.title when suite is done + altertitle: true, - // HTML Reporter: collapse every test except the first failing test - // If false, all failing tests will be expanded - collapse: true, + // HTML Reporter: collapse every test except the first failing test + // If false, all failing tests will be expanded + collapse: true, - // By default, scroll to top of the page when suite is done - scrolltop: true, + // By default, scroll to top of the page when suite is done + scrolltop: true, - // Depth up-to which object will be dumped - maxDepth: 5, + // Depth up-to which object will be dumped + maxDepth: 5, - // When enabled, all tests must call expect() - requireExpects: false, + // When enabled, all tests must call expect() + requireExpects: false, - // Placeholder for user-configurable form-exposed URL parameters - urlConfig: [], + // Placeholder for user-configurable form-exposed URL parameters + urlConfig: [], - // Set of all modules. - modules: [], + // Set of all modules. + modules: [], - // The first unnamed module - currentModule: { - name: "", - tests: [], - childModules: [], - testsRun: 0, - unskippedTestsRun: 0, - hooks: { - before: [], - beforeEach: [], - afterEach: [], - after: [] - } - }, + // The first unnamed module + currentModule: { + name: "", + tests: [], + childModules: [], + testsRun: 0, + unskippedTestsRun: 0, + hooks: { + before: [], + beforeEach: [], + afterEach: [], + after: [] + } + }, - callbacks: {}, + callbacks: {}, - // The storage module to use for reordering tests - storage: localSessionStorage + // The storage module to use for reordering tests + storage: localSessionStorage }; // take a predefined QUnit.config and extend the defaults @@ -660,7 +612,7 @@ // only extend the global config if there is no QUnit overload if (window && window.QUnit && !window.QUnit.version) { - extend(config, globalConfig); + extend(config, globalConfig); } // Push a loose unnamed module to the modules collection @@ -669,285 +621,288 @@ // Based on jsDump by Ariel Flesler // http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html var dump = (function () { - function quote(str) { - return "\"" + str.toString().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\""; - } - function literal(o) { - return o + ""; - } - function join(pre, arr, post) { - var s = dump.separator(), - base = dump.indent(), - inner = dump.indent(1); - if (arr.join) { - arr = arr.join("," + s + inner); - } - if (!arr) { - return pre + post; - } - return [pre, inner + arr, base + post].join(s); - } - function array(arr, stack) { - var i = arr.length, - ret = new Array(i); - - if (dump.maxDepth && dump.depth > dump.maxDepth) { - return "[object Array]"; - } - - this.up(); - while (i--) { - ret[i] = this.parse(arr[i], undefined, stack); - } - this.down(); - return join("[", ret, "]"); - } - - function isArray(obj) { - return ( - - //Native Arrays - toString.call(obj) === "[object Array]" || - - // NodeList objects - typeof obj.length === "number" && obj.item !== undefined && (obj.length ? obj.item(0) === obj[0] : obj.item(0) === null && obj[0] === undefined) - ); - } - - var reName = /^function (\w+)/, - dump = { - - // The objType is used mostly internally, you can fix a (custom) type in advance - parse: function parse(obj, objType, stack) { - stack = stack || []; - var res, - parser, - parserType, - objIndex = stack.indexOf(obj); - - if (objIndex !== -1) { - return "recursion(" + (objIndex - stack.length) + ")"; - } - - objType = objType || this.typeOf(obj); - parser = this.parsers[objType]; - parserType = typeof parser === "undefined" ? "undefined" : _typeof(parser); - - if (parserType === "function") { - stack.push(obj); - res = parser.call(this, obj, stack); - stack.pop(); - return res; - } - return parserType === "string" ? parser : this.parsers.error; - }, - typeOf: function typeOf(obj) { - var type; - - if (obj === null) { - type = "null"; - } else if (typeof obj === "undefined") { - type = "undefined"; - } else if (is("regexp", obj)) { - type = "regexp"; - } else if (is("date", obj)) { - type = "date"; - } else if (is("function", obj)) { - type = "function"; - } else if (obj.setInterval !== undefined && obj.document !== undefined && obj.nodeType === undefined) { - type = "window"; - } else if (obj.nodeType === 9) { - type = "document"; - } else if (obj.nodeType) { - type = "node"; - } else if (isArray(obj)) { - type = "array"; - } else if (obj.constructor === Error.prototype.constructor) { - type = "error"; - } else { - type = typeof obj === "undefined" ? "undefined" : _typeof(obj); - } - return type; - }, - - separator: function separator() { - if (this.multiline) { - return this.HTML ? "<br />" : "\n"; - } else { - return this.HTML ? " " : " "; - } - }, - - // Extra can be a number, shortcut for increasing-calling-decreasing - indent: function indent(extra) { - if (!this.multiline) { - return ""; - } - var chr = this.indentChar; - if (this.HTML) { - chr = chr.replace(/\t/g, " ").replace(/ /g, " "); - } - return new Array(this.depth + (extra || 0)).join(chr); - }, - up: function up(a) { - this.depth += a || 1; - }, - down: function down(a) { - this.depth -= a || 1; - }, - setParser: function setParser(name, parser) { - this.parsers[name] = parser; - }, - - // The next 3 are exposed so you can use them - quote: quote, - literal: literal, - join: join, - depth: 1, - maxDepth: config.maxDepth, - - // This is the list of parsers, to modify them, use dump.setParser - parsers: { - window: "[Window]", - document: "[Document]", - error: function error(_error) { - return "Error(\"" + _error.message + "\")"; - }, - unknown: "[Unknown]", - "null": "null", - "undefined": "undefined", - "function": function _function(fn) { - var ret = "function", - - - // Functions never have name in IE - name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1]; - - if (name) { - ret += " " + name; - } - ret += "("; - - ret = [ret, dump.parse(fn, "functionArgs"), "){"].join(""); - return join(ret, dump.parse(fn, "functionCode"), "}"); - }, - array: array, - nodelist: array, - "arguments": array, - object: function object(map, stack) { - var keys, - key, - val, - i, - nonEnumerableProperties, - ret = []; - - if (dump.maxDepth && dump.depth > dump.maxDepth) { - return "[object Object]"; - } - - dump.up(); - keys = []; - for (key in map) { - keys.push(key); - } - - // Some properties are not always enumerable on Error objects. - nonEnumerableProperties = ["message", "name"]; - for (i in nonEnumerableProperties) { - key = nonEnumerableProperties[i]; - if (key in map && !inArray(key, keys)) { - keys.push(key); - } - } - keys.sort(); - for (i = 0; i < keys.length; i++) { - key = keys[i]; - val = map[key]; - ret.push(dump.parse(key, "key") + ": " + dump.parse(val, undefined, stack)); - } - dump.down(); - return join("{", ret, "}"); - }, - node: function node(_node) { - var len, - i, - val, - open = dump.HTML ? "<" : "<", - close = dump.HTML ? ">" : ">", - tag = _node.nodeName.toLowerCase(), - ret = open + tag, - attrs = _node.attributes; - - if (attrs) { - for (i = 0, len = attrs.length; i < len; i++) { - val = attrs[i].nodeValue; - - // IE6 includes all attributes in .attributes, even ones not explicitly - // set. Those have values like undefined, null, 0, false, "" or - // "inherit". - if (val && val !== "inherit") { - ret += " " + attrs[i].nodeName + "=" + dump.parse(val, "attribute"); - } - } - } - ret += close; - - // Show content of TextNode or CDATASection - if (_node.nodeType === 3 || _node.nodeType === 4) { - ret += _node.nodeValue; - } - - return ret + open + "/" + tag + close; - }, - - // Function calls it internally, it's the arguments part of the function - functionArgs: function functionArgs(fn) { - var args, - l = fn.length; - - if (!l) { - return ""; - } - - args = new Array(l); - while (l--) { - - // 97 is 'a' - args[l] = String.fromCharCode(97 + l); - } - return " " + args.join(", ") + " "; - }, - - // Object calls it internally, the key part of an item in a map - key: quote, - - // Function calls it internally, it's the content of the function - functionCode: "[code]", - - // Node calls it internally, it's a html attribute value - attribute: quote, - string: quote, - date: quote, - regexp: literal, - number: literal, - "boolean": literal, - symbol: function symbol(sym) { - return sym.toString(); - } - }, - - // If true, entities are escaped ( <, >, \t, space and \n ) - HTML: false, - - // Indentation unit - indentChar: " ", - - // If true, items in a collection, are separated by a \n, else just a space. - multiline: true - }; - - return dump; + function quote(str) { + return "\"" + str.toString().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\""; + } + + function literal(o) { + return o + ""; + } + + function join(pre, arr, post) { + var s = dump.separator(), + base = dump.indent(), + inner = dump.indent(1); + if (arr.join) { + arr = arr.join("," + s + inner); + } + if (!arr) { + return pre + post; + } + return [pre, inner + arr, base + post].join(s); + } + + function array(arr, stack) { + var i = arr.length, + ret = new Array(i); + + if (dump.maxDepth && dump.depth > dump.maxDepth) { + return "[object Array]"; + } + + this.up(); + while (i--) { + ret[i] = this.parse(arr[i], undefined, stack); + } + this.down(); + return join("[", ret, "]"); + } + + function isArray(obj) { + return ( + + //Native Arrays + toString.call(obj) === "[object Array]" || + + // NodeList objects + typeof obj.length === "number" && obj.item !== undefined && (obj.length ? obj.item(0) === obj[0] : obj.item(0) === null && obj[0] === undefined) + ); + } + + var reName = /^function (\w+)/, + dump = { + + // The objType is used mostly internally, you can fix a (custom) type in advance + parse: function parse(obj, objType, stack) { + stack = stack || []; + var res, + parser, + parserType, + objIndex = stack.indexOf(obj); + + if (objIndex !== -1) { + return "recursion(" + (objIndex - stack.length) + ")"; + } + + objType = objType || this.typeOf(obj); + parser = this.parsers[objType]; + parserType = typeof parser === "undefined" ? "undefined" : _typeof(parser); + + if (parserType === "function") { + stack.push(obj); + res = parser.call(this, obj, stack); + stack.pop(); + return res; + } + return parserType === "string" ? parser : this.parsers.error; + }, + typeOf: function typeOf(obj) { + var type; + + if (obj === null) { + type = "null"; + } else if (typeof obj === "undefined") { + type = "undefined"; + } else if (is("regexp", obj)) { + type = "regexp"; + } else if (is("date", obj)) { + type = "date"; + } else if (is("function", obj)) { + type = "function"; + } else if (obj.setInterval !== undefined && obj.document !== undefined && obj.nodeType === undefined) { + type = "window"; + } else if (obj.nodeType === 9) { + type = "document"; + } else if (obj.nodeType) { + type = "node"; + } else if (isArray(obj)) { + type = "array"; + } else if (obj.constructor === Error.prototype.constructor) { + type = "error"; + } else { + type = typeof obj === "undefined" ? "undefined" : _typeof(obj); + } + return type; + }, + + separator: function separator() { + if (this.multiline) { + return this.HTML ? "<br />" : "\n"; + } else { + return this.HTML ? " " : " "; + } + }, + + // Extra can be a number, shortcut for increasing-calling-decreasing + indent: function indent(extra) { + if (!this.multiline) { + return ""; + } + var chr = this.indentChar; + if (this.HTML) { + chr = chr.replace(/\t/g, " ").replace(/ /g, " "); + } + return new Array(this.depth + (extra || 0)).join(chr); + }, + up: function up(a) { + this.depth += a || 1; + }, + down: function down(a) { + this.depth -= a || 1; + }, + setParser: function setParser(name, parser) { + this.parsers[name] = parser; + }, + + // The next 3 are exposed so you can use them + quote: quote, + literal: literal, + join: join, + depth: 1, + maxDepth: config.maxDepth, + + // This is the list of parsers, to modify them, use dump.setParser + parsers: { + window: "[Window]", + document: "[Document]", + error: function error(_error) { + return "Error(\"" + _error.message + "\")"; + }, + unknown: "[Unknown]", + "null": "null", + "undefined": "undefined", + "function": function _function(fn) { + var ret = "function", + + + // Functions never have name in IE + name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1]; + + if (name) { + ret += " " + name; + } + ret += "("; + + ret = [ret, dump.parse(fn, "functionArgs"), "){"].join(""); + return join(ret, dump.parse(fn, "functionCode"), "}"); + }, + array: array, + nodelist: array, + "arguments": array, + object: function object(map, stack) { + var keys, + key, + val, + i, + nonEnumerableProperties, + ret = []; + + if (dump.maxDepth && dump.depth > dump.maxDepth) { + return "[object Object]"; + } + + dump.up(); + keys = []; + for (key in map) { + keys.push(key); + } + + // Some properties are not always enumerable on Error objects. + nonEnumerableProperties = ["message", "name"]; + for (i in nonEnumerableProperties) { + key = nonEnumerableProperties[i]; + if (key in map && !inArray(key, keys)) { + keys.push(key); + } + } + keys.sort(); + for (i = 0; i < keys.length; i++) { + key = keys[i]; + val = map[key]; + ret.push(dump.parse(key, "key") + ": " + dump.parse(val, undefined, stack)); + } + dump.down(); + return join("{", ret, "}"); + }, + node: function node(_node) { + var len, + i, + val, + open = dump.HTML ? "<" : "<", + close = dump.HTML ? ">" : ">", + tag = _node.nodeName.toLowerCase(), + ret = open + tag, + attrs = _node.attributes; + + if (attrs) { + for (i = 0, len = attrs.length; i < len; i++) { + val = attrs[i].nodeValue; + + // IE6 includes all attributes in .attributes, even ones not explicitly + // set. Those have values like undefined, null, 0, false, "" or + // "inherit". + if (val && val !== "inherit") { + ret += " " + attrs[i].nodeName + "=" + dump.parse(val, "attribute"); + } + } + } + ret += close; + + // Show content of TextNode or CDATASection + if (_node.nodeType === 3 || _node.nodeType === 4) { + ret += _node.nodeValue; + } + + return ret + open + "/" + tag + close; + }, + + // Function calls it internally, it's the arguments part of the function + functionArgs: function functionArgs(fn) { + var args, + l = fn.length; + + if (!l) { + return ""; + } + + args = new Array(l); + while (l--) { + + // 97 is 'a' + args[l] = String.fromCharCode(97 + l); + } + return " " + args.join(", ") + " "; + }, + + // Object calls it internally, the key part of an item in a map + key: quote, + + // Function calls it internally, it's the content of the function + functionCode: "[code]", + + // Node calls it internally, it's a html attribute value + attribute: quote, + string: quote, + date: quote, + regexp: literal, + number: literal, + "boolean": literal, + symbol: function symbol(sym) { + return sym.toString(); + } + }, + + // If true, entities are escaped ( <, >, \t, space and \n ) + HTML: false, + + // Indentation unit + indentChar: " ", + + // If true, items in a collection, are separated by a \n, else just a space. + multiline: true + }; + + return dump; })(); var LISTENERS = Object.create(null); @@ -966,17 +921,17 @@ * @return {Void} */ function emit(eventName, data) { - if (objectType(eventName) !== "string") { - throw new TypeError("eventName must be a string when emitting an event"); - } + if (objectType(eventName) !== "string") { + throw new TypeError("eventName must be a string when emitting an event"); + } - // Clone the callbacks in case one of them registers a new callback - var originalCallbacks = LISTENERS[eventName]; - var callbacks = originalCallbacks ? [].concat(toConsumableArray(originalCallbacks)) : []; + // Clone the callbacks in case one of them registers a new callback + var originalCallbacks = LISTENERS[eventName]; + var callbacks = originalCallbacks ? [].concat(toConsumableArray(originalCallbacks)) : []; - for (var i = 0; i < callbacks.length; i++) { - callbacks[i](data); - } + for (var i = 0; i < callbacks.length; i++) { + callbacks[i](data); + } } /** @@ -989,63 +944,63 @@ * @return {Void} */ function on(eventName, callback) { - if (objectType(eventName) !== "string") { - throw new TypeError("eventName must be a string when registering a listener"); - } else if (!inArray(eventName, SUPPORTED_EVENTS)) { - var events = SUPPORTED_EVENTS.join(", "); - throw new Error("\"" + eventName + "\" is not a valid event; must be one of: " + events + "."); - } else if (objectType(callback) !== "function") { - throw new TypeError("callback must be a function when registering a listener"); - } - - if (!LISTENERS[eventName]) { - LISTENERS[eventName] = []; - } - - // Don't register the same callback more than once - if (!inArray(callback, LISTENERS[eventName])) { - LISTENERS[eventName].push(callback); - } + if (objectType(eventName) !== "string") { + throw new TypeError("eventName must be a string when registering a listener"); + } else if (!inArray(eventName, SUPPORTED_EVENTS)) { + var events = SUPPORTED_EVENTS.join(", "); + throw new Error("\"" + eventName + "\" is not a valid event; must be one of: " + events + "."); + } else if (objectType(callback) !== "function") { + throw new TypeError("callback must be a function when registering a listener"); + } + + if (!LISTENERS[eventName]) { + LISTENERS[eventName] = []; + } + + // Don't register the same callback more than once + if (!inArray(callback, LISTENERS[eventName])) { + LISTENERS[eventName].push(callback); + } } // Register logging callbacks function registerLoggingCallbacks(obj) { - var i, - l, - key, - callbackNames = ["begin", "done", "log", "testStart", "testDone", "moduleStart", "moduleDone"]; + var i, + l, + key, + callbackNames = ["begin", "done", "log", "testStart", "testDone", "moduleStart", "moduleDone"]; - function registerLoggingCallback(key) { - var loggingCallback = function loggingCallback(callback) { - if (objectType(callback) !== "function") { - throw new Error("QUnit logging methods require a callback function as their first parameters."); - } + function registerLoggingCallback(key) { + var loggingCallback = function loggingCallback(callback) { + if (objectType(callback) !== "function") { + throw new Error("QUnit logging methods require a callback function as their first parameters."); + } - config.callbacks[key].push(callback); - }; + config.callbacks[key].push(callback); + }; - return loggingCallback; - } + return loggingCallback; + } - for (i = 0, l = callbackNames.length; i < l; i++) { - key = callbackNames[i]; + for (i = 0, l = callbackNames.length; i < l; i++) { + key = callbackNames[i]; - // Initialize key collection of logging callback - if (objectType(config.callbacks[key]) === "undefined") { - config.callbacks[key] = []; - } + // Initialize key collection of logging callback + if (objectType(config.callbacks[key]) === "undefined") { + config.callbacks[key] = []; + } - obj[key] = registerLoggingCallback(key); - } + obj[key] = registerLoggingCallback(key); + } } function runLoggingCallbacks(key, args) { - var i, l, callbacks; + var i, l, callbacks; - callbacks = config.callbacks[key]; - for (i = 0, l = callbacks.length; i < l; i++) { - callbacks[i](args); - } + callbacks = config.callbacks[key]; + for (i = 0, l = callbacks.length; i < l; i++) { + callbacks[i](args); + } } // Doesn't support IE9, it will return undefined on these browsers @@ -1053,45 +1008,45 @@ var fileName = (sourceFromStacktrace(0) || "").replace(/(:\d+)+\)?/, "").replace(/.+\//, ""); function extractStacktrace(e, offset) { - offset = offset === undefined ? 4 : offset; - - var stack, include, i; - - if (e && e.stack) { - stack = e.stack.split("\n"); - if (/^error$/i.test(stack[0])) { - stack.shift(); - } - if (fileName) { - include = []; - for (i = offset; i < stack.length; i++) { - if (stack[i].indexOf(fileName) !== -1) { - break; - } - include.push(stack[i]); - } - if (include.length) { - return include.join("\n"); - } - } - return stack[offset]; - } + offset = offset === undefined ? 4 : offset; + + var stack, include, i; + + if (e && e.stack) { + stack = e.stack.split("\n"); + if (/^error$/i.test(stack[0])) { + stack.shift(); + } + if (fileName) { + include = []; + for (i = offset; i < stack.length; i++) { + if (stack[i].indexOf(fileName) !== -1) { + break; + } + include.push(stack[i]); + } + if (include.length) { + return include.join("\n"); + } + } + return stack[offset]; + } } function sourceFromStacktrace(offset) { - var error = new Error(); - - // Support: Safari <=7 only, IE <=10 - 11 only - // Not all browsers generate the `stack` property for `new Error()`, see also #636 - if (!error.stack) { - try { - throw error; - } catch (err) { - error = err; - } - } - - return extractStacktrace(error, offset); + var error = new Error(); + + // Support: Safari <=7 only, IE <=10 - 11 only + // Not all browsers generate the `stack` property for `new Error()`, see also #636 + if (!error.stack) { + try { + throw error; + } catch (err) { + error = err; + } + } + + return extractStacktrace(error, offset); } var priorityCount = 0; @@ -1102,42 +1057,42 @@ * @param {Boolean} last */ function advance() { - var start = now(); - config.depth = (config.depth || 0) + 1; + var start = now(); + config.depth = (config.depth || 0) + 1; - while (config.queue.length && !config.blocking) { - var elapsedTime = now() - start; + while (config.queue.length && !config.blocking) { + var elapsedTime = now() - start; - if (!defined.setTimeout || config.updateRate <= 0 || elapsedTime < config.updateRate) { - if (priorityCount > 0) { - priorityCount--; - } + if (!defined.setTimeout || config.updateRate <= 0 || elapsedTime < config.updateRate) { + if (priorityCount > 0) { + priorityCount--; + } - config.queue.shift()(); - } else { - setTimeout(advance); - break; - } - } + config.queue.shift()(); + } else { + setTimeout(advance); + break; + } + } - config.depth--; + config.depth--; - if (!config.blocking && !config.queue.length && config.depth === 0) { - done(); - } + if (!config.blocking && !config.queue.length && config.depth === 0) { + done(); + } } function addToQueueImmediate(callback) { - if (objectType(callback) === "array") { - while (callback.length) { - addToQueueImmediate(callback.pop()); - } + if (objectType(callback) === "array") { + while (callback.length) { + addToQueueImmediate(callback.pop()); + } - return; - } + return; + } - config.queue.unshift(callback); - priorityCount++; + config.queue.unshift(callback); + priorityCount++; } /** @@ -1147,19 +1102,19 @@ * @param {String} seed */ function addToQueue(callback, prioritize, seed) { - if (prioritize) { - config.queue.splice(priorityCount++, 0, callback); - } else if (seed) { - if (!unitSampler) { - unitSampler = unitSamplerGenerator(seed); - } - - // Insert into a random position after all prioritized items - var index = Math.floor(unitSampler() * (config.queue.length - priorityCount + 1)); - config.queue.splice(priorityCount + index, 0, callback); - } else { - config.queue.push(callback); - } + if (prioritize) { + config.queue.splice(priorityCount++, 0, callback); + } else if (seed) { + if (!unitSampler) { + unitSampler = unitSamplerGenerator(seed); + } + + // Insert into a random position after all prioritized items + var index = Math.floor(unitSampler() * (config.queue.length - priorityCount + 1)); + config.queue.splice(priorityCount + index, 0, callback); + } else { + config.queue.push(callback); + } } /** @@ -1167,21 +1122,21 @@ */ function unitSamplerGenerator(seed) { - // 32-bit xorshift, requires only a nonzero seed - // http://excamera.com/sphinx/article-xorshift.html - var sample = parseInt(generateHash(seed), 16) || -1; - return function () { - sample ^= sample << 13; - sample ^= sample >>> 17; - sample ^= sample << 5; - - // ECMAScript has no unsigned number type - if (sample < 0) { - sample += 0x100000000; - } - - return sample / 0x100000000; - }; + // 32-bit xorshift, requires only a nonzero seed + // http://excamera.com/sphinx/article-xorshift.html + var sample = parseInt(generateHash(seed), 16) || -1; + return function () { + sample ^= sample << 13; + sample ^= sample >>> 17; + sample ^= sample << 5; + + // ECMAScript has no unsigned number type + if (sample < 0) { + sample += 0x100000000; + } + + return sample / 0x100000000; + }; } /** @@ -1189,913 +1144,914 @@ * items. It handles emitting the final run events. */ function done() { - var storage = config.storage; - - ProcessingQueue.finished = true; - - var runtime = now() - config.started; - var passed = config.stats.all - config.stats.bad; - - emit("runEnd", globalSuite.end(true)); - runLoggingCallbacks("done", { - passed: passed, - failed: config.stats.bad, - total: config.stats.all, - runtime: runtime - }); - - // Clear own storage items if all tests passed - if (storage && config.stats.bad === 0) { - for (var i = storage.length - 1; i >= 0; i--) { - var key = storage.key(i); - - if (key.indexOf("qunit-test-") === 0) { - storage.removeItem(key); - } - } - } + var storage = config.storage; + + ProcessingQueue.finished = true; + + var runtime = now() - config.started; + var passed = config.stats.all - config.stats.bad; + + emit("runEnd", globalSuite.end(true)); + runLoggingCallbacks("done", { + passed: passed, + failed: config.stats.bad, + total: config.stats.all, + runtime: runtime + }); + + // Clear own storage items if all tests passed + if (storage && config.stats.bad === 0) { + for (var i = storage.length - 1; i >= 0; i--) { + var key = storage.key(i); + + if (key.indexOf("qunit-test-") === 0) { + storage.removeItem(key); + } + } + } } var ProcessingQueue = { - finished: false, - add: addToQueue, - addImmediate: addToQueueImmediate, - advance: advance + finished: false, + add: addToQueue, + addImmediate: addToQueueImmediate, + advance: advance }; var TestReport = function () { - function TestReport(name, suite, options) { - classCallCheck(this, TestReport); - - this.name = name; - this.suiteName = suite.name; - this.fullName = suite.fullName.concat(name); - this.runtime = 0; - this.assertions = []; - - this.skipped = !!options.skip; - this.todo = !!options.todo; - - this.valid = options.valid; - - this._startTime = 0; - this._endTime = 0; - - suite.pushTest(this); - } - - createClass(TestReport, [{ - key: "start", - value: function start(recordTime) { - if (recordTime) { - this._startTime = Date.now(); - } - - return { - name: this.name, - suiteName: this.suiteName, - fullName: this.fullName.slice() - }; - } - }, { - key: "end", - value: function end(recordTime) { - if (recordTime) { - this._endTime = Date.now(); - } - - return extend(this.start(), { - runtime: this.getRuntime(), - status: this.getStatus(), - errors: this.getFailedAssertions(), - assertions: this.getAssertions() - }); - } - }, { - key: "pushAssertion", - value: function pushAssertion(assertion) { - this.assertions.push(assertion); - } - }, { - key: "getRuntime", - value: function getRuntime() { - return this._endTime - this._startTime; - } - }, { - key: "getStatus", - value: function getStatus() { - if (this.skipped) { - return "skipped"; - } - - var testPassed = this.getFailedAssertions().length > 0 ? this.todo : !this.todo; - - if (!testPassed) { - return "failed"; - } else if (this.todo) { - return "todo"; - } else { - return "passed"; - } - } - }, { - key: "getFailedAssertions", - value: function getFailedAssertions() { - return this.assertions.filter(function (assertion) { - return !assertion.passed; - }); - } - }, { - key: "getAssertions", - value: function getAssertions() { - return this.assertions.slice(); - } - - // Remove actual and expected values from assertions. This is to prevent - // leaking memory throughout a test suite. - - }, { - key: "slimAssertions", - value: function slimAssertions() { - this.assertions = this.assertions.map(function (assertion) { - delete assertion.actual; - delete assertion.expected; - return assertion; - }); - } - }]); - return TestReport; + function TestReport(name, suite, options) { + classCallCheck(this, TestReport); + + this.name = name; + this.suiteName = suite.name; + this.fullName = suite.fullName.concat(name); + this.runtime = 0; + this.assertions = []; + + this.skipped = !!options.skip; + this.todo = !!options.todo; + + this.valid = options.valid; + + this._startTime = 0; + this._endTime = 0; + + suite.pushTest(this); + } + + createClass(TestReport, [{ + key: "start", + value: function start(recordTime) { + if (recordTime) { + this._startTime = Date.now(); + } + + return { + name: this.name, + suiteName: this.suiteName, + fullName: this.fullName.slice() + }; + } + }, { + key: "end", + value: function end(recordTime) { + if (recordTime) { + this._endTime = Date.now(); + } + + return extend(this.start(), { + runtime: this.getRuntime(), + status: this.getStatus(), + errors: this.getFailedAssertions(), + assertions: this.getAssertions() + }); + } + }, { + key: "pushAssertion", + value: function pushAssertion(assertion) { + this.assertions.push(assertion); + } + }, { + key: "getRuntime", + value: function getRuntime() { + return this._endTime - this._startTime; + } + }, { + key: "getStatus", + value: function getStatus() { + if (this.skipped) { + return "skipped"; + } + + var testPassed = this.getFailedAssertions().length > 0 ? this.todo : !this.todo; + + if (!testPassed) { + return "failed"; + } else if (this.todo) { + return "todo"; + } else { + return "passed"; + } + } + }, { + key: "getFailedAssertions", + value: function getFailedAssertions() { + return this.assertions.filter(function (assertion) { + return !assertion.passed; + }); + } + }, { + key: "getAssertions", + value: function getAssertions() { + return this.assertions.slice(); + } + + // Remove actual and expected values from assertions. This is to prevent + // leaking memory throughout a test suite. + + }, { + key: "slimAssertions", + value: function slimAssertions() { + this.assertions = this.assertions.map(function (assertion) { + delete assertion.actual; + delete assertion.expected; + return assertion; + }); + } + }]); + return TestReport; }(); var focused$1 = false; function Test(settings) { - var i, l; - - ++Test.count; - - this.expected = null; - this.assertions = []; - this.semaphore = 0; - this.module = config.currentModule; - this.stack = sourceFromStacktrace(3); - this.steps = []; - this.timeout = undefined; - - // If a module is skipped, all its tests and the tests of the child suites - // should be treated as skipped even if they are defined as `only` or `todo`. - // As for `todo` module, all its tests will be treated as `todo` except for - // tests defined as `skip` which will be left intact. - // - // So, if a test is defined as `todo` and is inside a skipped module, we should - // then treat that test as if was defined as `skip`. - if (this.module.skip) { - settings.skip = true; - settings.todo = false; - - // Skipped tests should be left intact - } else if (this.module.todo && !settings.skip) { - settings.todo = true; - } - - extend(this, settings); - - this.testReport = new TestReport(settings.testName, this.module.suiteReport, { - todo: settings.todo, - skip: settings.skip, - valid: this.valid() - }); - - // Register unique strings - for (i = 0, l = this.module.tests; i < l.length; i++) { - if (this.module.tests[i].name === this.testName) { - this.testName += " "; - } - } - - this.testId = generateHash(this.module.name, this.testName); - - this.module.tests.push({ - name: this.testName, - testId: this.testId, - skip: !!settings.skip - }); - - if (settings.skip) { - - // Skipped tests will fully ignore any sent callback - this.callback = function () {}; - this.async = false; - this.expected = 0; - } else { - if (typeof this.callback !== "function") { - var method = this.todo ? "todo" : "test"; - - // eslint-disable-next-line max-len - throw new TypeError("You must provide a function as a test callback to QUnit." + method + "(\"" + settings.testName + "\")"); - } - - this.assert = new Assert(this); - } + var i, l; + + ++Test.count; + + this.expected = null; + this.assertions = []; + this.semaphore = 0; + this.module = config.currentModule; + this.stack = sourceFromStacktrace(3); + this.steps = []; + this.timeout = undefined; + + // If a module is skipped, all its tests and the tests of the child suites + // should be treated as skipped even if they are defined as `only` or `todo`. + // As for `todo` module, all its tests will be treated as `todo` except for + // tests defined as `skip` which will be left intact. + // + // So, if a test is defined as `todo` and is inside a skipped module, we should + // then treat that test as if was defined as `skip`. + if (this.module.skip) { + settings.skip = true; + settings.todo = false; + + // Skipped tests should be left intact + } else if (this.module.todo && !settings.skip) { + settings.todo = true; + } + + extend(this, settings); + + this.testReport = new TestReport(settings.testName, this.module.suiteReport, { + todo: settings.todo, + skip: settings.skip, + valid: this.valid() + }); + + // Register unique strings + for (i = 0, l = this.module.tests; i < l.length; i++) { + if (this.module.tests[i].name === this.testName) { + this.testName += " "; + } + } + + this.testId = generateHash(this.module.name, this.testName); + + this.module.tests.push({ + name: this.testName, + testId: this.testId, + skip: !!settings.skip + }); + + if (settings.skip) { + + // Skipped tests will fully ignore any sent callback + this.callback = function () { + }; + this.async = false; + this.expected = 0; + } else { + if (typeof this.callback !== "function") { + var method = this.todo ? "todo" : "test"; + + // eslint-disable-next-line max-len + throw new TypeError("You must provide a function as a test callback to QUnit." + method + "(\"" + settings.testName + "\")"); + } + + this.assert = new Assert(this); + } } Test.count = 0; function getNotStartedModules(startModule) { - var module = startModule, - modules = []; + var module = startModule, + modules = []; - while (module && module.testsRun === 0) { - modules.push(module); - module = module.parentModule; - } + while (module && module.testsRun === 0) { + modules.push(module); + module = module.parentModule; + } - return modules; + return modules; } Test.prototype = { - before: function before() { - var i, - startModule, - module = this.module, - notStartedModules = getNotStartedModules(module); - - for (i = notStartedModules.length - 1; i >= 0; i--) { - startModule = notStartedModules[i]; - startModule.stats = { all: 0, bad: 0, started: now() }; - emit("suiteStart", startModule.suiteReport.start(true)); - runLoggingCallbacks("moduleStart", { - name: startModule.name, - tests: startModule.tests - }); - } - - config.current = this; - - this.testEnvironment = extend({}, module.testEnvironment); - - this.started = now(); - emit("testStart", this.testReport.start(true)); - runLoggingCallbacks("testStart", { - name: this.testName, - module: module.name, - testId: this.testId, - previousFailure: this.previousFailure - }); - - if (!config.pollution) { - saveGlobal(); - } - }, - - run: function run() { - var promise; - - config.current = this; - - this.callbackStarted = now(); - - if (config.notrycatch) { - runTest(this); - return; - } - - try { - runTest(this); - } catch (e) { - this.pushFailure("Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + (e.message || e), extractStacktrace(e, 0)); - - // Else next test will carry the responsibility - saveGlobal(); - - // Restart the tests if they're blocking - if (config.blocking) { - internalRecover(this); - } - } - - function runTest(test) { - promise = test.callback.call(test.testEnvironment, test.assert); - test.resolvePromise(promise); - - // If the test has a "lock" on it, but the timeout is 0, then we push a - // failure as the test should be synchronous. - if (test.timeout === 0 && test.semaphore !== 0) { - pushFailure("Test did not finish synchronously even though assert.timeout( 0 ) was used.", sourceFromStacktrace(2)); - } - } - }, - - after: function after() { - checkPollution(); - }, - - queueHook: function queueHook(hook, hookName, hookOwner) { - var _this = this; - - var callHook = function callHook() { - var promise = hook.call(_this.testEnvironment, _this.assert); - _this.resolvePromise(promise, hookName); - }; - - var runHook = function runHook() { - if (hookName === "before") { - if (hookOwner.unskippedTestsRun !== 0) { - return; - } - - _this.preserveEnvironment = true; - } - - if (hookName === "after" && hookOwner.unskippedTestsRun !== numberOfUnskippedTests(hookOwner) - 1 && config.queue.length > 2) { - return; - } - - config.current = _this; - if (config.notrycatch) { - callHook(); - return; - } - try { - callHook(); - } catch (error) { - _this.pushFailure(hookName + " failed on " + _this.testName + ": " + (error.message || error), extractStacktrace(error, 0)); - } - }; - - return runHook; - }, - - - // Currently only used for module level hooks, can be used to add global level ones - hooks: function hooks(handler) { - var hooks = []; - - function processHooks(test, module) { - if (module.parentModule) { - processHooks(test, module.parentModule); - } - - if (module.hooks[handler].length) { - for (var i = 0; i < module.hooks[handler].length; i++) { - hooks.push(test.queueHook(module.hooks[handler][i], handler, module)); - } - } - } - - // Hooks are ignored on skipped tests - if (!this.skip) { - processHooks(this, this.module); - } - - return hooks; - }, - - - finish: function finish() { - config.current = this; - if (config.requireExpects && this.expected === null) { - this.pushFailure("Expected number of assertions to be defined, but expect() was " + "not called.", this.stack); - } else if (this.expected !== null && this.expected !== this.assertions.length) { - this.pushFailure("Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack); - } else if (this.expected === null && !this.assertions.length) { - this.pushFailure("Expected at least one assertion, but none were run - call " + "expect(0) to accept zero assertions.", this.stack); - } - - var i, - module = this.module, - moduleName = module.name, - testName = this.testName, - skipped = !!this.skip, - todo = !!this.todo, - bad = 0, - storage = config.storage; - - this.runtime = now() - this.started; - - config.stats.all += this.assertions.length; - module.stats.all += this.assertions.length; - - for (i = 0; i < this.assertions.length; i++) { - if (!this.assertions[i].result) { - bad++; - config.stats.bad++; - module.stats.bad++; - } - } - - notifyTestsRan(module, skipped); - - // Store result when possible - if (storage) { - if (bad) { - storage.setItem("qunit-test-" + moduleName + "-" + testName, bad); - } else { - storage.removeItem("qunit-test-" + moduleName + "-" + testName); - } - } - - // After emitting the js-reporters event we cleanup the assertion data to - // avoid leaking it. It is not used by the legacy testDone callbacks. - emit("testEnd", this.testReport.end(true)); - this.testReport.slimAssertions(); - - runLoggingCallbacks("testDone", { - name: testName, - module: moduleName, - skipped: skipped, - todo: todo, - failed: bad, - passed: this.assertions.length - bad, - total: this.assertions.length, - runtime: skipped ? 0 : this.runtime, - - // HTML Reporter use - assertions: this.assertions, - testId: this.testId, - - // Source of Test - source: this.stack - }); - - if (module.testsRun === numberOfTests(module)) { - logSuiteEnd(module); - - // Check if the parent modules, iteratively, are done. If that the case, - // we emit the `suiteEnd` event and trigger `moduleDone` callback. - var parent = module.parentModule; - while (parent && parent.testsRun === numberOfTests(parent)) { - logSuiteEnd(parent); - parent = parent.parentModule; - } - } - - config.current = undefined; - - function logSuiteEnd(module) { - emit("suiteEnd", module.suiteReport.end(true)); - runLoggingCallbacks("moduleDone", { - name: module.name, - tests: module.tests, - failed: module.stats.bad, - passed: module.stats.all - module.stats.bad, - total: module.stats.all, - runtime: now() - module.stats.started - }); - } - }, - - preserveTestEnvironment: function preserveTestEnvironment() { - if (this.preserveEnvironment) { - this.module.testEnvironment = this.testEnvironment; - this.testEnvironment = extend({}, this.module.testEnvironment); - } - }, - - queue: function queue() { - var test = this; - - if (!this.valid()) { - return; - } - - function runTest() { - - // Each of these can by async - ProcessingQueue.addImmediate([function () { - test.before(); - }, test.hooks("before"), function () { - test.preserveTestEnvironment(); - }, test.hooks("beforeEach"), function () { - test.run(); - }, test.hooks("afterEach").reverse(), test.hooks("after").reverse(), function () { - test.after(); - }, function () { - test.finish(); - }]); - } - - var previousFailCount = config.storage && +config.storage.getItem("qunit-test-" + this.module.name + "-" + this.testName); - - // Prioritize previously failed tests, detected from storage - var prioritize = config.reorder && !!previousFailCount; - - this.previousFailure = !!previousFailCount; - - ProcessingQueue.add(runTest, prioritize, config.seed); - - // If the queue has already finished, we manually process the new test - if (ProcessingQueue.finished) { - ProcessingQueue.advance(); - } - }, - - - pushResult: function pushResult(resultInfo) { - if (this !== config.current) { - throw new Error("Assertion occurred after test had finished."); - } - - // Destructure of resultInfo = { result, actual, expected, message, negative } - var source, - details = { - module: this.module.name, - name: this.testName, - result: resultInfo.result, - message: resultInfo.message, - actual: resultInfo.actual, - testId: this.testId, - negative: resultInfo.negative || false, - runtime: now() - this.started, - todo: !!this.todo - }; - - if (hasOwn.call(resultInfo, "expected")) { - details.expected = resultInfo.expected; - } - - if (!resultInfo.result) { - source = resultInfo.source || sourceFromStacktrace(); - - if (source) { - details.source = source; - } - } - - this.logAssertion(details); - - this.assertions.push({ - result: !!resultInfo.result, - message: resultInfo.message - }); - }, - - pushFailure: function pushFailure(message, source, actual) { - if (!(this instanceof Test)) { - throw new Error("pushFailure() assertion outside test context, was " + sourceFromStacktrace(2)); - } - - this.pushResult({ - result: false, - message: message || "error", - actual: actual || null, - source: source - }); - }, - - /** - * Log assertion details using both the old QUnit.log interface and - * QUnit.on( "assertion" ) interface. - * - * @private - */ - logAssertion: function logAssertion(details) { - runLoggingCallbacks("log", details); - - var assertion = { - passed: details.result, - actual: details.actual, - expected: details.expected, - message: details.message, - stack: details.source, - todo: details.todo - }; - this.testReport.pushAssertion(assertion); - emit("assertion", assertion); - }, - - - resolvePromise: function resolvePromise(promise, phase) { - var then, - resume, - message, - test = this; - if (promise != null) { - then = promise.then; - if (objectType(then) === "function") { - resume = internalStop(test); - if (config.notrycatch) { - then.call(promise, function () { - resume(); - }); - } else { - then.call(promise, function () { - resume(); - }, function (error) { - message = "Promise rejected " + (!phase ? "during" : phase.replace(/Each$/, "")) + " \"" + test.testName + "\": " + (error && error.message || error); - test.pushFailure(message, extractStacktrace(error, 0)); - - // Else next test will carry the responsibility - saveGlobal(); - - // Unblock - resume(); - }); - } - } - } - }, - - valid: function valid() { - var filter = config.filter, - regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec(filter), - module = config.module && config.module.toLowerCase(), - fullName = this.module.name + ": " + this.testName; - - function moduleChainNameMatch(testModule) { - var testModuleName = testModule.name ? testModule.name.toLowerCase() : null; - if (testModuleName === module) { - return true; - } else if (testModule.parentModule) { - return moduleChainNameMatch(testModule.parentModule); - } else { - return false; - } - } - - function moduleChainIdMatch(testModule) { - return inArray(testModule.moduleId, config.moduleId) || testModule.parentModule && moduleChainIdMatch(testModule.parentModule); - } - - // Internally-generated tests are always valid - if (this.callback && this.callback.validTest) { - return true; - } - - if (config.moduleId && config.moduleId.length > 0 && !moduleChainIdMatch(this.module)) { - - return false; - } - - if (config.testId && config.testId.length > 0 && !inArray(this.testId, config.testId)) { - - return false; - } - - if (module && !moduleChainNameMatch(this.module)) { - return false; - } - - if (!filter) { - return true; - } - - return regexFilter ? this.regexFilter(!!regexFilter[1], regexFilter[2], regexFilter[3], fullName) : this.stringFilter(filter, fullName); - }, - - regexFilter: function regexFilter(exclude, pattern, flags, fullName) { - var regex = new RegExp(pattern, flags); - var match = regex.test(fullName); - - return match !== exclude; - }, - - stringFilter: function stringFilter(filter, fullName) { - filter = filter.toLowerCase(); - fullName = fullName.toLowerCase(); - - var include = filter.charAt(0) !== "!"; - if (!include) { - filter = filter.slice(1); - } - - // If the filter matches, we need to honour include - if (fullName.indexOf(filter) !== -1) { - return include; - } - - // Otherwise, do the opposite - return !include; - } + before: function before() { + var i, + startModule, + module = this.module, + notStartedModules = getNotStartedModules(module); + + for (i = notStartedModules.length - 1; i >= 0; i--) { + startModule = notStartedModules[i]; + startModule.stats = {all: 0, bad: 0, started: now()}; + emit("suiteStart", startModule.suiteReport.start(true)); + runLoggingCallbacks("moduleStart", { + name: startModule.name, + tests: startModule.tests + }); + } + + config.current = this; + + this.testEnvironment = extend({}, module.testEnvironment); + + this.started = now(); + emit("testStart", this.testReport.start(true)); + runLoggingCallbacks("testStart", { + name: this.testName, + module: module.name, + testId: this.testId, + previousFailure: this.previousFailure + }); + + if (!config.pollution) { + saveGlobal(); + } + }, + + run: function run() { + var promise; + + config.current = this; + + this.callbackStarted = now(); + + if (config.notrycatch) { + runTest(this); + return; + } + + try { + runTest(this); + } catch (e) { + this.pushFailure("Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + (e.message || e), extractStacktrace(e, 0)); + + // Else next test will carry the responsibility + saveGlobal(); + + // Restart the tests if they're blocking + if (config.blocking) { + internalRecover(this); + } + } + + function runTest(test) { + promise = test.callback.call(test.testEnvironment, test.assert); + test.resolvePromise(promise); + + // If the test has a "lock" on it, but the timeout is 0, then we push a + // failure as the test should be synchronous. + if (test.timeout === 0 && test.semaphore !== 0) { + pushFailure("Test did not finish synchronously even though assert.timeout( 0 ) was used.", sourceFromStacktrace(2)); + } + } + }, + + after: function after() { + checkPollution(); + }, + + queueHook: function queueHook(hook, hookName, hookOwner) { + var _this = this; + + var callHook = function callHook() { + var promise = hook.call(_this.testEnvironment, _this.assert); + _this.resolvePromise(promise, hookName); + }; + + var runHook = function runHook() { + if (hookName === "before") { + if (hookOwner.unskippedTestsRun !== 0) { + return; + } + + _this.preserveEnvironment = true; + } + + if (hookName === "after" && hookOwner.unskippedTestsRun !== numberOfUnskippedTests(hookOwner) - 1 && config.queue.length > 2) { + return; + } + + config.current = _this; + if (config.notrycatch) { + callHook(); + return; + } + try { + callHook(); + } catch (error) { + _this.pushFailure(hookName + " failed on " + _this.testName + ": " + (error.message || error), extractStacktrace(error, 0)); + } + }; + + return runHook; + }, + + + // Currently only used for module level hooks, can be used to add global level ones + hooks: function hooks(handler) { + var hooks = []; + + function processHooks(test, module) { + if (module.parentModule) { + processHooks(test, module.parentModule); + } + + if (module.hooks[handler].length) { + for (var i = 0; i < module.hooks[handler].length; i++) { + hooks.push(test.queueHook(module.hooks[handler][i], handler, module)); + } + } + } + + // Hooks are ignored on skipped tests + if (!this.skip) { + processHooks(this, this.module); + } + + return hooks; + }, + + + finish: function finish() { + config.current = this; + if (config.requireExpects && this.expected === null) { + this.pushFailure("Expected number of assertions to be defined, but expect() was " + "not called.", this.stack); + } else if (this.expected !== null && this.expected !== this.assertions.length) { + this.pushFailure("Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack); + } else if (this.expected === null && !this.assertions.length) { + this.pushFailure("Expected at least one assertion, but none were run - call " + "expect(0) to accept zero assertions.", this.stack); + } + + var i, + module = this.module, + moduleName = module.name, + testName = this.testName, + skipped = !!this.skip, + todo = !!this.todo, + bad = 0, + storage = config.storage; + + this.runtime = now() - this.started; + + config.stats.all += this.assertions.length; + module.stats.all += this.assertions.length; + + for (i = 0; i < this.assertions.length; i++) { + if (!this.assertions[i].result) { + bad++; + config.stats.bad++; + module.stats.bad++; + } + } + + notifyTestsRan(module, skipped); + + // Store result when possible + if (storage) { + if (bad) { + storage.setItem("qunit-test-" + moduleName + "-" + testName, bad); + } else { + storage.removeItem("qunit-test-" + moduleName + "-" + testName); + } + } + + // After emitting the js-reporters event we cleanup the assertion data to + // avoid leaking it. It is not used by the legacy testDone callbacks. + emit("testEnd", this.testReport.end(true)); + this.testReport.slimAssertions(); + + runLoggingCallbacks("testDone", { + name: testName, + module: moduleName, + skipped: skipped, + todo: todo, + failed: bad, + passed: this.assertions.length - bad, + total: this.assertions.length, + runtime: skipped ? 0 : this.runtime, + + // HTML Reporter use + assertions: this.assertions, + testId: this.testId, + + // Source of Test + source: this.stack + }); + + if (module.testsRun === numberOfTests(module)) { + logSuiteEnd(module); + + // Check if the parent modules, iteratively, are done. If that the case, + // we emit the `suiteEnd` event and trigger `moduleDone` callback. + var parent = module.parentModule; + while (parent && parent.testsRun === numberOfTests(parent)) { + logSuiteEnd(parent); + parent = parent.parentModule; + } + } + + config.current = undefined; + + function logSuiteEnd(module) { + emit("suiteEnd", module.suiteReport.end(true)); + runLoggingCallbacks("moduleDone", { + name: module.name, + tests: module.tests, + failed: module.stats.bad, + passed: module.stats.all - module.stats.bad, + total: module.stats.all, + runtime: now() - module.stats.started + }); + } + }, + + preserveTestEnvironment: function preserveTestEnvironment() { + if (this.preserveEnvironment) { + this.module.testEnvironment = this.testEnvironment; + this.testEnvironment = extend({}, this.module.testEnvironment); + } + }, + + queue: function queue() { + var test = this; + + if (!this.valid()) { + return; + } + + function runTest() { + + // Each of these can by async + ProcessingQueue.addImmediate([function () { + test.before(); + }, test.hooks("before"), function () { + test.preserveTestEnvironment(); + }, test.hooks("beforeEach"), function () { + test.run(); + }, test.hooks("afterEach").reverse(), test.hooks("after").reverse(), function () { + test.after(); + }, function () { + test.finish(); + }]); + } + + var previousFailCount = config.storage && +config.storage.getItem("qunit-test-" + this.module.name + "-" + this.testName); + + // Prioritize previously failed tests, detected from storage + var prioritize = config.reorder && !!previousFailCount; + + this.previousFailure = !!previousFailCount; + + ProcessingQueue.add(runTest, prioritize, config.seed); + + // If the queue has already finished, we manually process the new test + if (ProcessingQueue.finished) { + ProcessingQueue.advance(); + } + }, + + + pushResult: function pushResult(resultInfo) { + if (this !== config.current) { + throw new Error("Assertion occurred after test had finished."); + } + + // Destructure of resultInfo = { result, actual, expected, message, negative } + var source, + details = { + module: this.module.name, + name: this.testName, + result: resultInfo.result, + message: resultInfo.message, + actual: resultInfo.actual, + testId: this.testId, + negative: resultInfo.negative || false, + runtime: now() - this.started, + todo: !!this.todo + }; + + if (hasOwn.call(resultInfo, "expected")) { + details.expected = resultInfo.expected; + } + + if (!resultInfo.result) { + source = resultInfo.source || sourceFromStacktrace(); + + if (source) { + details.source = source; + } + } + + this.logAssertion(details); + + this.assertions.push({ + result: !!resultInfo.result, + message: resultInfo.message + }); + }, + + pushFailure: function pushFailure(message, source, actual) { + if (!(this instanceof Test)) { + throw new Error("pushFailure() assertion outside test context, was " + sourceFromStacktrace(2)); + } + + this.pushResult({ + result: false, + message: message || "error", + actual: actual || null, + source: source + }); + }, + + /** + * Log assertion details using both the old QUnit.log interface and + * QUnit.on( "assertion" ) interface. + * + * @private + */ + logAssertion: function logAssertion(details) { + runLoggingCallbacks("log", details); + + var assertion = { + passed: details.result, + actual: details.actual, + expected: details.expected, + message: details.message, + stack: details.source, + todo: details.todo + }; + this.testReport.pushAssertion(assertion); + emit("assertion", assertion); + }, + + + resolvePromise: function resolvePromise(promise, phase) { + var then, + resume, + message, + test = this; + if (promise != null) { + then = promise.then; + if (objectType(then) === "function") { + resume = internalStop(test); + if (config.notrycatch) { + then.call(promise, function () { + resume(); + }); + } else { + then.call(promise, function () { + resume(); + }, function (error) { + message = "Promise rejected " + (!phase ? "during" : phase.replace(/Each$/, "")) + " \"" + test.testName + "\": " + (error && error.message || error); + test.pushFailure(message, extractStacktrace(error, 0)); + + // Else next test will carry the responsibility + saveGlobal(); + + // Unblock + resume(); + }); + } + } + } + }, + + valid: function valid() { + var filter = config.filter, + regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec(filter), + module = config.module && config.module.toLowerCase(), + fullName = this.module.name + ": " + this.testName; + + function moduleChainNameMatch(testModule) { + var testModuleName = testModule.name ? testModule.name.toLowerCase() : null; + if (testModuleName === module) { + return true; + } else if (testModule.parentModule) { + return moduleChainNameMatch(testModule.parentModule); + } else { + return false; + } + } + + function moduleChainIdMatch(testModule) { + return inArray(testModule.moduleId, config.moduleId) || testModule.parentModule && moduleChainIdMatch(testModule.parentModule); + } + + // Internally-generated tests are always valid + if (this.callback && this.callback.validTest) { + return true; + } + + if (config.moduleId && config.moduleId.length > 0 && !moduleChainIdMatch(this.module)) { + + return false; + } + + if (config.testId && config.testId.length > 0 && !inArray(this.testId, config.testId)) { + + return false; + } + + if (module && !moduleChainNameMatch(this.module)) { + return false; + } + + if (!filter) { + return true; + } + + return regexFilter ? this.regexFilter(!!regexFilter[1], regexFilter[2], regexFilter[3], fullName) : this.stringFilter(filter, fullName); + }, + + regexFilter: function regexFilter(exclude, pattern, flags, fullName) { + var regex = new RegExp(pattern, flags); + var match = regex.test(fullName); + + return match !== exclude; + }, + + stringFilter: function stringFilter(filter, fullName) { + filter = filter.toLowerCase(); + fullName = fullName.toLowerCase(); + + var include = filter.charAt(0) !== "!"; + if (!include) { + filter = filter.slice(1); + } + + // If the filter matches, we need to honour include + if (fullName.indexOf(filter) !== -1) { + return include; + } + + // Otherwise, do the opposite + return !include; + } }; function pushFailure() { - if (!config.current) { - throw new Error("pushFailure() assertion outside test context, in " + sourceFromStacktrace(2)); - } + if (!config.current) { + throw new Error("pushFailure() assertion outside test context, in " + sourceFromStacktrace(2)); + } - // Gets current test obj - var currentTest = config.current; + // Gets current test obj + var currentTest = config.current; - return currentTest.pushFailure.apply(currentTest, arguments); + return currentTest.pushFailure.apply(currentTest, arguments); } function saveGlobal() { - config.pollution = []; - - if (config.noglobals) { - for (var key in global$1) { - if (hasOwn.call(global$1, key)) { - - // In Opera sometimes DOM element ids show up here, ignore them - if (/^qunit-test-output/.test(key)) { - continue; - } - config.pollution.push(key); - } - } - } + config.pollution = []; + + if (config.noglobals) { + for (var key in global$1) { + if (hasOwn.call(global$1, key)) { + + // In Opera sometimes DOM element ids show up here, ignore them + if (/^qunit-test-output/.test(key)) { + continue; + } + config.pollution.push(key); + } + } + } } function checkPollution() { - var newGlobals, - deletedGlobals, - old = config.pollution; + var newGlobals, + deletedGlobals, + old = config.pollution; - saveGlobal(); + saveGlobal(); - newGlobals = diff(config.pollution, old); - if (newGlobals.length > 0) { - pushFailure("Introduced global variable(s): " + newGlobals.join(", ")); - } + newGlobals = diff(config.pollution, old); + if (newGlobals.length > 0) { + pushFailure("Introduced global variable(s): " + newGlobals.join(", ")); + } - deletedGlobals = diff(old, config.pollution); - if (deletedGlobals.length > 0) { - pushFailure("Deleted global variable(s): " + deletedGlobals.join(", ")); - } + deletedGlobals = diff(old, config.pollution); + if (deletedGlobals.length > 0) { + pushFailure("Deleted global variable(s): " + deletedGlobals.join(", ")); + } } // Will be exposed as QUnit.test function test(testName, callback) { - if (focused$1) { - return; - } + if (focused$1) { + return; + } - var newTest = new Test({ - testName: testName, - callback: callback - }); + var newTest = new Test({ + testName: testName, + callback: callback + }); - newTest.queue(); + newTest.queue(); } function todo(testName, callback) { - if (focused$1) { - return; - } + if (focused$1) { + return; + } - var newTest = new Test({ - testName: testName, - callback: callback, - todo: true - }); + var newTest = new Test({ + testName: testName, + callback: callback, + todo: true + }); - newTest.queue(); + newTest.queue(); } // Will be exposed as QUnit.skip function skip(testName) { - if (focused$1) { - return; - } + if (focused$1) { + return; + } - var test = new Test({ - testName: testName, - skip: true - }); + var test = new Test({ + testName: testName, + skip: true + }); - test.queue(); + test.queue(); } // Will be exposed as QUnit.only function only(testName, callback) { - if (focused$1) { - return; - } + if (focused$1) { + return; + } - config.queue.length = 0; - focused$1 = true; + config.queue.length = 0; + focused$1 = true; - var newTest = new Test({ - testName: testName, - callback: callback - }); + var newTest = new Test({ + testName: testName, + callback: callback + }); - newTest.queue(); + newTest.queue(); } // Put a hold on processing and return a function that will release it. function internalStop(test) { - test.semaphore += 1; - config.blocking = true; - - // Set a recovery timeout, if so configured. - if (defined.setTimeout) { - var timeoutDuration = void 0; - - if (typeof test.timeout === "number") { - timeoutDuration = test.timeout; - } else if (typeof config.testTimeout === "number") { - timeoutDuration = config.testTimeout; - } - - if (typeof timeoutDuration === "number" && timeoutDuration > 0) { - clearTimeout(config.timeout); - config.timeout = setTimeout(function () { - pushFailure("Test took longer than " + timeoutDuration + "ms; test timed out.", sourceFromStacktrace(2)); - internalRecover(test); - }, timeoutDuration); - } - } - - var released = false; - return function resume() { - if (released) { - return; - } - - released = true; - test.semaphore -= 1; - internalStart(test); - }; + test.semaphore += 1; + config.blocking = true; + + // Set a recovery timeout, if so configured. + if (defined.setTimeout) { + var timeoutDuration = void 0; + + if (typeof test.timeout === "number") { + timeoutDuration = test.timeout; + } else if (typeof config.testTimeout === "number") { + timeoutDuration = config.testTimeout; + } + + if (typeof timeoutDuration === "number" && timeoutDuration > 0) { + clearTimeout(config.timeout); + config.timeout = setTimeout(function () { + pushFailure("Test took longer than " + timeoutDuration + "ms; test timed out.", sourceFromStacktrace(2)); + internalRecover(test); + }, timeoutDuration); + } + } + + var released = false; + return function resume() { + if (released) { + return; + } + + released = true; + test.semaphore -= 1; + internalStart(test); + }; } // Forcefully release all processing holds. function internalRecover(test) { - test.semaphore = 0; - internalStart(test); + test.semaphore = 0; + internalStart(test); } // Release a processing hold, scheduling a resumption attempt if no holds remain. function internalStart(test) { - // If semaphore is non-numeric, throw error - if (isNaN(test.semaphore)) { - test.semaphore = 0; - - pushFailure("Invalid value on test.semaphore", sourceFromStacktrace(2)); - return; - } - - // Don't start until equal number of stop-calls - if (test.semaphore > 0) { - return; - } - - // Throw an Error if start is called more often than stop - if (test.semaphore < 0) { - test.semaphore = 0; - - pushFailure("Tried to restart test while already started (test's semaphore was 0 already)", sourceFromStacktrace(2)); - return; - } - - // Add a slight delay to allow more assertions etc. - if (defined.setTimeout) { - if (config.timeout) { - clearTimeout(config.timeout); - } - config.timeout = setTimeout(function () { - if (test.semaphore > 0) { - return; - } - - if (config.timeout) { - clearTimeout(config.timeout); - } - - begin(); - }); - } else { - begin(); - } + // If semaphore is non-numeric, throw error + if (isNaN(test.semaphore)) { + test.semaphore = 0; + + pushFailure("Invalid value on test.semaphore", sourceFromStacktrace(2)); + return; + } + + // Don't start until equal number of stop-calls + if (test.semaphore > 0) { + return; + } + + // Throw an Error if start is called more often than stop + if (test.semaphore < 0) { + test.semaphore = 0; + + pushFailure("Tried to restart test while already started (test's semaphore was 0 already)", sourceFromStacktrace(2)); + return; + } + + // Add a slight delay to allow more assertions etc. + if (defined.setTimeout) { + if (config.timeout) { + clearTimeout(config.timeout); + } + config.timeout = setTimeout(function () { + if (test.semaphore > 0) { + return; + } + + if (config.timeout) { + clearTimeout(config.timeout); + } + + begin(); + }); + } else { + begin(); + } } function collectTests(module) { - var tests = [].concat(module.tests); - var modules = [].concat(toConsumableArray(module.childModules)); - - // Do a breadth-first traversal of the child modules - while (modules.length) { - var nextModule = modules.shift(); - tests.push.apply(tests, nextModule.tests); - modules.push.apply(modules, toConsumableArray(nextModule.childModules)); - } + var tests = [].concat(module.tests); + var modules = [].concat(toConsumableArray(module.childModules)); + + // Do a breadth-first traversal of the child modules + while (modules.length) { + var nextModule = modules.shift(); + tests.push.apply(tests, nextModule.tests); + modules.push.apply(modules, toConsumableArray(nextModule.childModules)); + } - return tests; + return tests; } function numberOfTests(module) { - return collectTests(module).length; + return collectTests(module).length; } function numberOfUnskippedTests(module) { - return collectTests(module).filter(function (test) { - return !test.skip; - }).length; + return collectTests(module).filter(function (test) { + return !test.skip; + }).length; } function notifyTestsRan(module, skipped) { - module.testsRun++; - if (!skipped) { - module.unskippedTestsRun++; - } - while (module = module.parentModule) { - module.testsRun++; - if (!skipped) { - module.unskippedTestsRun++; - } - } + module.testsRun++; + if (!skipped) { + module.unskippedTestsRun++; + } + while (module = module.parentModule) { + module.testsRun++; + if (!skipped) { + module.unskippedTestsRun++; + } + } } /** @@ -2105,431 +2061,431 @@ * console if the developer tools are not open. */ function consoleProxy(method) { - return function () { - if (console) { - console[method].apply(console, arguments); - } - }; + return function () { + if (console) { + console[method].apply(console, arguments); + } + }; } var Logger = { - warn: consoleProxy("warn") + warn: consoleProxy("warn") }; var Assert = function () { - function Assert(testContext) { - classCallCheck(this, Assert); - - this.test = testContext; - } - - // Assert helpers - - createClass(Assert, [{ - key: "timeout", - value: function timeout(duration) { - if (typeof duration !== "number") { - throw new Error("You must pass a number as the duration to assert.timeout"); - } - - this.test.timeout = duration; - } - - // Documents a "step", which is a string value, in a test as a passing assertion - - }, { - key: "step", - value: function step(message) { - var result = !!message; - - this.test.steps.push(message); - - return this.pushResult({ - result: result, - message: message || "You must provide a message to assert.step" - }); - } - - // Verifies the steps in a test match a given array of string values - - }, { - key: "verifySteps", - value: function verifySteps(steps, message) { - this.deepEqual(this.test.steps, steps, message); - this.test.steps.length = 0; - } - - // Specify the number of expected assertions to guarantee that failed test - // (no assertions are run at all) don't slip through. - - }, { - key: "expect", - value: function expect(asserts) { - if (arguments.length === 1) { - this.test.expected = asserts; - } else { - return this.test.expected; - } - } - - // Put a hold on processing and return a function that will release it a maximum of once. - - }, { - key: "async", - value: function async(count) { - var test$$1 = this.test; - - var popped = false, - acceptCallCount = count; - - if (typeof acceptCallCount === "undefined") { - acceptCallCount = 1; - } - - var resume = internalStop(test$$1); - - return function done() { - if (config.current !== test$$1) { - throw Error("assert.async callback called after test finished."); - } - - if (popped) { - test$$1.pushFailure("Too many calls to the `assert.async` callback", sourceFromStacktrace(2)); - return; - } - - acceptCallCount -= 1; - if (acceptCallCount > 0) { - return; - } - - popped = true; - resume(); - }; - } - - // Exports test.push() to the user API - // Alias of pushResult. - - }, { - key: "push", - value: function push(result, actual, expected, message, negative) { - Logger.warn("assert.push is deprecated and will be removed in QUnit 3.0." + " Please use assert.pushResult instead (https://api.qunitjs.com/assert/pushResult)."); - - var currentAssert = this instanceof Assert ? this : config.current.assert; - return currentAssert.pushResult({ - result: result, - actual: actual, - expected: expected, - message: message, - negative: negative - }); - } - }, { - key: "pushResult", - value: function pushResult(resultInfo) { - - // Destructure of resultInfo = { result, actual, expected, message, negative } - var assert = this; - var currentTest = assert instanceof Assert && assert.test || config.current; - - // Backwards compatibility fix. - // Allows the direct use of global exported assertions and QUnit.assert.* - // Although, it's use is not recommended as it can leak assertions - // to other tests from async tests, because we only get a reference to the current test, - // not exactly the test where assertion were intended to be called. - if (!currentTest) { - throw new Error("assertion outside test context, in " + sourceFromStacktrace(2)); - } - - if (!(assert instanceof Assert)) { - assert = currentTest.assert; - } - - return assert.test.pushResult(resultInfo); - } - }, { - key: "ok", - value: function ok(result, message) { - if (!message) { - message = result ? "okay" : "failed, expected argument to be truthy, was: " + dump.parse(result); - } - - this.pushResult({ - result: !!result, - actual: result, - expected: true, - message: message - }); - } - }, { - key: "notOk", - value: function notOk(result, message) { - if (!message) { - message = !result ? "okay" : "failed, expected argument to be falsy, was: " + dump.parse(result); - } - - this.pushResult({ - result: !result, - actual: result, - expected: false, - message: message - }); - } - }, { - key: "equal", - value: function equal(actual, expected, message) { - - // eslint-disable-next-line eqeqeq - var result = expected == actual; - - this.pushResult({ - result: result, - actual: actual, - expected: expected, - message: message - }); - } - }, { - key: "notEqual", - value: function notEqual(actual, expected, message) { - - // eslint-disable-next-line eqeqeq - var result = expected != actual; - - this.pushResult({ - result: result, - actual: actual, - expected: expected, - message: message, - negative: true - }); - } - }, { - key: "propEqual", - value: function propEqual(actual, expected, message) { - actual = objectValues(actual); - expected = objectValues(expected); - - this.pushResult({ - result: equiv(actual, expected), - actual: actual, - expected: expected, - message: message - }); - } - }, { - key: "notPropEqual", - value: function notPropEqual(actual, expected, message) { - actual = objectValues(actual); - expected = objectValues(expected); - - this.pushResult({ - result: !equiv(actual, expected), - actual: actual, - expected: expected, - message: message, - negative: true - }); - } - }, { - key: "deepEqual", - value: function deepEqual(actual, expected, message) { - this.pushResult({ - result: equiv(actual, expected), - actual: actual, - expected: expected, - message: message - }); - } - }, { - key: "notDeepEqual", - value: function notDeepEqual(actual, expected, message) { - this.pushResult({ - result: !equiv(actual, expected), - actual: actual, - expected: expected, - message: message, - negative: true - }); - } - }, { - key: "strictEqual", - value: function strictEqual(actual, expected, message) { - this.pushResult({ - result: expected === actual, - actual: actual, - expected: expected, - message: message - }); - } - }, { - key: "notStrictEqual", - value: function notStrictEqual(actual, expected, message) { - this.pushResult({ - result: expected !== actual, - actual: actual, - expected: expected, - message: message, - negative: true - }); - } - }, { - key: "throws", - value: function throws(block, expected, message) { - var actual = void 0, - result = false; - - var currentTest = this instanceof Assert && this.test || config.current; - - // 'expected' is optional unless doing string comparison - if (objectType(expected) === "string") { - if (message == null) { - message = expected; - expected = null; - } else { - throw new Error("throws/raises does not accept a string value for the expected argument.\n" + "Use a non-string object value (e.g. regExp) instead if it's necessary."); - } - } - - currentTest.ignoreGlobalErrors = true; - try { - block.call(currentTest.testEnvironment); - } catch (e) { - actual = e; - } - currentTest.ignoreGlobalErrors = false; - - if (actual) { - var expectedType = objectType(expected); - - // We don't want to validate thrown error - if (!expected) { - result = true; - expected = null; - - // Expected is a regexp - } else if (expectedType === "regexp") { - result = expected.test(errorString(actual)); - - // Expected is a constructor, maybe an Error constructor - } else if (expectedType === "function" && actual instanceof expected) { - result = true; - - // Expected is an Error object - } else if (expectedType === "object") { - result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message; - - // Expected is a validation function which returns true if validation passed - } else if (expectedType === "function" && expected.call({}, actual) === true) { - expected = null; - result = true; - } - } - - currentTest.assert.pushResult({ - result: result, - actual: actual, - expected: expected, - message: message - }); - } - }, { - key: "rejects", - value: function rejects(promise, expected, message) { - var result = false; - - var currentTest = this instanceof Assert && this.test || config.current; - - // 'expected' is optional unless doing string comparison - if (objectType(expected) === "string") { - if (message === undefined) { - message = expected; - expected = undefined; - } else { - message = "assert.rejects does not accept a string value for the expected " + "argument.\nUse a non-string object value (e.g. validator function) instead " + "if necessary."; - - currentTest.assert.pushResult({ - result: false, - message: message - }); - - return; - } - } - - var then = promise && promise.then; - if (objectType(then) !== "function") { - var _message = "The value provided to `assert.rejects` in " + "\"" + currentTest.testName + "\" was not a promise."; - - currentTest.assert.pushResult({ - result: false, - message: _message, - actual: promise - }); - - return; - } - - var done = this.async(); - - return then.call(promise, function handleFulfillment() { - var message = "The promise returned by the `assert.rejects` callback in " + "\"" + currentTest.testName + "\" did not reject."; - - currentTest.assert.pushResult({ - result: false, - message: message, - actual: promise - }); - - done(); - }, function handleRejection(actual) { - if (actual) { - var expectedType = objectType(expected); - - // We don't want to validate - if (expected === undefined) { - result = true; - expected = null; - - // Expected is a regexp - } else if (expectedType === "regexp") { - result = expected.test(errorString(actual)); - - // Expected is a constructor, maybe an Error constructor - } else if (expectedType === "function" && actual instanceof expected) { - result = true; - - // Expected is an Error object - } else if (expectedType === "object") { - result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message; - - // Expected is a validation function which returns true if validation passed - } else { - if (expectedType === "function") { - result = expected.call({}, actual) === true; - expected = null; - - // Expected is some other invalid type - } else { - result = false; - message = "invalid expected value provided to `assert.rejects` " + "callback in \"" + currentTest.testName + "\": " + expectedType + "."; - } - } - } - - currentTest.assert.pushResult({ - result: result, - actual: actual, - expected: expected, - message: message - }); - - done(); - }); - } - }]); - return Assert; + function Assert(testContext) { + classCallCheck(this, Assert); + + this.test = testContext; + } + + // Assert helpers + + createClass(Assert, [{ + key: "timeout", + value: function timeout(duration) { + if (typeof duration !== "number") { + throw new Error("You must pass a number as the duration to assert.timeout"); + } + + this.test.timeout = duration; + } + + // Documents a "step", which is a string value, in a test as a passing assertion + + }, { + key: "step", + value: function step(message) { + var result = !!message; + + this.test.steps.push(message); + + return this.pushResult({ + result: result, + message: message || "You must provide a message to assert.step" + }); + } + + // Verifies the steps in a test match a given array of string values + + }, { + key: "verifySteps", + value: function verifySteps(steps, message) { + this.deepEqual(this.test.steps, steps, message); + this.test.steps.length = 0; + } + + // Specify the number of expected assertions to guarantee that failed test + // (no assertions are run at all) don't slip through. + + }, { + key: "expect", + value: function expect(asserts) { + if (arguments.length === 1) { + this.test.expected = asserts; + } else { + return this.test.expected; + } + } + + // Put a hold on processing and return a function that will release it a maximum of once. + + }, { + key: "async", + value: function async(count) { + var test$$1 = this.test; + + var popped = false, + acceptCallCount = count; + + if (typeof acceptCallCount === "undefined") { + acceptCallCount = 1; + } + + var resume = internalStop(test$$1); + + return function done() { + if (config.current !== test$$1) { + throw Error("assert.async callback called after test finished."); + } + + if (popped) { + test$$1.pushFailure("Too many calls to the `assert.async` callback", sourceFromStacktrace(2)); + return; + } + + acceptCallCount -= 1; + if (acceptCallCount > 0) { + return; + } + + popped = true; + resume(); + }; + } + + // Exports test.push() to the user API + // Alias of pushResult. + + }, { + key: "push", + value: function push(result, actual, expected, message, negative) { + Logger.warn("assert.push is deprecated and will be removed in QUnit 3.0." + " Please use assert.pushResult instead (https://api.qunitjs.com/assert/pushResult)."); + + var currentAssert = this instanceof Assert ? this : config.current.assert; + return currentAssert.pushResult({ + result: result, + actual: actual, + expected: expected, + message: message, + negative: negative + }); + } + }, { + key: "pushResult", + value: function pushResult(resultInfo) { + + // Destructure of resultInfo = { result, actual, expected, message, negative } + var assert = this; + var currentTest = assert instanceof Assert && assert.test || config.current; + + // Backwards compatibility fix. + // Allows the direct use of global exported assertions and QUnit.assert.* + // Although, it's use is not recommended as it can leak assertions + // to other tests from async tests, because we only get a reference to the current test, + // not exactly the test where assertion were intended to be called. + if (!currentTest) { + throw new Error("assertion outside test context, in " + sourceFromStacktrace(2)); + } + + if (!(assert instanceof Assert)) { + assert = currentTest.assert; + } + + return assert.test.pushResult(resultInfo); + } + }, { + key: "ok", + value: function ok(result, message) { + if (!message) { + message = result ? "okay" : "failed, expected argument to be truthy, was: " + dump.parse(result); + } + + this.pushResult({ + result: !!result, + actual: result, + expected: true, + message: message + }); + } + }, { + key: "notOk", + value: function notOk(result, message) { + if (!message) { + message = !result ? "okay" : "failed, expected argument to be falsy, was: " + dump.parse(result); + } + + this.pushResult({ + result: !result, + actual: result, + expected: false, + message: message + }); + } + }, { + key: "equal", + value: function equal(actual, expected, message) { + + // eslint-disable-next-line eqeqeq + var result = expected == actual; + + this.pushResult({ + result: result, + actual: actual, + expected: expected, + message: message + }); + } + }, { + key: "notEqual", + value: function notEqual(actual, expected, message) { + + // eslint-disable-next-line eqeqeq + var result = expected != actual; + + this.pushResult({ + result: result, + actual: actual, + expected: expected, + message: message, + negative: true + }); + } + }, { + key: "propEqual", + value: function propEqual(actual, expected, message) { + actual = objectValues(actual); + expected = objectValues(expected); + + this.pushResult({ + result: equiv(actual, expected), + actual: actual, + expected: expected, + message: message + }); + } + }, { + key: "notPropEqual", + value: function notPropEqual(actual, expected, message) { + actual = objectValues(actual); + expected = objectValues(expected); + + this.pushResult({ + result: !equiv(actual, expected), + actual: actual, + expected: expected, + message: message, + negative: true + }); + } + }, { + key: "deepEqual", + value: function deepEqual(actual, expected, message) { + this.pushResult({ + result: equiv(actual, expected), + actual: actual, + expected: expected, + message: message + }); + } + }, { + key: "notDeepEqual", + value: function notDeepEqual(actual, expected, message) { + this.pushResult({ + result: !equiv(actual, expected), + actual: actual, + expected: expected, + message: message, + negative: true + }); + } + }, { + key: "strictEqual", + value: function strictEqual(actual, expected, message) { + this.pushResult({ + result: expected === actual, + actual: actual, + expected: expected, + message: message + }); + } + }, { + key: "notStrictEqual", + value: function notStrictEqual(actual, expected, message) { + this.pushResult({ + result: expected !== actual, + actual: actual, + expected: expected, + message: message, + negative: true + }); + } + }, { + key: "throws", + value: function throws(block, expected, message) { + var actual = void 0, + result = false; + + var currentTest = this instanceof Assert && this.test || config.current; + + // 'expected' is optional unless doing string comparison + if (objectType(expected) === "string") { + if (message == null) { + message = expected; + expected = null; + } else { + throw new Error("throws/raises does not accept a string value for the expected argument.\n" + "Use a non-string object value (e.g. regExp) instead if it's necessary."); + } + } + + currentTest.ignoreGlobalErrors = true; + try { + block.call(currentTest.testEnvironment); + } catch (e) { + actual = e; + } + currentTest.ignoreGlobalErrors = false; + + if (actual) { + var expectedType = objectType(expected); + + // We don't want to validate thrown error + if (!expected) { + result = true; + expected = null; + + // Expected is a regexp + } else if (expectedType === "regexp") { + result = expected.test(errorString(actual)); + + // Expected is a constructor, maybe an Error constructor + } else if (expectedType === "function" && actual instanceof expected) { + result = true; + + // Expected is an Error object + } else if (expectedType === "object") { + result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message; + + // Expected is a validation function which returns true if validation passed + } else if (expectedType === "function" && expected.call({}, actual) === true) { + expected = null; + result = true; + } + } + + currentTest.assert.pushResult({ + result: result, + actual: actual, + expected: expected, + message: message + }); + } + }, { + key: "rejects", + value: function rejects(promise, expected, message) { + var result = false; + + var currentTest = this instanceof Assert && this.test || config.current; + + // 'expected' is optional unless doing string comparison + if (objectType(expected) === "string") { + if (message === undefined) { + message = expected; + expected = undefined; + } else { + message = "assert.rejects does not accept a string value for the expected " + "argument.\nUse a non-string object value (e.g. validator function) instead " + "if necessary."; + + currentTest.assert.pushResult({ + result: false, + message: message + }); + + return; + } + } + + var then = promise && promise.then; + if (objectType(then) !== "function") { + var _message = "The value provided to `assert.rejects` in " + "\"" + currentTest.testName + "\" was not a promise."; + + currentTest.assert.pushResult({ + result: false, + message: _message, + actual: promise + }); + + return; + } + + var done = this.async(); + + return then.call(promise, function handleFulfillment() { + var message = "The promise returned by the `assert.rejects` callback in " + "\"" + currentTest.testName + "\" did not reject."; + + currentTest.assert.pushResult({ + result: false, + message: message, + actual: promise + }); + + done(); + }, function handleRejection(actual) { + if (actual) { + var expectedType = objectType(expected); + + // We don't want to validate + if (expected === undefined) { + result = true; + expected = null; + + // Expected is a regexp + } else if (expectedType === "regexp") { + result = expected.test(errorString(actual)); + + // Expected is a constructor, maybe an Error constructor + } else if (expectedType === "function" && actual instanceof expected) { + result = true; + + // Expected is an Error object + } else if (expectedType === "object") { + result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message; + + // Expected is a validation function which returns true if validation passed + } else { + if (expectedType === "function") { + result = expected.call({}, actual) === true; + expected = null; + + // Expected is some other invalid type + } else { + result = false; + message = "invalid expected value provided to `assert.rejects` " + "callback in \"" + currentTest.testName + "\": " + expectedType + "."; + } + } + } + + currentTest.assert.pushResult({ + result: result, + actual: actual, + expected: expected, + message: message + }); + + done(); + }); + } + }]); + return Assert; }(); // Provide an alternative to assert.throws(), for environments that consider throws a reserved word @@ -2546,178 +2502,184 @@ * @return {String} */ function errorString(error) { - var resultErrorString = error.toString(); - - if (resultErrorString.substring(0, 7) === "[object") { - var name = error.name ? error.name.toString() : "Error"; - var message = error.message ? error.message.toString() : ""; - - if (name && message) { - return name + ": " + message; - } else if (name) { - return name; - } else if (message) { - return message; - } else { - return "Error"; - } - } else { - return resultErrorString; - } + var resultErrorString = error.toString(); + + if (resultErrorString.substring(0, 7) === "[object") { + var name = error.name ? error.name.toString() : "Error"; + var message = error.message ? error.message.toString() : ""; + + if (name && message) { + return name + ": " + message; + } else if (name) { + return name; + } else if (message) { + return message; + } else { + return "Error"; + } + } else { + return resultErrorString; + } } /* global module, exports, define */ function exportQUnit(QUnit) { - if (defined.document) { + if (defined.document) { - // QUnit may be defined when it is preconfigured but then only QUnit and QUnit.config may be defined. - if (window.QUnit && window.QUnit.version) { - throw new Error("QUnit has already been defined."); - } + // QUnit may be defined when it is preconfigured but then only QUnit and QUnit.config may be defined. + if (window.QUnit && window.QUnit.version) { + throw new Error("QUnit has already been defined."); + } - window.QUnit = QUnit; - } + window.QUnit = QUnit; + } - // For nodejs - if (typeof module !== "undefined" && module && module.exports) { - module.exports = QUnit; + // For nodejs + if (typeof module !== "undefined" && module && module.exports) { + module.exports = QUnit; - // For consistency with CommonJS environments' exports - module.exports.QUnit = QUnit; - } + // For consistency with CommonJS environments' exports + module.exports.QUnit = QUnit; + } - // For CommonJS with exports, but without module.exports, like Rhino - if (typeof exports !== "undefined" && exports) { - exports.QUnit = QUnit; - } + // For CommonJS with exports, but without module.exports, like Rhino + if (typeof exports !== "undefined" && exports) { + exports.QUnit = QUnit; + } - if (typeof define === "function" && define.amd) { - define(function () { - return QUnit; - }); - QUnit.config.autostart = false; - } + if (typeof define === "function" && define.amd) { + define(function () { + return QUnit; + }); + QUnit.config.autostart = false; + } - // For Web/Service Workers - if (self$1 && self$1.WorkerGlobalScope && self$1 instanceof self$1.WorkerGlobalScope) { - self$1.QUnit = QUnit; - } + // For Web/Service Workers + if (self$1 && self$1.WorkerGlobalScope && self$1 instanceof self$1.WorkerGlobalScope) { + self$1.QUnit = QUnit; + } } var SuiteReport = function () { - function SuiteReport(name, parentSuite) { - classCallCheck(this, SuiteReport); - - this.name = name; - this.fullName = parentSuite ? parentSuite.fullName.concat(name) : []; - - this.tests = []; - this.childSuites = []; - - if (parentSuite) { - parentSuite.pushChildSuite(this); - } - } - - createClass(SuiteReport, [{ - key: "start", - value: function start(recordTime) { - if (recordTime) { - this._startTime = Date.now(); - } - - return { - name: this.name, - fullName: this.fullName.slice(), - tests: this.tests.map(function (test) { - return test.start(); - }), - childSuites: this.childSuites.map(function (suite) { - return suite.start(); - }), - testCounts: { - total: this.getTestCounts().total - } - }; - } - }, { - key: "end", - value: function end(recordTime) { - if (recordTime) { - this._endTime = Date.now(); - } - - return { - name: this.name, - fullName: this.fullName.slice(), - tests: this.tests.map(function (test) { - return test.end(); - }), - childSuites: this.childSuites.map(function (suite) { - return suite.end(); - }), - testCounts: this.getTestCounts(), - runtime: this.getRuntime(), - status: this.getStatus() - }; - } - }, { - key: "pushChildSuite", - value: function pushChildSuite(suite) { - this.childSuites.push(suite); - } - }, { - key: "pushTest", - value: function pushTest(test) { - this.tests.push(test); - } - }, { - key: "getRuntime", - value: function getRuntime() { - return this._endTime - this._startTime; - } - }, { - key: "getTestCounts", - value: function getTestCounts() { - var counts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : { passed: 0, failed: 0, skipped: 0, todo: 0, total: 0 }; - - counts = this.tests.reduce(function (counts, test) { - if (test.valid) { - counts[test.getStatus()]++; - counts.total++; - } - - return counts; - }, counts); - - return this.childSuites.reduce(function (counts, suite) { - return suite.getTestCounts(counts); - }, counts); - } - }, { - key: "getStatus", - value: function getStatus() { - var _getTestCounts = this.getTestCounts(), - total = _getTestCounts.total, - failed = _getTestCounts.failed, - skipped = _getTestCounts.skipped, - todo = _getTestCounts.todo; - - if (failed) { - return "failed"; - } else { - if (skipped === total) { - return "skipped"; - } else if (todo === total) { - return "todo"; - } else { - return "passed"; - } - } - } - }]); - return SuiteReport; + function SuiteReport(name, parentSuite) { + classCallCheck(this, SuiteReport); + + this.name = name; + this.fullName = parentSuite ? parentSuite.fullName.concat(name) : []; + + this.tests = []; + this.childSuites = []; + + if (parentSuite) { + parentSuite.pushChildSuite(this); + } + } + + createClass(SuiteReport, [{ + key: "start", + value: function start(recordTime) { + if (recordTime) { + this._startTime = Date.now(); + } + + return { + name: this.name, + fullName: this.fullName.slice(), + tests: this.tests.map(function (test) { + return test.start(); + }), + childSuites: this.childSuites.map(function (suite) { + return suite.start(); + }), + testCounts: { + total: this.getTestCounts().total + } + }; + } + }, { + key: "end", + value: function end(recordTime) { + if (recordTime) { + this._endTime = Date.now(); + } + + return { + name: this.name, + fullName: this.fullName.slice(), + tests: this.tests.map(function (test) { + return test.end(); + }), + childSuites: this.childSuites.map(function (suite) { + return suite.end(); + }), + testCounts: this.getTestCounts(), + runtime: this.getRuntime(), + status: this.getStatus() + }; + } + }, { + key: "pushChildSuite", + value: function pushChildSuite(suite) { + this.childSuites.push(suite); + } + }, { + key: "pushTest", + value: function pushTest(test) { + this.tests.push(test); + } + }, { + key: "getRuntime", + value: function getRuntime() { + return this._endTime - this._startTime; + } + }, { + key: "getTestCounts", + value: function getTestCounts() { + var counts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : { + passed: 0, + failed: 0, + skipped: 0, + todo: 0, + total: 0 + }; + + counts = this.tests.reduce(function (counts, test) { + if (test.valid) { + counts[test.getStatus()]++; + counts.total++; + } + + return counts; + }, counts); + + return this.childSuites.reduce(function (counts, suite) { + return suite.getTestCounts(counts); + }, counts); + } + }, { + key: "getStatus", + value: function getStatus() { + var _getTestCounts = this.getTestCounts(), + total = _getTestCounts.total, + failed = _getTestCounts.failed, + skipped = _getTestCounts.skipped, + todo = _getTestCounts.todo; + + if (failed) { + return "failed"; + } else { + if (skipped === total) { + return "skipped"; + } else if (todo === total) { + return "todo"; + } else { + return "passed"; + } + } + } + }]); + return SuiteReport; }(); // Handle an unhandled exception. By convention, returns true if further @@ -2725,41 +2687,41 @@ // In this case, we will only suppress further error handling if the // "ignoreGlobalErrors" configuration option is enabled. function onError(error) { - for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { - args[_key - 1] = arguments[_key]; - } - - if (config.current) { - if (config.current.ignoreGlobalErrors) { - return true; - } - pushFailure.apply(undefined, [error.message, error.fileName + ":" + error.lineNumber].concat(args)); - } else { - test("global failure", extend(function () { - pushFailure.apply(undefined, [error.message, error.fileName + ":" + error.lineNumber].concat(args)); - }, { validTest: true })); - } - - return false; + for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; + } + + if (config.current) { + if (config.current.ignoreGlobalErrors) { + return true; + } + pushFailure.apply(undefined, [error.message, error.fileName + ":" + error.lineNumber].concat(args)); + } else { + test("global failure", extend(function () { + pushFailure.apply(undefined, [error.message, error.fileName + ":" + error.lineNumber].concat(args)); + }, {validTest: true})); + } + + return false; } // Handle an unhandled rejection function onUnhandledRejection(reason) { - var resultInfo = { - result: false, - message: reason.message || "error", - actual: reason, - source: reason.stack || sourceFromStacktrace(3) - }; - - var currentTest = config.current; - if (currentTest) { - currentTest.assert.pushResult(resultInfo); - } else { - test("global failure", extend(function (assert) { - assert.pushResult(resultInfo); - }, { validTest: true })); - } + var resultInfo = { + result: false, + message: reason.message || "error", + actual: reason, + source: reason.stack || sourceFromStacktrace(3) + }; + + var currentTest = config.current; + if (currentTest) { + currentTest.assert.pushResult(resultInfo); + } else { + test("global failure", extend(function (assert) { + assert.pushResult(resultInfo); + }, {validTest: true})); + } } var focused = false; @@ -2782,224 +2744,224 @@ QUnit.version = "2.5.0"; function createModule(name, testEnvironment, modifiers) { - var parentModule = moduleStack.length ? moduleStack.slice(-1)[0] : null; - var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name; - var parentSuite = parentModule ? parentModule.suiteReport : globalSuite; - - var skip$$1 = parentModule !== null && parentModule.skip || modifiers.skip; - var todo$$1 = parentModule !== null && parentModule.todo || modifiers.todo; - - var module = { - name: moduleName, - parentModule: parentModule, - tests: [], - moduleId: generateHash(moduleName), - testsRun: 0, - unskippedTestsRun: 0, - childModules: [], - suiteReport: new SuiteReport(name, parentSuite), - - // Pass along `skip` and `todo` properties from parent module, in case - // there is one, to childs. And use own otherwise. - // This property will be used to mark own tests and tests of child suites - // as either `skipped` or `todo`. - skip: skip$$1, - todo: skip$$1 ? false : todo$$1 - }; - - var env = {}; - if (parentModule) { - parentModule.childModules.push(module); - extend(env, parentModule.testEnvironment); - } - extend(env, testEnvironment); - module.testEnvironment = env; - - config.modules.push(module); - return module; + var parentModule = moduleStack.length ? moduleStack.slice(-1)[0] : null; + var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name; + var parentSuite = parentModule ? parentModule.suiteReport : globalSuite; + + var skip$$1 = parentModule !== null && parentModule.skip || modifiers.skip; + var todo$$1 = parentModule !== null && parentModule.todo || modifiers.todo; + + var module = { + name: moduleName, + parentModule: parentModule, + tests: [], + moduleId: generateHash(moduleName), + testsRun: 0, + unskippedTestsRun: 0, + childModules: [], + suiteReport: new SuiteReport(name, parentSuite), + + // Pass along `skip` and `todo` properties from parent module, in case + // there is one, to childs. And use own otherwise. + // This property will be used to mark own tests and tests of child suites + // as either `skipped` or `todo`. + skip: skip$$1, + todo: skip$$1 ? false : todo$$1 + }; + + var env = {}; + if (parentModule) { + parentModule.childModules.push(module); + extend(env, parentModule.testEnvironment); + } + extend(env, testEnvironment); + module.testEnvironment = env; + + config.modules.push(module); + return module; } function processModule(name, options, executeNow) { - var modifiers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}; - - var module = createModule(name, options, modifiers); - - // Move any hooks to a 'hooks' object - var testEnvironment = module.testEnvironment; - var hooks = module.hooks = {}; - - setHookFromEnvironment(hooks, testEnvironment, "before"); - setHookFromEnvironment(hooks, testEnvironment, "beforeEach"); - setHookFromEnvironment(hooks, testEnvironment, "afterEach"); - setHookFromEnvironment(hooks, testEnvironment, "after"); - - function setHookFromEnvironment(hooks, environment, name) { - var potentialHook = environment[name]; - hooks[name] = typeof potentialHook === "function" ? [potentialHook] : []; - delete environment[name]; - } - - var moduleFns = { - before: setHookFunction(module, "before"), - beforeEach: setHookFunction(module, "beforeEach"), - afterEach: setHookFunction(module, "afterEach"), - after: setHookFunction(module, "after") - }; - - var currentModule = config.currentModule; - if (objectType(executeNow) === "function") { - moduleStack.push(module); - config.currentModule = module; - executeNow.call(module.testEnvironment, moduleFns); - moduleStack.pop(); - module = module.parentModule || currentModule; - } - - config.currentModule = module; + var modifiers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}; + + var module = createModule(name, options, modifiers); + + // Move any hooks to a 'hooks' object + var testEnvironment = module.testEnvironment; + var hooks = module.hooks = {}; + + setHookFromEnvironment(hooks, testEnvironment, "before"); + setHookFromEnvironment(hooks, testEnvironment, "beforeEach"); + setHookFromEnvironment(hooks, testEnvironment, "afterEach"); + setHookFromEnvironment(hooks, testEnvironment, "after"); + + function setHookFromEnvironment(hooks, environment, name) { + var potentialHook = environment[name]; + hooks[name] = typeof potentialHook === "function" ? [potentialHook] : []; + delete environment[name]; + } + + var moduleFns = { + before: setHookFunction(module, "before"), + beforeEach: setHookFunction(module, "beforeEach"), + afterEach: setHookFunction(module, "afterEach"), + after: setHookFunction(module, "after") + }; + + var currentModule = config.currentModule; + if (objectType(executeNow) === "function") { + moduleStack.push(module); + config.currentModule = module; + executeNow.call(module.testEnvironment, moduleFns); + moduleStack.pop(); + module = module.parentModule || currentModule; + } + + config.currentModule = module; } // TODO: extract this to a new file alongside its related functions function module$1(name, options, executeNow) { - if (focused) { - return; - } - - if (arguments.length === 2) { - if (objectType(options) === "function") { - executeNow = options; - options = undefined; - } - } - - processModule(name, options, executeNow); + if (focused) { + return; + } + + if (arguments.length === 2) { + if (objectType(options) === "function") { + executeNow = options; + options = undefined; + } + } + + processModule(name, options, executeNow); } module$1.only = function () { - if (focused) { - return; - } + if (focused) { + return; + } - config.modules.length = 0; - config.queue.length = 0; + config.modules.length = 0; + config.queue.length = 0; - module$1.apply(undefined, arguments); + module$1.apply(undefined, arguments); - focused = true; + focused = true; }; module$1.skip = function (name, options, executeNow) { - if (focused) { - return; - } - - if (arguments.length === 2) { - if (objectType(options) === "function") { - executeNow = options; - options = undefined; - } - } - - processModule(name, options, executeNow, { skip: true }); + if (focused) { + return; + } + + if (arguments.length === 2) { + if (objectType(options) === "function") { + executeNow = options; + options = undefined; + } + } + + processModule(name, options, executeNow, {skip: true}); }; module$1.todo = function (name, options, executeNow) { - if (focused) { - return; - } - - if (arguments.length === 2) { - if (objectType(options) === "function") { - executeNow = options; - options = undefined; - } - } - - processModule(name, options, executeNow, { todo: true }); + if (focused) { + return; + } + + if (arguments.length === 2) { + if (objectType(options) === "function") { + executeNow = options; + options = undefined; + } + } + + processModule(name, options, executeNow, {todo: true}); }; extend(QUnit, { - on: on, + on: on, - module: module$1, + module: module$1, - test: test, + test: test, - todo: todo, + todo: todo, - skip: skip, + skip: skip, - only: only, + only: only, - start: function start(count) { - var globalStartAlreadyCalled = globalStartCalled; + start: function start(count) { + var globalStartAlreadyCalled = globalStartCalled; - if (!config.current) { - globalStartCalled = true; + if (!config.current) { + globalStartCalled = true; - if (runStarted) { - throw new Error("Called start() while test already started running"); - } else if (globalStartAlreadyCalled || count > 1) { - throw new Error("Called start() outside of a test context too many times"); - } else if (config.autostart) { - throw new Error("Called start() outside of a test context when " + "QUnit.config.autostart was true"); - } else if (!config.pageLoaded) { + if (runStarted) { + throw new Error("Called start() while test already started running"); + } else if (globalStartAlreadyCalled || count > 1) { + throw new Error("Called start() outside of a test context too many times"); + } else if (config.autostart) { + throw new Error("Called start() outside of a test context when " + "QUnit.config.autostart was true"); + } else if (!config.pageLoaded) { - // The page isn't completely loaded yet, so we set autostart and then - // load if we're in Node or wait for the browser's load event. - config.autostart = true; + // The page isn't completely loaded yet, so we set autostart and then + // load if we're in Node or wait for the browser's load event. + config.autostart = true; - // Starts from Node even if .load was not previously called. We still return - // early otherwise we'll wind up "beginning" twice. - if (!defined.document) { - QUnit.load(); - } + // Starts from Node even if .load was not previously called. We still return + // early otherwise we'll wind up "beginning" twice. + if (!defined.document) { + QUnit.load(); + } - return; - } - } else { - throw new Error("QUnit.start cannot be called inside a test context."); - } + return; + } + } else { + throw new Error("QUnit.start cannot be called inside a test context."); + } - scheduleBegin(); - }, + scheduleBegin(); + }, - config: config, + config: config, - is: is, + is: is, - objectType: objectType, + objectType: objectType, - extend: extend, + extend: extend, - load: function load() { - config.pageLoaded = true; + load: function load() { + config.pageLoaded = true; - // Initialize the configuration options - extend(config, { - stats: { all: 0, bad: 0 }, - started: 0, - updateRate: 1000, - autostart: true, - filter: "" - }, true); + // Initialize the configuration options + extend(config, { + stats: {all: 0, bad: 0}, + started: 0, + updateRate: 1000, + autostart: true, + filter: "" + }, true); - if (!runStarted) { - config.blocking = false; + if (!runStarted) { + config.blocking = false; - if (config.autostart) { - scheduleBegin(); - } - } - }, + if (config.autostart) { + scheduleBegin(); + } + } + }, - stack: function stack(offset) { - offset = (offset || 0) + 2; - return sourceFromStacktrace(offset); - }, + stack: function stack(offset) { + offset = (offset || 0) + 2; + return sourceFromStacktrace(offset); + }, - onError: onError, + onError: onError, - onUnhandledRejection: onUnhandledRejection + onUnhandledRejection: onUnhandledRejection }); QUnit.pushFailure = pushFailure; @@ -3011,1107 +2973,1109 @@ function scheduleBegin() { - runStarted = true; + runStarted = true; - // Add a slight delay to allow definition of more modules and tests. - if (defined.setTimeout) { - setTimeout(function () { - begin(); - }); - } else { - begin(); - } + // Add a slight delay to allow definition of more modules and tests. + if (defined.setTimeout) { + setTimeout(function () { + begin(); + }); + } else { + begin(); + } } function begin() { - var i, - l, - modulesLog = []; - - // If the test run hasn't officially begun yet - if (!config.started) { - - // Record the time of the test run's beginning - config.started = now(); - - // Delete the loose unnamed module if unused. - if (config.modules[0].name === "" && config.modules[0].tests.length === 0) { - config.modules.shift(); - } - - // Avoid unnecessary information by not logging modules' test environments - for (i = 0, l = config.modules.length; i < l; i++) { - modulesLog.push({ - name: config.modules[i].name, - tests: config.modules[i].tests - }); - } - - // The test run is officially beginning now - emit("runStart", globalSuite.start(true)); - runLoggingCallbacks("begin", { - totalTests: Test.count, - modules: modulesLog - }); - } - - config.blocking = false; - ProcessingQueue.advance(); + var i, + l, + modulesLog = []; + + // If the test run hasn't officially begun yet + if (!config.started) { + + // Record the time of the test run's beginning + config.started = now(); + + // Delete the loose unnamed module if unused. + if (config.modules[0].name === "" && config.modules[0].tests.length === 0) { + config.modules.shift(); + } + + // Avoid unnecessary information by not logging modules' test environments + for (i = 0, l = config.modules.length; i < l; i++) { + modulesLog.push({ + name: config.modules[i].name, + tests: config.modules[i].tests + }); + } + + // The test run is officially beginning now + emit("runStart", globalSuite.start(true)); + runLoggingCallbacks("begin", { + totalTests: Test.count, + modules: modulesLog + }); + } + + config.blocking = false; + ProcessingQueue.advance(); } function setHookFunction(module, hookName) { - return function setHook(callback) { - module.hooks[hookName].push(callback); - }; + return function setHook(callback) { + module.hooks[hookName].push(callback); + }; } exportQUnit(QUnit); (function () { - if (typeof window === "undefined" || typeof document === "undefined") { - return; - } + if (typeof window === "undefined" || typeof document === "undefined") { + return; + } - var config = QUnit.config, - hasOwn = Object.prototype.hasOwnProperty; + var config = QUnit.config, + hasOwn = Object.prototype.hasOwnProperty; - // Stores fixture HTML for resetting later - function storeFixture() { + // Stores fixture HTML for resetting later + function storeFixture() { - // Avoid overwriting user-defined values - if (hasOwn.call(config, "fixture")) { - return; - } + // Avoid overwriting user-defined values + if (hasOwn.call(config, "fixture")) { + return; + } - var fixture = document.getElementById("qunit-fixture"); - if (fixture) { - config.fixture = fixture.innerHTML; - } - } + var fixture = document.getElementById("qunit-fixture"); + if (fixture) { + config.fixture = fixture.innerHTML; + } + } - QUnit.begin(storeFixture); + QUnit.begin(storeFixture); - // Resets the fixture DOM element if available. - function resetFixture() { - if (config.fixture == null) { - return; - } + // Resets the fixture DOM element if available. + function resetFixture() { + if (config.fixture == null) { + return; + } - var fixture = document.getElementById("qunit-fixture"); - if (fixture) { - fixture.innerHTML = config.fixture; - } - } + var fixture = document.getElementById("qunit-fixture"); + if (fixture) { + fixture.innerHTML = config.fixture; + } + } - QUnit.testStart(resetFixture); + QUnit.testStart(resetFixture); })(); (function () { - // Only interact with URLs via window.location - var location = typeof window !== "undefined" && window.location; - if (!location) { - return; - } - - var urlParams = getUrlParams(); - - QUnit.urlParams = urlParams; - - // Match module/test by inclusion in an array - QUnit.config.moduleId = [].concat(urlParams.moduleId || []); - QUnit.config.testId = [].concat(urlParams.testId || []); - - // Exact case-insensitive match of the module name - QUnit.config.module = urlParams.module; - - // Regular expression or case-insenstive substring match against "moduleName: testName" - QUnit.config.filter = urlParams.filter; - - // Test order randomization - if (urlParams.seed === true) { - - // Generate a random seed if the option is specified without a value - QUnit.config.seed = Math.random().toString(36).slice(2); - } else if (urlParams.seed) { - QUnit.config.seed = urlParams.seed; - } - - // Add URL-parameter-mapped config values with UI form rendering data - QUnit.config.urlConfig.push({ - id: "hidepassed", - label: "Hide passed tests", - tooltip: "Only show tests and assertions that fail. Stored as query-strings." - }, { - id: "noglobals", - label: "Check for Globals", - tooltip: "Enabling this will test if any test introduces new properties on the " + "global object (`window` in Browsers). Stored as query-strings." - }, { - id: "notrycatch", - label: "No try-catch", - tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + "exceptions in IE reasonable. Stored as query-strings." - }); - - QUnit.begin(function () { - var i, - option, - urlConfig = QUnit.config.urlConfig; - - for (i = 0; i < urlConfig.length; i++) { - - // Options can be either strings or objects with nonempty "id" properties - option = QUnit.config.urlConfig[i]; - if (typeof option !== "string") { - option = option.id; - } - - if (QUnit.config[option] === undefined) { - QUnit.config[option] = urlParams[option]; - } - } - }); - - function getUrlParams() { - var i, param, name, value; - var urlParams = Object.create(null); - var params = location.search.slice(1).split("&"); - var length = params.length; - - for (i = 0; i < length; i++) { - if (params[i]) { - param = params[i].split("="); - name = decodeQueryParam(param[0]); - - // Allow just a key to turn on a flag, e.g., test.html?noglobals - value = param.length === 1 || decodeQueryParam(param.slice(1).join("=")); - if (name in urlParams) { - urlParams[name] = [].concat(urlParams[name], value); - } else { - urlParams[name] = value; - } - } - } - - return urlParams; - } - - function decodeQueryParam(param) { - return decodeURIComponent(param.replace(/\+/g, "%20")); - } + // Only interact with URLs via window.location + var location = typeof window !== "undefined" && window.location; + if (!location) { + return; + } + + var urlParams = getUrlParams(); + + QUnit.urlParams = urlParams; + + // Match module/test by inclusion in an array + QUnit.config.moduleId = [].concat(urlParams.moduleId || []); + QUnit.config.testId = [].concat(urlParams.testId || []); + + // Exact case-insensitive match of the module name + QUnit.config.module = urlParams.module; + + // Regular expression or case-insenstive substring match against "moduleName: testName" + QUnit.config.filter = urlParams.filter; + + // Test order randomization + if (urlParams.seed === true) { + + // Generate a random seed if the option is specified without a value + QUnit.config.seed = Math.random().toString(36).slice(2); + } else if (urlParams.seed) { + QUnit.config.seed = urlParams.seed; + } + + // Add URL-parameter-mapped config values with UI form rendering data + QUnit.config.urlConfig.push({ + id: "hidepassed", + label: "Hide passed tests", + tooltip: "Only show tests and assertions that fail. Stored as query-strings." + }, { + id: "noglobals", + label: "Check for Globals", + tooltip: "Enabling this will test if any test introduces new properties on the " + "global object (`window` in Browsers). Stored as query-strings." + }, { + id: "notrycatch", + label: "No try-catch", + tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + "exceptions in IE reasonable. Stored as query-strings." + }); + + QUnit.begin(function () { + var i, + option, + urlConfig = QUnit.config.urlConfig; + + for (i = 0; i < urlConfig.length; i++) { + + // Options can be either strings or objects with nonempty "id" properties + option = QUnit.config.urlConfig[i]; + if (typeof option !== "string") { + option = option.id; + } + + if (QUnit.config[option] === undefined) { + QUnit.config[option] = urlParams[option]; + } + } + }); + + function getUrlParams() { + var i, param, name, value; + var urlParams = Object.create(null); + var params = location.search.slice(1).split("&"); + var length = params.length; + + for (i = 0; i < length; i++) { + if (params[i]) { + param = params[i].split("="); + name = decodeQueryParam(param[0]); + + // Allow just a key to turn on a flag, e.g., test.html?noglobals + value = param.length === 1 || decodeQueryParam(param.slice(1).join("=")); + if (name in urlParams) { + urlParams[name] = [].concat(urlParams[name], value); + } else { + urlParams[name] = value; + } + } + } + + return urlParams; + } + + function decodeQueryParam(param) { + return decodeURIComponent(param.replace(/\+/g, "%20")); + } })(); var stats = { - passedTests: 0, - failedTests: 0, - skippedTests: 0, - todoTests: 0 + passedTests: 0, + failedTests: 0, + skippedTests: 0, + todoTests: 0 }; // Escape text for attribute or text content. function escapeText(s) { - if (!s) { - return ""; - } - s = s + ""; - - // Both single quotes and double quotes (for attributes) - return s.replace(/['"<>&]/g, function (s) { - switch (s) { - case "'": - return "'"; - case "\"": - return """; - case "<": - return "<"; - case ">": - return ">"; - case "&": - return "&"; - } - }); + if (!s) { + return ""; + } + s = s + ""; + + // Both single quotes and double quotes (for attributes) + return s.replace(/['"<>&]/g, function (s) { + switch (s) { + case "'": + return "'"; + case "\"": + return """; + case "<": + return "<"; + case ">": + return ">"; + case "&": + return "&"; + } + }); } (function () { - // Don't load the HTML Reporter on non-browser environments - if (typeof window === "undefined" || !window.document) { - return; - } - - var config = QUnit.config, - document$$1 = window.document, - collapseNext = false, - hasOwn = Object.prototype.hasOwnProperty, - unfilteredUrl = setUrl({ filter: undefined, module: undefined, - moduleId: undefined, testId: undefined }), - modulesList = []; - - function addEvent(elem, type, fn) { - elem.addEventListener(type, fn, false); - } - - function removeEvent(elem, type, fn) { - elem.removeEventListener(type, fn, false); - } - - function addEvents(elems, type, fn) { - var i = elems.length; - while (i--) { - addEvent(elems[i], type, fn); - } - } - - function hasClass(elem, name) { - return (" " + elem.className + " ").indexOf(" " + name + " ") >= 0; - } - - function addClass(elem, name) { - if (!hasClass(elem, name)) { - elem.className += (elem.className ? " " : "") + name; - } - } - - function toggleClass(elem, name, force) { - if (force || typeof force === "undefined" && !hasClass(elem, name)) { - addClass(elem, name); - } else { - removeClass(elem, name); - } - } - - function removeClass(elem, name) { - var set = " " + elem.className + " "; - - // Class name may appear multiple times - while (set.indexOf(" " + name + " ") >= 0) { - set = set.replace(" " + name + " ", " "); - } - - // Trim for prettiness - elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, ""); - } - - function id(name) { - return document$$1.getElementById && document$$1.getElementById(name); - } - - function abortTests() { - var abortButton = id("qunit-abort-tests-button"); - if (abortButton) { - abortButton.disabled = true; - abortButton.innerHTML = "Aborting..."; - } - QUnit.config.queue.length = 0; - return false; - } - - function interceptNavigation(ev) { - applyUrlParams(); - - if (ev && ev.preventDefault) { - ev.preventDefault(); - } - - return false; - } - - function getUrlConfigHtml() { - var i, - j, - val, - escaped, - escapedTooltip, - selection = false, - urlConfig = config.urlConfig, - urlConfigHtml = ""; - - for (i = 0; i < urlConfig.length; i++) { - - // Options can be either strings or objects with nonempty "id" properties - val = config.urlConfig[i]; - if (typeof val === "string") { - val = { - id: val, - label: val - }; - } - - escaped = escapeText(val.id); - escapedTooltip = escapeText(val.tooltip); - - if (!val.value || typeof val.value === "string") { - urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' type='checkbox'" + (val.value ? " value='" + escapeText(val.value) + "'" : "") + (config[val.id] ? " checked='checked'" : "") + " title='" + escapedTooltip + "' />" + escapeText(val.label) + "</label>"; - } else { - urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'>" + val.label + ": </label><select id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>"; - - if (QUnit.is("array", val.value)) { - for (j = 0; j < val.value.length; j++) { - escaped = escapeText(val.value[j]); - urlConfigHtml += "<option value='" + escaped + "'" + (config[val.id] === val.value[j] ? (selection = true) && " selected='selected'" : "") + ">" + escaped + "</option>"; - } - } else { - for (j in val.value) { - if (hasOwn.call(val.value, j)) { - urlConfigHtml += "<option value='" + escapeText(j) + "'" + (config[val.id] === j ? (selection = true) && " selected='selected'" : "") + ">" + escapeText(val.value[j]) + "</option>"; - } - } - } - if (config[val.id] && !selection) { - escaped = escapeText(config[val.id]); - urlConfigHtml += "<option value='" + escaped + "' selected='selected' disabled='disabled'>" + escaped + "</option>"; - } - urlConfigHtml += "</select>"; - } - } - - return urlConfigHtml; - } - - // Handle "click" events on toolbar checkboxes and "change" for select menus. - // Updates the URL with the new state of `config.urlConfig` values. - function toolbarChanged() { - var updatedUrl, - value, - tests, - field = this, - params = {}; - - // Detect if field is a select menu or a checkbox - if ("selectedIndex" in field) { - value = field.options[field.selectedIndex].value || undefined; - } else { - value = field.checked ? field.defaultValue || true : undefined; - } - - params[field.name] = value; - updatedUrl = setUrl(params); - - // Check if we can apply the change without a page refresh - if ("hidepassed" === field.name && "replaceState" in window.history) { - QUnit.urlParams[field.name] = value; - config[field.name] = value || false; - tests = id("qunit-tests"); - if (tests) { - toggleClass(tests, "hidepass", value || false); - } - window.history.replaceState(null, "", updatedUrl); - } else { - window.location = updatedUrl; - } - } - - function setUrl(params) { - var key, - arrValue, - i, - querystring = "?", - location = window.location; - - params = QUnit.extend(QUnit.extend({}, QUnit.urlParams), params); - - for (key in params) { - - // Skip inherited or undefined properties - if (hasOwn.call(params, key) && params[key] !== undefined) { - - // Output a parameter for each value of this key - // (but usually just one) - arrValue = [].concat(params[key]); - for (i = 0; i < arrValue.length; i++) { - querystring += encodeURIComponent(key); - if (arrValue[i] !== true) { - querystring += "=" + encodeURIComponent(arrValue[i]); - } - querystring += "&"; - } - } - } - return location.protocol + "//" + location.host + location.pathname + querystring.slice(0, -1); - } - - function applyUrlParams() { - var i, - selectedModules = [], - modulesList = id("qunit-modulefilter-dropdown-list").getElementsByTagName("input"), - filter = id("qunit-filter-input").value; - - for (i = 0; i < modulesList.length; i++) { - if (modulesList[i].checked) { - selectedModules.push(modulesList[i].value); - } - } - - window.location = setUrl({ - filter: filter === "" ? undefined : filter, - moduleId: selectedModules.length === 0 ? undefined : selectedModules, - - // Remove module and testId filter - module: undefined, - testId: undefined - }); - } - - function toolbarUrlConfigContainer() { - var urlConfigContainer = document$$1.createElement("span"); - - urlConfigContainer.innerHTML = getUrlConfigHtml(); - addClass(urlConfigContainer, "qunit-url-config"); - - addEvents(urlConfigContainer.getElementsByTagName("input"), "change", toolbarChanged); - addEvents(urlConfigContainer.getElementsByTagName("select"), "change", toolbarChanged); - - return urlConfigContainer; - } - - function abortTestsButton() { - var button = document$$1.createElement("button"); - button.id = "qunit-abort-tests-button"; - button.innerHTML = "Abort"; - addEvent(button, "click", abortTests); - return button; - } - - function toolbarLooseFilter() { - var filter = document$$1.createElement("form"), - label = document$$1.createElement("label"), - input = document$$1.createElement("input"), - button = document$$1.createElement("button"); - - addClass(filter, "qunit-filter"); - - label.innerHTML = "Filter: "; - - input.type = "text"; - input.value = config.filter || ""; - input.name = "filter"; - input.id = "qunit-filter-input"; - - button.innerHTML = "Go"; - - label.appendChild(input); - - filter.appendChild(label); - filter.appendChild(document$$1.createTextNode(" ")); - filter.appendChild(button); - addEvent(filter, "submit", interceptNavigation); - - return filter; - } - - function moduleListHtml() { - var i, - checked, - html = ""; - - for (i = 0; i < config.modules.length; i++) { - if (config.modules[i].name !== "") { - checked = config.moduleId.indexOf(config.modules[i].moduleId) > -1; - html += "<li><label class='clickable" + (checked ? " checked" : "") + "'><input type='checkbox' " + "value='" + config.modules[i].moduleId + "'" + (checked ? " checked='checked'" : "") + " />" + escapeText(config.modules[i].name) + "</label></li>"; - } - } - - return html; - } - - function toolbarModuleFilter() { - var allCheckbox, - commit, - reset, - moduleFilter = document$$1.createElement("form"), - label = document$$1.createElement("label"), - moduleSearch = document$$1.createElement("input"), - dropDown = document$$1.createElement("div"), - actions = document$$1.createElement("span"), - dropDownList = document$$1.createElement("ul"), - dirty = false; - - moduleSearch.id = "qunit-modulefilter-search"; - addEvent(moduleSearch, "input", searchInput); - addEvent(moduleSearch, "input", searchFocus); - addEvent(moduleSearch, "focus", searchFocus); - addEvent(moduleSearch, "click", searchFocus); - - label.id = "qunit-modulefilter-search-container"; - label.innerHTML = "Module: "; - label.appendChild(moduleSearch); - - actions.id = "qunit-modulefilter-actions"; - actions.innerHTML = "<button style='display:none'>Apply</button>" + "<button type='reset' style='display:none'>Reset</button>" + "<label class='clickable" + (config.moduleId.length ? "" : " checked") + "'><input type='checkbox'" + (config.moduleId.length ? "" : " checked='checked'") + ">All modules</label>"; - allCheckbox = actions.lastChild.firstChild; - commit = actions.firstChild; - reset = commit.nextSibling; - addEvent(commit, "click", applyUrlParams); - - dropDownList.id = "qunit-modulefilter-dropdown-list"; - dropDownList.innerHTML = moduleListHtml(); - - dropDown.id = "qunit-modulefilter-dropdown"; - dropDown.style.display = "none"; - dropDown.appendChild(actions); - dropDown.appendChild(dropDownList); - addEvent(dropDown, "change", selectionChange); - selectionChange(); - - moduleFilter.id = "qunit-modulefilter"; - moduleFilter.appendChild(label); - moduleFilter.appendChild(dropDown); - addEvent(moduleFilter, "submit", interceptNavigation); - addEvent(moduleFilter, "reset", function () { - - // Let the reset happen, then update styles - window.setTimeout(selectionChange); - }); - - // Enables show/hide for the dropdown - function searchFocus() { - if (dropDown.style.display !== "none") { - return; - } - - dropDown.style.display = "block"; - addEvent(document$$1, "click", hideHandler); - addEvent(document$$1, "keydown", hideHandler); - - // Hide on Escape keydown or outside-container click - function hideHandler(e) { - var inContainer = moduleFilter.contains(e.target); - - if (e.keyCode === 27 || !inContainer) { - if (e.keyCode === 27 && inContainer) { - moduleSearch.focus(); - } - dropDown.style.display = "none"; - removeEvent(document$$1, "click", hideHandler); - removeEvent(document$$1, "keydown", hideHandler); - moduleSearch.value = ""; - searchInput(); - } - } - } - - // Processes module search box input - function searchInput() { - var i, - item, - searchText = moduleSearch.value.toLowerCase(), - listItems = dropDownList.children; - - for (i = 0; i < listItems.length; i++) { - item = listItems[i]; - if (!searchText || item.textContent.toLowerCase().indexOf(searchText) > -1) { - item.style.display = ""; - } else { - item.style.display = "none"; - } - } - } - - // Processes selection changes - function selectionChange(evt) { - var i, - item, - checkbox = evt && evt.target || allCheckbox, - modulesList = dropDownList.getElementsByTagName("input"), - selectedNames = []; - - toggleClass(checkbox.parentNode, "checked", checkbox.checked); - - dirty = false; - if (checkbox.checked && checkbox !== allCheckbox) { - allCheckbox.checked = false; - removeClass(allCheckbox.parentNode, "checked"); - } - for (i = 0; i < modulesList.length; i++) { - item = modulesList[i]; - if (!evt) { - toggleClass(item.parentNode, "checked", item.checked); - } else if (checkbox === allCheckbox && checkbox.checked) { - item.checked = false; - removeClass(item.parentNode, "checked"); - } - dirty = dirty || item.checked !== item.defaultChecked; - if (item.checked) { - selectedNames.push(item.parentNode.textContent); - } - } - - commit.style.display = reset.style.display = dirty ? "" : "none"; - moduleSearch.placeholder = selectedNames.join(", ") || allCheckbox.parentNode.textContent; - moduleSearch.title = "Type to filter list. Current selection:\n" + (selectedNames.join("\n") || allCheckbox.parentNode.textContent); - } - - return moduleFilter; - } - - function appendToolbar() { - var toolbar = id("qunit-testrunner-toolbar"); - - if (toolbar) { - toolbar.appendChild(toolbarUrlConfigContainer()); - toolbar.appendChild(toolbarModuleFilter()); - toolbar.appendChild(toolbarLooseFilter()); - toolbar.appendChild(document$$1.createElement("div")).className = "clearfix"; - } - } - - function appendHeader() { - var header = id("qunit-header"); - - if (header) { - header.innerHTML = "<a href='" + escapeText(unfilteredUrl) + "'>" + header.innerHTML + "</a> "; - } - } - - function appendBanner() { - var banner = id("qunit-banner"); - - if (banner) { - banner.className = ""; - } - } - - function appendTestResults() { - var tests = id("qunit-tests"), - result = id("qunit-testresult"), - controls; - - if (result) { - result.parentNode.removeChild(result); - } - - if (tests) { - tests.innerHTML = ""; - result = document$$1.createElement("p"); - result.id = "qunit-testresult"; - result.className = "result"; - tests.parentNode.insertBefore(result, tests); - result.innerHTML = "<div id=\"qunit-testresult-display\">Running...<br /> </div>" + "<div id=\"qunit-testresult-controls\"></div>" + "<div class=\"clearfix\"></div>"; - controls = id("qunit-testresult-controls"); - } - - if (controls) { - controls.appendChild(abortTestsButton()); - } - } - - function appendFilteredTest() { - var testId = QUnit.config.testId; - if (!testId || testId.length <= 0) { - return ""; - } - return "<div id='qunit-filteredTest'>Rerunning selected tests: " + escapeText(testId.join(", ")) + " <a id='qunit-clearFilter' href='" + escapeText(unfilteredUrl) + "'>Run all tests</a></div>"; - } - - function appendUserAgent() { - var userAgent = id("qunit-userAgent"); - - if (userAgent) { - userAgent.innerHTML = ""; - userAgent.appendChild(document$$1.createTextNode("QUnit " + QUnit.version + "; " + navigator.userAgent)); - } - } - - function appendInterface() { - var qunit = id("qunit"); - - if (qunit) { - qunit.innerHTML = "<h1 id='qunit-header'>" + escapeText(document$$1.title) + "</h1>" + "<h2 id='qunit-banner'></h2>" + "<div id='qunit-testrunner-toolbar'></div>" + appendFilteredTest() + "<h2 id='qunit-userAgent'></h2>" + "<ol id='qunit-tests'></ol>"; - } - - appendHeader(); - appendBanner(); - appendTestResults(); - appendUserAgent(); - appendToolbar(); - } - - function appendTestsList(modules) { - var i, l, x, z, test, moduleObj; - - for (i = 0, l = modules.length; i < l; i++) { - moduleObj = modules[i]; - - for (x = 0, z = moduleObj.tests.length; x < z; x++) { - test = moduleObj.tests[x]; - - appendTest(test.name, test.testId, moduleObj.name); - } - } - } - - function appendTest(name, testId, moduleName) { - var title, - rerunTrigger, - testBlock, - assertList, - tests = id("qunit-tests"); - - if (!tests) { - return; - } - - title = document$$1.createElement("strong"); - title.innerHTML = getNameHtml(name, moduleName); - - rerunTrigger = document$$1.createElement("a"); - rerunTrigger.innerHTML = "Rerun"; - rerunTrigger.href = setUrl({ testId: testId }); - - testBlock = document$$1.createElement("li"); - testBlock.appendChild(title); - testBlock.appendChild(rerunTrigger); - testBlock.id = "qunit-test-output-" + testId; - - assertList = document$$1.createElement("ol"); - assertList.className = "qunit-assert-list"; - - testBlock.appendChild(assertList); - - tests.appendChild(testBlock); - } - - // HTML Reporter initialization and load - QUnit.begin(function (details) { - var i, moduleObj, tests; - - // Sort modules by name for the picker - for (i = 0; i < details.modules.length; i++) { - moduleObj = details.modules[i]; - if (moduleObj.name) { - modulesList.push(moduleObj.name); - } - } - modulesList.sort(function (a, b) { - return a.localeCompare(b); - }); - - // Initialize QUnit elements - appendInterface(); - appendTestsList(details.modules); - tests = id("qunit-tests"); - if (tests && config.hidepassed) { - addClass(tests, "hidepass"); - } - }); - - QUnit.done(function (details) { - var banner = id("qunit-banner"), - tests = id("qunit-tests"), - abortButton = id("qunit-abort-tests-button"), - totalTests = stats.passedTests + stats.skippedTests + stats.todoTests + stats.failedTests, - html = [totalTests, " tests completed in ", details.runtime, " milliseconds, with ", stats.failedTests, " failed, ", stats.skippedTests, " skipped, and ", stats.todoTests, " todo.<br />", "<span class='passed'>", details.passed, "</span> assertions of <span class='total'>", details.total, "</span> passed, <span class='failed'>", details.failed, "</span> failed."].join(""), - test, - assertLi, - assertList; - - // Update remaing tests to aborted - if (abortButton && abortButton.disabled) { - html = "Tests aborted after " + details.runtime + " milliseconds."; - - for (var i = 0; i < tests.children.length; i++) { - test = tests.children[i]; - if (test.className === "" || test.className === "running") { - test.className = "aborted"; - assertList = test.getElementsByTagName("ol")[0]; - assertLi = document$$1.createElement("li"); - assertLi.className = "fail"; - assertLi.innerHTML = "Test aborted."; - assertList.appendChild(assertLi); - } - } - } - - if (banner && (!abortButton || abortButton.disabled === false)) { - banner.className = stats.failedTests ? "qunit-fail" : "qunit-pass"; - } - - if (abortButton) { - abortButton.parentNode.removeChild(abortButton); - } - - if (tests) { - id("qunit-testresult-display").innerHTML = html; - } - - if (config.altertitle && document$$1.title) { - - // Show ✖ for good, ✔ for bad suite result in title - // use escape sequences in case file gets loaded with non-utf-8 - // charset - document$$1.title = [stats.failedTests ? "\u2716" : "\u2714", document$$1.title.replace(/^[\u2714\u2716] /i, "")].join(" "); - } - - // Scroll back to top to show results - if (config.scrolltop && window.scrollTo) { - window.scrollTo(0, 0); - } - }); - - function getNameHtml(name, module) { - var nameHtml = ""; - - if (module) { - nameHtml = "<span class='module-name'>" + escapeText(module) + "</span>: "; - } - - nameHtml += "<span class='test-name'>" + escapeText(name) + "</span>"; - - return nameHtml; - } - - QUnit.testStart(function (details) { - var running, testBlock, bad; - - testBlock = id("qunit-test-output-" + details.testId); - if (testBlock) { - testBlock.className = "running"; - } else { - - // Report later registered tests - appendTest(details.name, details.testId, details.module); - } - - running = id("qunit-testresult-display"); - if (running) { - bad = QUnit.config.reorder && details.previousFailure; - - running.innerHTML = [bad ? "Rerunning previously failed test: <br />" : "Running: <br />", getNameHtml(details.name, details.module)].join(""); - } - }); - - function stripHtml(string) { - - // Strip tags, html entity and whitespaces - return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/\"/g, "").replace(/\s+/g, ""); - } - - QUnit.log(function (details) { - var assertList, - assertLi, - message, - expected, - actual, - diff, - showDiff = false, - testItem = id("qunit-test-output-" + details.testId); - - if (!testItem) { - return; - } - - message = escapeText(details.message) || (details.result ? "okay" : "failed"); - message = "<span class='test-message'>" + message + "</span>"; - message += "<span class='runtime'>@ " + details.runtime + " ms</span>"; - - // The pushFailure doesn't provide details.expected - // when it calls, it's implicit to also not show expected and diff stuff - // Also, we need to check details.expected existence, as it can exist and be undefined - if (!details.result && hasOwn.call(details, "expected")) { - if (details.negative) { - expected = "NOT " + QUnit.dump.parse(details.expected); - } else { - expected = QUnit.dump.parse(details.expected); - } - - actual = QUnit.dump.parse(details.actual); - message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + escapeText(expected) + "</pre></td></tr>"; - - if (actual !== expected) { - - message += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText(actual) + "</pre></td></tr>"; - - if (typeof details.actual === "number" && typeof details.expected === "number") { - if (!isNaN(details.actual) && !isNaN(details.expected)) { - showDiff = true; - diff = details.actual - details.expected; - diff = (diff > 0 ? "+" : "") + diff; - } - } else if (typeof details.actual !== "boolean" && typeof details.expected !== "boolean") { - diff = QUnit.diff(expected, actual); - - // don't show diff if there is zero overlap - showDiff = stripHtml(diff).length !== stripHtml(expected).length + stripHtml(actual).length; - } - - if (showDiff) { - message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + diff + "</pre></td></tr>"; - } - } else if (expected.indexOf("[object Array]") !== -1 || expected.indexOf("[object Object]") !== -1) { - message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the depth of object is more than current max depth (" + QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " + " run with a higher max depth or <a href='" + escapeText(setUrl({ maxDepth: -1 })) + "'>" + "Rerun</a> without max depth.</p></td></tr>"; - } else { - message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the expected and actual results have an equivalent" + " serialization</td></tr>"; - } - - if (details.source) { - message += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>"; - } - - message += "</table>"; - - // This occurs when pushFailure is set and we have an extracted stack trace - } else if (!details.result && details.source) { - message += "<table>" + "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>" + "</table>"; - } - - assertList = testItem.getElementsByTagName("ol")[0]; - - assertLi = document$$1.createElement("li"); - assertLi.className = details.result ? "pass" : "fail"; - assertLi.innerHTML = message; - assertList.appendChild(assertLi); - }); - - QUnit.testDone(function (details) { - var testTitle, - time, - testItem, - assertList, - good, - bad, - testCounts, - skipped, - sourceName, - tests = id("qunit-tests"); - - if (!tests) { - return; - } - - testItem = id("qunit-test-output-" + details.testId); - - assertList = testItem.getElementsByTagName("ol")[0]; - - good = details.passed; - bad = details.failed; - - // This test passed if it has no unexpected failed assertions - var testPassed = details.failed > 0 ? details.todo : !details.todo; - - if (testPassed) { - - // Collapse the passing tests - addClass(assertList, "qunit-collapsed"); - } else if (config.collapse) { - if (!collapseNext) { - - // Skip collapsing the first failing test - collapseNext = true; - } else { - - // Collapse remaining tests - addClass(assertList, "qunit-collapsed"); - } - } - - // The testItem.firstChild is the test name - testTitle = testItem.firstChild; - - testCounts = bad ? "<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " : ""; - - testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ")</b>"; - - if (details.skipped) { - stats.skippedTests++; - - testItem.className = "skipped"; - skipped = document$$1.createElement("em"); - skipped.className = "qunit-skipped-label"; - skipped.innerHTML = "skipped"; - testItem.insertBefore(skipped, testTitle); - } else { - addEvent(testTitle, "click", function () { - toggleClass(assertList, "qunit-collapsed"); - }); - - testItem.className = testPassed ? "pass" : "fail"; - - if (details.todo) { - var todoLabel = document$$1.createElement("em"); - todoLabel.className = "qunit-todo-label"; - todoLabel.innerHTML = "todo"; - testItem.className += " todo"; - testItem.insertBefore(todoLabel, testTitle); - } - - time = document$$1.createElement("span"); - time.className = "runtime"; - time.innerHTML = details.runtime + " ms"; - testItem.insertBefore(time, assertList); - - if (!testPassed) { - stats.failedTests++; - } else if (details.todo) { - stats.todoTests++; - } else { - stats.passedTests++; - } - } - - // Show the source of the test when showing assertions - if (details.source) { - sourceName = document$$1.createElement("p"); - sourceName.innerHTML = "<strong>Source: </strong>" + details.source; - addClass(sourceName, "qunit-source"); - if (testPassed) { - addClass(sourceName, "qunit-collapsed"); - } - addEvent(testTitle, "click", function () { - toggleClass(sourceName, "qunit-collapsed"); - }); - testItem.appendChild(sourceName); - } - }); - - // Avoid readyState issue with phantomjs - // Ref: #818 - var notPhantom = function (p) { - return !(p && p.version && p.version.major > 0); - }(window.phantom); - - if (notPhantom && document$$1.readyState === "complete") { - QUnit.load(); - } else { - addEvent(window, "load", QUnit.load); - } - - // Wrap window.onerror. We will call the original window.onerror to see if - // the existing handler fully handles the error; if not, we will call the - // QUnit.onError function. - var originalWindowOnError = window.onerror; - - // Cover uncaught exceptions - // Returning true will suppress the default browser handler, - // returning false will let it run. - window.onerror = function (message, fileName, lineNumber) { - var ret = false; - if (originalWindowOnError) { - for (var _len = arguments.length, args = Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) { - args[_key - 3] = arguments[_key]; - } - - ret = originalWindowOnError.call.apply(originalWindowOnError, [this, message, fileName, lineNumber].concat(args)); - } - - // Treat return value as window.onerror itself does, - // Only do our handling if not suppressed. - if (ret !== true) { - var error = { - message: message, - fileName: fileName, - lineNumber: lineNumber - }; - - ret = QUnit.onError(error); - } - - return ret; - }; - - // Listen for unhandled rejections, and call QUnit.onUnhandledRejection - window.addEventListener("unhandledrejection", function (event) { - QUnit.onUnhandledRejection(event.reason); - }); + // Don't load the HTML Reporter on non-browser environments + if (typeof window === "undefined" || !window.document) { + return; + } + + var config = QUnit.config, + document$$1 = window.document, + collapseNext = false, + hasOwn = Object.prototype.hasOwnProperty, + unfilteredUrl = setUrl({ + filter: undefined, module: undefined, + moduleId: undefined, testId: undefined + }), + modulesList = []; + + function addEvent(elem, type, fn) { + elem.addEventListener(type, fn, false); + } + + function removeEvent(elem, type, fn) { + elem.removeEventListener(type, fn, false); + } + + function addEvents(elems, type, fn) { + var i = elems.length; + while (i--) { + addEvent(elems[i], type, fn); + } + } + + function hasClass(elem, name) { + return (" " + elem.className + " ").indexOf(" " + name + " ") >= 0; + } + + function addClass(elem, name) { + if (!hasClass(elem, name)) { + elem.className += (elem.className ? " " : "") + name; + } + } + + function toggleClass(elem, name, force) { + if (force || typeof force === "undefined" && !hasClass(elem, name)) { + addClass(elem, name); + } else { + removeClass(elem, name); + } + } + + function removeClass(elem, name) { + var set = " " + elem.className + " "; + + // Class name may appear multiple times + while (set.indexOf(" " + name + " ") >= 0) { + set = set.replace(" " + name + " ", " "); + } + + // Trim for prettiness + elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, ""); + } + + function id(name) { + return document$$1.getElementById && document$$1.getElementById(name); + } + + function abortTests() { + var abortButton = id("qunit-abort-tests-button"); + if (abortButton) { + abortButton.disabled = true; + abortButton.innerHTML = "Aborting..."; + } + QUnit.config.queue.length = 0; + return false; + } + + function interceptNavigation(ev) { + applyUrlParams(); + + if (ev && ev.preventDefault) { + ev.preventDefault(); + } + + return false; + } + + function getUrlConfigHtml() { + var i, + j, + val, + escaped, + escapedTooltip, + selection = false, + urlConfig = config.urlConfig, + urlConfigHtml = ""; + + for (i = 0; i < urlConfig.length; i++) { + + // Options can be either strings or objects with nonempty "id" properties + val = config.urlConfig[i]; + if (typeof val === "string") { + val = { + id: val, + label: val + }; + } + + escaped = escapeText(val.id); + escapedTooltip = escapeText(val.tooltip); + + if (!val.value || typeof val.value === "string") { + urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' type='checkbox'" + (val.value ? " value='" + escapeText(val.value) + "'" : "") + (config[val.id] ? " checked='checked'" : "") + " title='" + escapedTooltip + "' />" + escapeText(val.label) + "</label>"; + } else { + urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'>" + val.label + ": </label><select id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>"; + + if (QUnit.is("array", val.value)) { + for (j = 0; j < val.value.length; j++) { + escaped = escapeText(val.value[j]); + urlConfigHtml += "<option value='" + escaped + "'" + (config[val.id] === val.value[j] ? (selection = true) && " selected='selected'" : "") + ">" + escaped + "</option>"; + } + } else { + for (j in val.value) { + if (hasOwn.call(val.value, j)) { + urlConfigHtml += "<option value='" + escapeText(j) + "'" + (config[val.id] === j ? (selection = true) && " selected='selected'" : "") + ">" + escapeText(val.value[j]) + "</option>"; + } + } + } + if (config[val.id] && !selection) { + escaped = escapeText(config[val.id]); + urlConfigHtml += "<option value='" + escaped + "' selected='selected' disabled='disabled'>" + escaped + "</option>"; + } + urlConfigHtml += "</select>"; + } + } + + return urlConfigHtml; + } + + // Handle "click" events on toolbar checkboxes and "change" for select menus. + // Updates the URL with the new state of `config.urlConfig` values. + function toolbarChanged() { + var updatedUrl, + value, + tests, + field = this, + params = {}; + + // Detect if field is a select menu or a checkbox + if ("selectedIndex" in field) { + value = field.options[field.selectedIndex].value || undefined; + } else { + value = field.checked ? field.defaultValue || true : undefined; + } + + params[field.name] = value; + updatedUrl = setUrl(params); + + // Check if we can apply the change without a page refresh + if ("hidepassed" === field.name && "replaceState" in window.history) { + QUnit.urlParams[field.name] = value; + config[field.name] = value || false; + tests = id("qunit-tests"); + if (tests) { + toggleClass(tests, "hidepass", value || false); + } + window.history.replaceState(null, "", updatedUrl); + } else { + window.location = updatedUrl; + } + } + + function setUrl(params) { + var key, + arrValue, + i, + querystring = "?", + location = window.location; + + params = QUnit.extend(QUnit.extend({}, QUnit.urlParams), params); + + for (key in params) { + + // Skip inherited or undefined properties + if (hasOwn.call(params, key) && params[key] !== undefined) { + + // Output a parameter for each value of this key + // (but usually just one) + arrValue = [].concat(params[key]); + for (i = 0; i < arrValue.length; i++) { + querystring += encodeURIComponent(key); + if (arrValue[i] !== true) { + querystring += "=" + encodeURIComponent(arrValue[i]); + } + querystring += "&"; + } + } + } + return location.protocol + "//" + location.host + location.pathname + querystring.slice(0, -1); + } + + function applyUrlParams() { + var i, + selectedModules = [], + modulesList = id("qunit-modulefilter-dropdown-list").getElementsByTagName("input"), + filter = id("qunit-filter-input").value; + + for (i = 0; i < modulesList.length; i++) { + if (modulesList[i].checked) { + selectedModules.push(modulesList[i].value); + } + } + + window.location = setUrl({ + filter: filter === "" ? undefined : filter, + moduleId: selectedModules.length === 0 ? undefined : selectedModules, + + // Remove module and testId filter + module: undefined, + testId: undefined + }); + } + + function toolbarUrlConfigContainer() { + var urlConfigContainer = document$$1.createElement("span"); + + urlConfigContainer.innerHTML = getUrlConfigHtml(); + addClass(urlConfigContainer, "qunit-url-config"); + + addEvents(urlConfigContainer.getElementsByTagName("input"), "change", toolbarChanged); + addEvents(urlConfigContainer.getElementsByTagName("select"), "change", toolbarChanged); + + return urlConfigContainer; + } + + function abortTestsButton() { + var button = document$$1.createElement("button"); + button.id = "qunit-abort-tests-button"; + button.innerHTML = "Abort"; + addEvent(button, "click", abortTests); + return button; + } + + function toolbarLooseFilter() { + var filter = document$$1.createElement("form"), + label = document$$1.createElement("label"), + input = document$$1.createElement("input"), + button = document$$1.createElement("button"); + + addClass(filter, "qunit-filter"); + + label.innerHTML = "Filter: "; + + input.type = "text"; + input.value = config.filter || ""; + input.name = "filter"; + input.id = "qunit-filter-input"; + + button.innerHTML = "Go"; + + label.appendChild(input); + + filter.appendChild(label); + filter.appendChild(document$$1.createTextNode(" ")); + filter.appendChild(button); + addEvent(filter, "submit", interceptNavigation); + + return filter; + } + + function moduleListHtml() { + var i, + checked, + html = ""; + + for (i = 0; i < config.modules.length; i++) { + if (config.modules[i].name !== "") { + checked = config.moduleId.indexOf(config.modules[i].moduleId) > -1; + html += "<li><label class='clickable" + (checked ? " checked" : "") + "'><input type='checkbox' " + "value='" + config.modules[i].moduleId + "'" + (checked ? " checked='checked'" : "") + " />" + escapeText(config.modules[i].name) + "</label></li>"; + } + } + + return html; + } + + function toolbarModuleFilter() { + var allCheckbox, + commit, + reset, + moduleFilter = document$$1.createElement("form"), + label = document$$1.createElement("label"), + moduleSearch = document$$1.createElement("input"), + dropDown = document$$1.createElement("div"), + actions = document$$1.createElement("span"), + dropDownList = document$$1.createElement("ul"), + dirty = false; + + moduleSearch.id = "qunit-modulefilter-search"; + addEvent(moduleSearch, "input", searchInput); + addEvent(moduleSearch, "input", searchFocus); + addEvent(moduleSearch, "focus", searchFocus); + addEvent(moduleSearch, "click", searchFocus); + + label.id = "qunit-modulefilter-search-container"; + label.innerHTML = "Module: "; + label.appendChild(moduleSearch); + + actions.id = "qunit-modulefilter-actions"; + actions.innerHTML = "<button style='display:none'>Apply</button>" + "<button type='reset' style='display:none'>Reset</button>" + "<label class='clickable" + (config.moduleId.length ? "" : " checked") + "'><input type='checkbox'" + (config.moduleId.length ? "" : " checked='checked'") + ">All modules</label>"; + allCheckbox = actions.lastChild.firstChild; + commit = actions.firstChild; + reset = commit.nextSibling; + addEvent(commit, "click", applyUrlParams); + + dropDownList.id = "qunit-modulefilter-dropdown-list"; + dropDownList.innerHTML = moduleListHtml(); + + dropDown.id = "qunit-modulefilter-dropdown"; + dropDown.style.display = "none"; + dropDown.appendChild(actions); + dropDown.appendChild(dropDownList); + addEvent(dropDown, "change", selectionChange); + selectionChange(); + + moduleFilter.id = "qunit-modulefilter"; + moduleFilter.appendChild(label); + moduleFilter.appendChild(dropDown); + addEvent(moduleFilter, "submit", interceptNavigation); + addEvent(moduleFilter, "reset", function () { + + // Let the reset happen, then update styles + window.setTimeout(selectionChange); + }); + + // Enables show/hide for the dropdown + function searchFocus() { + if (dropDown.style.display !== "none") { + return; + } + + dropDown.style.display = "block"; + addEvent(document$$1, "click", hideHandler); + addEvent(document$$1, "keydown", hideHandler); + + // Hide on Escape keydown or outside-container click + function hideHandler(e) { + var inContainer = moduleFilter.contains(e.target); + + if (e.keyCode === 27 || !inContainer) { + if (e.keyCode === 27 && inContainer) { + moduleSearch.focus(); + } + dropDown.style.display = "none"; + removeEvent(document$$1, "click", hideHandler); + removeEvent(document$$1, "keydown", hideHandler); + moduleSearch.value = ""; + searchInput(); + } + } + } + + // Processes module search box input + function searchInput() { + var i, + item, + searchText = moduleSearch.value.toLowerCase(), + listItems = dropDownList.children; + + for (i = 0; i < listItems.length; i++) { + item = listItems[i]; + if (!searchText || item.textContent.toLowerCase().indexOf(searchText) > -1) { + item.style.display = ""; + } else { + item.style.display = "none"; + } + } + } + + // Processes selection changes + function selectionChange(evt) { + var i, + item, + checkbox = evt && evt.target || allCheckbox, + modulesList = dropDownList.getElementsByTagName("input"), + selectedNames = []; + + toggleClass(checkbox.parentNode, "checked", checkbox.checked); + + dirty = false; + if (checkbox.checked && checkbox !== allCheckbox) { + allCheckbox.checked = false; + removeClass(allCheckbox.parentNode, "checked"); + } + for (i = 0; i < modulesList.length; i++) { + item = modulesList[i]; + if (!evt) { + toggleClass(item.parentNode, "checked", item.checked); + } else if (checkbox === allCheckbox && checkbox.checked) { + item.checked = false; + removeClass(item.parentNode, "checked"); + } + dirty = dirty || item.checked !== item.defaultChecked; + if (item.checked) { + selectedNames.push(item.parentNode.textContent); + } + } + + commit.style.display = reset.style.display = dirty ? "" : "none"; + moduleSearch.placeholder = selectedNames.join(", ") || allCheckbox.parentNode.textContent; + moduleSearch.title = "Type to filter list. Current selection:\n" + (selectedNames.join("\n") || allCheckbox.parentNode.textContent); + } + + return moduleFilter; + } + + function appendToolbar() { + var toolbar = id("qunit-testrunner-toolbar"); + + if (toolbar) { + toolbar.appendChild(toolbarUrlConfigContainer()); + toolbar.appendChild(toolbarModuleFilter()); + toolbar.appendChild(toolbarLooseFilter()); + toolbar.appendChild(document$$1.createElement("div")).className = "clearfix"; + } + } + + function appendHeader() { + var header = id("qunit-header"); + + if (header) { + header.innerHTML = "<a href='" + escapeText(unfilteredUrl) + "'>" + header.innerHTML + "</a> "; + } + } + + function appendBanner() { + var banner = id("qunit-banner"); + + if (banner) { + banner.className = ""; + } + } + + function appendTestResults() { + var tests = id("qunit-tests"), + result = id("qunit-testresult"), + controls; + + if (result) { + result.parentNode.removeChild(result); + } + + if (tests) { + tests.innerHTML = ""; + result = document$$1.createElement("p"); + result.id = "qunit-testresult"; + result.className = "result"; + tests.parentNode.insertBefore(result, tests); + result.innerHTML = "<div id=\"qunit-testresult-display\">Running...<br /> </div>" + "<div id=\"qunit-testresult-controls\"></div>" + "<div class=\"clearfix\"></div>"; + controls = id("qunit-testresult-controls"); + } + + if (controls) { + controls.appendChild(abortTestsButton()); + } + } + + function appendFilteredTest() { + var testId = QUnit.config.testId; + if (!testId || testId.length <= 0) { + return ""; + } + return "<div id='qunit-filteredTest'>Rerunning selected tests: " + escapeText(testId.join(", ")) + " <a id='qunit-clearFilter' href='" + escapeText(unfilteredUrl) + "'>Run all tests</a></div>"; + } + + function appendUserAgent() { + var userAgent = id("qunit-userAgent"); + + if (userAgent) { + userAgent.innerHTML = ""; + userAgent.appendChild(document$$1.createTextNode("QUnit " + QUnit.version + "; " + navigator.userAgent)); + } + } + + function appendInterface() { + var qunit = id("qunit"); + + if (qunit) { + qunit.innerHTML = "<h1 id='qunit-header'>" + escapeText(document$$1.title) + "</h1>" + "<h2 id='qunit-banner'></h2>" + "<div id='qunit-testrunner-toolbar'></div>" + appendFilteredTest() + "<h2 id='qunit-userAgent'></h2>" + "<ol id='qunit-tests'></ol>"; + } + + appendHeader(); + appendBanner(); + appendTestResults(); + appendUserAgent(); + appendToolbar(); + } + + function appendTestsList(modules) { + var i, l, x, z, test, moduleObj; + + for (i = 0, l = modules.length; i < l; i++) { + moduleObj = modules[i]; + + for (x = 0, z = moduleObj.tests.length; x < z; x++) { + test = moduleObj.tests[x]; + + appendTest(test.name, test.testId, moduleObj.name); + } + } + } + + function appendTest(name, testId, moduleName) { + var title, + rerunTrigger, + testBlock, + assertList, + tests = id("qunit-tests"); + + if (!tests) { + return; + } + + title = document$$1.createElement("strong"); + title.innerHTML = getNameHtml(name, moduleName); + + rerunTrigger = document$$1.createElement("a"); + rerunTrigger.innerHTML = "Rerun"; + rerunTrigger.href = setUrl({testId: testId}); + + testBlock = document$$1.createElement("li"); + testBlock.appendChild(title); + testBlock.appendChild(rerunTrigger); + testBlock.id = "qunit-test-output-" + testId; + + assertList = document$$1.createElement("ol"); + assertList.className = "qunit-assert-list"; + + testBlock.appendChild(assertList); + + tests.appendChild(testBlock); + } + + // HTML Reporter initialization and load + QUnit.begin(function (details) { + var i, moduleObj, tests; + + // Sort modules by name for the picker + for (i = 0; i < details.modules.length; i++) { + moduleObj = details.modules[i]; + if (moduleObj.name) { + modulesList.push(moduleObj.name); + } + } + modulesList.sort(function (a, b) { + return a.localeCompare(b); + }); + + // Initialize QUnit elements + appendInterface(); + appendTestsList(details.modules); + tests = id("qunit-tests"); + if (tests && config.hidepassed) { + addClass(tests, "hidepass"); + } + }); + + QUnit.done(function (details) { + var banner = id("qunit-banner"), + tests = id("qunit-tests"), + abortButton = id("qunit-abort-tests-button"), + totalTests = stats.passedTests + stats.skippedTests + stats.todoTests + stats.failedTests, + html = [totalTests, " tests completed in ", details.runtime, " milliseconds, with ", stats.failedTests, " failed, ", stats.skippedTests, " skipped, and ", stats.todoTests, " todo.<br />", "<span class='passed'>", details.passed, "</span> assertions of <span class='total'>", details.total, "</span> passed, <span class='failed'>", details.failed, "</span> failed."].join(""), + test, + assertLi, + assertList; + + // Update remaing tests to aborted + if (abortButton && abortButton.disabled) { + html = "Tests aborted after " + details.runtime + " milliseconds."; + + for (var i = 0; i < tests.children.length; i++) { + test = tests.children[i]; + if (test.className === "" || test.className === "running") { + test.className = "aborted"; + assertList = test.getElementsByTagName("ol")[0]; + assertLi = document$$1.createElement("li"); + assertLi.className = "fail"; + assertLi.innerHTML = "Test aborted."; + assertList.appendChild(assertLi); + } + } + } + + if (banner && (!abortButton || abortButton.disabled === false)) { + banner.className = stats.failedTests ? "qunit-fail" : "qunit-pass"; + } + + if (abortButton) { + abortButton.parentNode.removeChild(abortButton); + } + + if (tests) { + id("qunit-testresult-display").innerHTML = html; + } + + if (config.altertitle && document$$1.title) { + + // Show ✖ for good, ✔ for bad suite result in title + // use escape sequences in case file gets loaded with non-utf-8 + // charset + document$$1.title = [stats.failedTests ? "\u2716" : "\u2714", document$$1.title.replace(/^[\u2714\u2716] /i, "")].join(" "); + } + + // Scroll back to top to show results + if (config.scrolltop && window.scrollTo) { + window.scrollTo(0, 0); + } + }); + + function getNameHtml(name, module) { + var nameHtml = ""; + + if (module) { + nameHtml = "<span class='module-name'>" + escapeText(module) + "</span>: "; + } + + nameHtml += "<span class='test-name'>" + escapeText(name) + "</span>"; + + return nameHtml; + } + + QUnit.testStart(function (details) { + var running, testBlock, bad; + + testBlock = id("qunit-test-output-" + details.testId); + if (testBlock) { + testBlock.className = "running"; + } else { + + // Report later registered tests + appendTest(details.name, details.testId, details.module); + } + + running = id("qunit-testresult-display"); + if (running) { + bad = QUnit.config.reorder && details.previousFailure; + + running.innerHTML = [bad ? "Rerunning previously failed test: <br />" : "Running: <br />", getNameHtml(details.name, details.module)].join(""); + } + }); + + function stripHtml(string) { + + // Strip tags, html entity and whitespaces + return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/\"/g, "").replace(/\s+/g, ""); + } + + QUnit.log(function (details) { + var assertList, + assertLi, + message, + expected, + actual, + diff, + showDiff = false, + testItem = id("qunit-test-output-" + details.testId); + + if (!testItem) { + return; + } + + message = escapeText(details.message) || (details.result ? "okay" : "failed"); + message = "<span class='test-message'>" + message + "</span>"; + message += "<span class='runtime'>@ " + details.runtime + " ms</span>"; + + // The pushFailure doesn't provide details.expected + // when it calls, it's implicit to also not show expected and diff stuff + // Also, we need to check details.expected existence, as it can exist and be undefined + if (!details.result && hasOwn.call(details, "expected")) { + if (details.negative) { + expected = "NOT " + QUnit.dump.parse(details.expected); + } else { + expected = QUnit.dump.parse(details.expected); + } + + actual = QUnit.dump.parse(details.actual); + message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + escapeText(expected) + "</pre></td></tr>"; + + if (actual !== expected) { + + message += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText(actual) + "</pre></td></tr>"; + + if (typeof details.actual === "number" && typeof details.expected === "number") { + if (!isNaN(details.actual) && !isNaN(details.expected)) { + showDiff = true; + diff = details.actual - details.expected; + diff = (diff > 0 ? "+" : "") + diff; + } + } else if (typeof details.actual !== "boolean" && typeof details.expected !== "boolean") { + diff = QUnit.diff(expected, actual); + + // don't show diff if there is zero overlap + showDiff = stripHtml(diff).length !== stripHtml(expected).length + stripHtml(actual).length; + } + + if (showDiff) { + message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + diff + "</pre></td></tr>"; + } + } else if (expected.indexOf("[object Array]") !== -1 || expected.indexOf("[object Object]") !== -1) { + message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the depth of object is more than current max depth (" + QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " + " run with a higher max depth or <a href='" + escapeText(setUrl({maxDepth: -1})) + "'>" + "Rerun</a> without max depth.</p></td></tr>"; + } else { + message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the expected and actual results have an equivalent" + " serialization</td></tr>"; + } + + if (details.source) { + message += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>"; + } + + message += "</table>"; + + // This occurs when pushFailure is set and we have an extracted stack trace + } else if (!details.result && details.source) { + message += "<table>" + "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>" + "</table>"; + } + + assertList = testItem.getElementsByTagName("ol")[0]; + + assertLi = document$$1.createElement("li"); + assertLi.className = details.result ? "pass" : "fail"; + assertLi.innerHTML = message; + assertList.appendChild(assertLi); + }); + + QUnit.testDone(function (details) { + var testTitle, + time, + testItem, + assertList, + good, + bad, + testCounts, + skipped, + sourceName, + tests = id("qunit-tests"); + + if (!tests) { + return; + } + + testItem = id("qunit-test-output-" + details.testId); + + assertList = testItem.getElementsByTagName("ol")[0]; + + good = details.passed; + bad = details.failed; + + // This test passed if it has no unexpected failed assertions + var testPassed = details.failed > 0 ? details.todo : !details.todo; + + if (testPassed) { + + // Collapse the passing tests + addClass(assertList, "qunit-collapsed"); + } else if (config.collapse) { + if (!collapseNext) { + + // Skip collapsing the first failing test + collapseNext = true; + } else { + + // Collapse remaining tests + addClass(assertList, "qunit-collapsed"); + } + } + + // The testItem.firstChild is the test name + testTitle = testItem.firstChild; + + testCounts = bad ? "<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " : ""; + + testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ")</b>"; + + if (details.skipped) { + stats.skippedTests++; + + testItem.className = "skipped"; + skipped = document$$1.createElement("em"); + skipped.className = "qunit-skipped-label"; + skipped.innerHTML = "skipped"; + testItem.insertBefore(skipped, testTitle); + } else { + addEvent(testTitle, "click", function () { + toggleClass(assertList, "qunit-collapsed"); + }); + + testItem.className = testPassed ? "pass" : "fail"; + + if (details.todo) { + var todoLabel = document$$1.createElement("em"); + todoLabel.className = "qunit-todo-label"; + todoLabel.innerHTML = "todo"; + testItem.className += " todo"; + testItem.insertBefore(todoLabel, testTitle); + } + + time = document$$1.createElement("span"); + time.className = "runtime"; + time.innerHTML = details.runtime + " ms"; + testItem.insertBefore(time, assertList); + + if (!testPassed) { + stats.failedTests++; + } else if (details.todo) { + stats.todoTests++; + } else { + stats.passedTests++; + } + } + + // Show the source of the test when showing assertions + if (details.source) { + sourceName = document$$1.createElement("p"); + sourceName.innerHTML = "<strong>Source: </strong>" + details.source; + addClass(sourceName, "qunit-source"); + if (testPassed) { + addClass(sourceName, "qunit-collapsed"); + } + addEvent(testTitle, "click", function () { + toggleClass(sourceName, "qunit-collapsed"); + }); + testItem.appendChild(sourceName); + } + }); + + // Avoid readyState issue with phantomjs + // Ref: #818 + var notPhantom = function (p) { + return !(p && p.version && p.version.major > 0); + }(window.phantom); + + if (notPhantom && document$$1.readyState === "complete") { + QUnit.load(); + } else { + addEvent(window, "load", QUnit.load); + } + + // Wrap window.onerror. We will call the original window.onerror to see if + // the existing handler fully handles the error; if not, we will call the + // QUnit.onError function. + var originalWindowOnError = window.onerror; + + // Cover uncaught exceptions + // Returning true will suppress the default browser handler, + // returning false will let it run. + window.onerror = function (message, fileName, lineNumber) { + var ret = false; + if (originalWindowOnError) { + for (var _len = arguments.length, args = Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) { + args[_key - 3] = arguments[_key]; + } + + ret = originalWindowOnError.call.apply(originalWindowOnError, [this, message, fileName, lineNumber].concat(args)); + } + + // Treat return value as window.onerror itself does, + // Only do our handling if not suppressed. + if (ret !== true) { + var error = { + message: message, + fileName: fileName, + lineNumber: lineNumber + }; + + ret = QUnit.onError(error); + } + + return ret; + }; + + // Listen for unhandled rejections, and call QUnit.onUnhandledRejection + window.addEventListener("unhandledrejection", function (event) { + QUnit.onUnhandledRejection(event.reason); + }); })(); /* @@ -4143,135 +4107,137 @@ * */ QUnit.diff = function () { - function DiffMatchPatch() {} - - // DIFF FUNCTIONS - - /** - * The data structure representing a diff is an array of tuples: - * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']] - * which means: delete 'Hello', add 'Goodbye' and keep ' world.' - */ - var DIFF_DELETE = -1, - DIFF_INSERT = 1, - DIFF_EQUAL = 0; - - /** - * Find the differences between two texts. Simplifies the problem by stripping - * any common prefix or suffix off the texts before diffing. - * @param {string} text1 Old string to be diffed. - * @param {string} text2 New string to be diffed. - * @param {boolean=} optChecklines Optional speedup flag. If present and false, - * then don't run a line-level diff first to identify the changed areas. - * Defaults to true, which does a faster, slightly less optimal diff. - * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. - */ - DiffMatchPatch.prototype.DiffMain = function (text1, text2, optChecklines) { - var deadline, checklines, commonlength, commonprefix, commonsuffix, diffs; - - // The diff must be complete in up to 1 second. - deadline = new Date().getTime() + 1000; - - // Check for null inputs. - if (text1 === null || text2 === null) { - throw new Error("Null input. (DiffMain)"); - } - - // Check for equality (speedup). - if (text1 === text2) { - if (text1) { - return [[DIFF_EQUAL, text1]]; - } - return []; - } - - if (typeof optChecklines === "undefined") { - optChecklines = true; - } - - checklines = optChecklines; - - // Trim off common prefix (speedup). - commonlength = this.diffCommonPrefix(text1, text2); - commonprefix = text1.substring(0, commonlength); - text1 = text1.substring(commonlength); - text2 = text2.substring(commonlength); - - // Trim off common suffix (speedup). - commonlength = this.diffCommonSuffix(text1, text2); - commonsuffix = text1.substring(text1.length - commonlength); - text1 = text1.substring(0, text1.length - commonlength); - text2 = text2.substring(0, text2.length - commonlength); - - // Compute the diff on the middle block. - diffs = this.diffCompute(text1, text2, checklines, deadline); - - // Restore the prefix and suffix. - if (commonprefix) { - diffs.unshift([DIFF_EQUAL, commonprefix]); - } - if (commonsuffix) { - diffs.push([DIFF_EQUAL, commonsuffix]); - } - this.diffCleanupMerge(diffs); - return diffs; - }; - - /** - * Reduce the number of edits by eliminating operationally trivial equalities. - * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. - */ - DiffMatchPatch.prototype.diffCleanupEfficiency = function (diffs) { - var changes, equalities, equalitiesLength, lastequality, pointer, preIns, preDel, postIns, postDel; - changes = false; - equalities = []; // Stack of indices where equalities are found. - equalitiesLength = 0; // Keeping our own length var is faster in JS. - /** @type {?string} */ - lastequality = null; - - // Always equal to diffs[equalities[equalitiesLength - 1]][1] - pointer = 0; // Index of current position. - - // Is there an insertion operation before the last equality. - preIns = false; - - // Is there a deletion operation before the last equality. - preDel = false; - - // Is there an insertion operation after the last equality. - postIns = false; - - // Is there a deletion operation after the last equality. - postDel = false; - while (pointer < diffs.length) { - - // Equality found. - if (diffs[pointer][0] === DIFF_EQUAL) { - if (diffs[pointer][1].length < 4 && (postIns || postDel)) { - - // Candidate found. - equalities[equalitiesLength++] = pointer; - preIns = postIns; - preDel = postDel; - lastequality = diffs[pointer][1]; - } else { - - // Not a candidate, and can never become one. - equalitiesLength = 0; - lastequality = null; - } - postIns = postDel = false; - - // An insertion or deletion. - } else { - - if (diffs[pointer][0] === DIFF_DELETE) { - postDel = true; - } else { - postIns = true; - } - - /* + function DiffMatchPatch() { + } + + // DIFF FUNCTIONS + + /** + * The data structure representing a diff is an array of tuples: + * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']] + * which means: delete 'Hello', add 'Goodbye' and keep ' world.' + */ + var DIFF_DELETE = -1, + DIFF_INSERT = 1, + DIFF_EQUAL = 0; + + /** + * Find the differences between two texts. Simplifies the problem by stripping + * any common prefix or suffix off the texts before diffing. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {boolean=} optChecklines Optional speedup flag. If present and false, + * then don't run a line-level diff first to identify the changed areas. + * Defaults to true, which does a faster, slightly less optimal diff. + * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. + */ + DiffMatchPatch.prototype.DiffMain = function (text1, text2, optChecklines) { + var deadline, checklines, commonlength, commonprefix, commonsuffix, diffs; + + // The diff must be complete in up to 1 second. + deadline = new Date().getTime() + 1000; + + // Check for null inputs. + if (text1 === null || text2 === null) { + throw new Error("Null input. (DiffMain)"); + } + + // Check for equality (speedup). + if (text1 === text2) { + if (text1) { + return [[DIFF_EQUAL, text1]]; + } + return []; + } + + if (typeof optChecklines === "undefined") { + optChecklines = true; + } + + checklines = optChecklines; + + // Trim off common prefix (speedup). + commonlength = this.diffCommonPrefix(text1, text2); + commonprefix = text1.substring(0, commonlength); + text1 = text1.substring(commonlength); + text2 = text2.substring(commonlength); + + // Trim off common suffix (speedup). + commonlength = this.diffCommonSuffix(text1, text2); + commonsuffix = text1.substring(text1.length - commonlength); + text1 = text1.substring(0, text1.length - commonlength); + text2 = text2.substring(0, text2.length - commonlength); + + // Compute the diff on the middle block. + diffs = this.diffCompute(text1, text2, checklines, deadline); + + // Restore the prefix and suffix. + if (commonprefix) { + diffs.unshift([DIFF_EQUAL, commonprefix]); + } + if (commonsuffix) { + diffs.push([DIFF_EQUAL, commonsuffix]); + } + this.diffCleanupMerge(diffs); + return diffs; + }; + + /** + * Reduce the number of edits by eliminating operationally trivial equalities. + * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. + */ + DiffMatchPatch.prototype.diffCleanupEfficiency = function (diffs) { + var changes, equalities, equalitiesLength, lastequality, pointer, preIns, preDel, postIns, + postDel; + changes = false; + equalities = []; // Stack of indices where equalities are found. + equalitiesLength = 0; // Keeping our own length var is faster in JS. + /** @type {?string} */ + lastequality = null; + + // Always equal to diffs[equalities[equalitiesLength - 1]][1] + pointer = 0; // Index of current position. + + // Is there an insertion operation before the last equality. + preIns = false; + + // Is there a deletion operation before the last equality. + preDel = false; + + // Is there an insertion operation after the last equality. + postIns = false; + + // Is there a deletion operation after the last equality. + postDel = false; + while (pointer < diffs.length) { + + // Equality found. + if (diffs[pointer][0] === DIFF_EQUAL) { + if (diffs[pointer][1].length < 4 && (postIns || postDel)) { + + // Candidate found. + equalities[equalitiesLength++] = pointer; + preIns = postIns; + preDel = postDel; + lastequality = diffs[pointer][1]; + } else { + + // Not a candidate, and can never become one. + equalitiesLength = 0; + lastequality = null; + } + postIns = postDel = false; + + // An insertion or deletion. + } else { + + if (diffs[pointer][0] === DIFF_DELETE) { + postDel = true; + } else { + postIns = true; + } + + /* * Five types to be split: * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del> * <ins>A</ins>X<ins>C</ins><del>D</del> @@ -4279,910 +4245,918 @@ * <ins>A</del>X<ins>C</ins><del>D</del> * <ins>A</ins><del>B</del>X<del>C</del> */ - if (lastequality && (preIns && preDel && postIns && postDel || lastequality.length < 2 && preIns + preDel + postIns + postDel === 3)) { - - // Duplicate record. - diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]); - - // Change second copy to insert. - diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT; - equalitiesLength--; // Throw away the equality we just deleted; - lastequality = null; - if (preIns && preDel) { - - // No changes made which could affect previous entry, keep going. - postIns = postDel = true; - equalitiesLength = 0; - } else { - equalitiesLength--; // Throw away the previous equality. - pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1; - postIns = postDel = false; - } - changes = true; - } - } - pointer++; - } - - if (changes) { - this.diffCleanupMerge(diffs); - } - }; - - /** - * Convert a diff array into a pretty HTML report. - * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. - * @param {integer} string to be beautified. - * @return {string} HTML representation. - */ - DiffMatchPatch.prototype.diffPrettyHtml = function (diffs) { - var op, - data, - x, - html = []; - for (x = 0; x < diffs.length; x++) { - op = diffs[x][0]; // Operation (insert, delete, equal) - data = diffs[x][1]; // Text of change. - switch (op) { - case DIFF_INSERT: - html[x] = "<ins>" + escapeText(data) + "</ins>"; - break; - case DIFF_DELETE: - html[x] = "<del>" + escapeText(data) + "</del>"; - break; - case DIFF_EQUAL: - html[x] = "<span>" + escapeText(data) + "</span>"; - break; - } - } - return html.join(""); - }; - - /** - * Determine the common prefix of two strings. - * @param {string} text1 First string. - * @param {string} text2 Second string. - * @return {number} The number of characters common to the start of each - * string. - */ - DiffMatchPatch.prototype.diffCommonPrefix = function (text1, text2) { - var pointermid, pointermax, pointermin, pointerstart; - - // Quick check for common null cases. - if (!text1 || !text2 || text1.charAt(0) !== text2.charAt(0)) { - return 0; - } - - // Binary search. - // Performance analysis: https://neil.fraser.name/news/2007/10/09/ - pointermin = 0; - pointermax = Math.min(text1.length, text2.length); - pointermid = pointermax; - pointerstart = 0; - while (pointermin < pointermid) { - if (text1.substring(pointerstart, pointermid) === text2.substring(pointerstart, pointermid)) { - pointermin = pointermid; - pointerstart = pointermin; - } else { - pointermax = pointermid; - } - pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin); - } - return pointermid; - }; - - /** - * Determine the common suffix of two strings. - * @param {string} text1 First string. - * @param {string} text2 Second string. - * @return {number} The number of characters common to the end of each string. - */ - DiffMatchPatch.prototype.diffCommonSuffix = function (text1, text2) { - var pointermid, pointermax, pointermin, pointerend; - - // Quick check for common null cases. - if (!text1 || !text2 || text1.charAt(text1.length - 1) !== text2.charAt(text2.length - 1)) { - return 0; - } - - // Binary search. - // Performance analysis: https://neil.fraser.name/news/2007/10/09/ - pointermin = 0; - pointermax = Math.min(text1.length, text2.length); - pointermid = pointermax; - pointerend = 0; - while (pointermin < pointermid) { - if (text1.substring(text1.length - pointermid, text1.length - pointerend) === text2.substring(text2.length - pointermid, text2.length - pointerend)) { - pointermin = pointermid; - pointerend = pointermin; - } else { - pointermax = pointermid; - } - pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin); - } - return pointermid; - }; - - /** - * Find the differences between two texts. Assumes that the texts do not - * have any common prefix or suffix. - * @param {string} text1 Old string to be diffed. - * @param {string} text2 New string to be diffed. - * @param {boolean} checklines Speedup flag. If false, then don't run a - * line-level diff first to identify the changed areas. - * If true, then run a faster, slightly less optimal diff. - * @param {number} deadline Time when the diff should be complete by. - * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. - * @private - */ - DiffMatchPatch.prototype.diffCompute = function (text1, text2, checklines, deadline) { - var diffs, longtext, shorttext, i, hm, text1A, text2A, text1B, text2B, midCommon, diffsA, diffsB; - - if (!text1) { - - // Just add some text (speedup). - return [[DIFF_INSERT, text2]]; - } - - if (!text2) { - - // Just delete some text (speedup). - return [[DIFF_DELETE, text1]]; - } - - longtext = text1.length > text2.length ? text1 : text2; - shorttext = text1.length > text2.length ? text2 : text1; - i = longtext.indexOf(shorttext); - if (i !== -1) { - - // Shorter text is inside the longer text (speedup). - diffs = [[DIFF_INSERT, longtext.substring(0, i)], [DIFF_EQUAL, shorttext], [DIFF_INSERT, longtext.substring(i + shorttext.length)]]; - - // Swap insertions for deletions if diff is reversed. - if (text1.length > text2.length) { - diffs[0][0] = diffs[2][0] = DIFF_DELETE; - } - return diffs; - } - - if (shorttext.length === 1) { - - // Single character string. - // After the previous speedup, the character can't be an equality. - return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]]; - } - - // Check to see if the problem can be split in two. - hm = this.diffHalfMatch(text1, text2); - if (hm) { - - // A half-match was found, sort out the return data. - text1A = hm[0]; - text1B = hm[1]; - text2A = hm[2]; - text2B = hm[3]; - midCommon = hm[4]; - - // Send both pairs off for separate processing. - diffsA = this.DiffMain(text1A, text2A, checklines, deadline); - diffsB = this.DiffMain(text1B, text2B, checklines, deadline); - - // Merge the results. - return diffsA.concat([[DIFF_EQUAL, midCommon]], diffsB); - } - - if (checklines && text1.length > 100 && text2.length > 100) { - return this.diffLineMode(text1, text2, deadline); - } - - return this.diffBisect(text1, text2, deadline); - }; - - /** - * Do the two texts share a substring which is at least half the length of the - * longer text? - * This speedup can produce non-minimal diffs. - * @param {string} text1 First string. - * @param {string} text2 Second string. - * @return {Array.<string>} Five element Array, containing the prefix of - * text1, the suffix of text1, the prefix of text2, the suffix of - * text2 and the common middle. Or null if there was no match. - * @private - */ - DiffMatchPatch.prototype.diffHalfMatch = function (text1, text2) { - var longtext, shorttext, dmp, text1A, text2B, text2A, text1B, midCommon, hm1, hm2, hm; - - longtext = text1.length > text2.length ? text1 : text2; - shorttext = text1.length > text2.length ? text2 : text1; - if (longtext.length < 4 || shorttext.length * 2 < longtext.length) { - return null; // Pointless. - } - dmp = this; // 'this' becomes 'window' in a closure. - - /** - * Does a substring of shorttext exist within longtext such that the substring - * is at least half the length of longtext? - * Closure, but does not reference any external variables. - * @param {string} longtext Longer string. - * @param {string} shorttext Shorter string. - * @param {number} i Start index of quarter length substring within longtext. + if (lastequality && (preIns && preDel && postIns && postDel || lastequality.length < 2 && preIns + preDel + postIns + postDel === 3)) { + + // Duplicate record. + diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]); + + // Change second copy to insert. + diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT; + equalitiesLength--; // Throw away the equality we just deleted; + lastequality = null; + if (preIns && preDel) { + + // No changes made which could affect previous entry, keep going. + postIns = postDel = true; + equalitiesLength = 0; + } else { + equalitiesLength--; // Throw away the previous equality. + pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1; + postIns = postDel = false; + } + changes = true; + } + } + pointer++; + } + + if (changes) { + this.diffCleanupMerge(diffs); + } + }; + + /** + * Convert a diff array into a pretty HTML report. + * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. + * @param {integer} string to be beautified. + * @return {string} HTML representation. + */ + DiffMatchPatch.prototype.diffPrettyHtml = function (diffs) { + var op, + data, + x, + html = []; + for (x = 0; x < diffs.length; x++) { + op = diffs[x][0]; // Operation (insert, delete, equal) + data = diffs[x][1]; // Text of change. + switch (op) { + case DIFF_INSERT: + html[x] = "<ins>" + escapeText(data) + "</ins>"; + break; + case DIFF_DELETE: + html[x] = "<del>" + escapeText(data) + "</del>"; + break; + case DIFF_EQUAL: + html[x] = "<span>" + escapeText(data) + "</span>"; + break; + } + } + return html.join(""); + }; + + /** + * Determine the common prefix of two strings. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {number} The number of characters common to the start of each + * string. + */ + DiffMatchPatch.prototype.diffCommonPrefix = function (text1, text2) { + var pointermid, pointermax, pointermin, pointerstart; + + // Quick check for common null cases. + if (!text1 || !text2 || text1.charAt(0) !== text2.charAt(0)) { + return 0; + } + + // Binary search. + // Performance analysis: https://neil.fraser.name/news/2007/10/09/ + pointermin = 0; + pointermax = Math.min(text1.length, text2.length); + pointermid = pointermax; + pointerstart = 0; + while (pointermin < pointermid) { + if (text1.substring(pointerstart, pointermid) === text2.substring(pointerstart, pointermid)) { + pointermin = pointermid; + pointerstart = pointermin; + } else { + pointermax = pointermid; + } + pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin); + } + return pointermid; + }; + + /** + * Determine the common suffix of two strings. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {number} The number of characters common to the end of each string. + */ + DiffMatchPatch.prototype.diffCommonSuffix = function (text1, text2) { + var pointermid, pointermax, pointermin, pointerend; + + // Quick check for common null cases. + if (!text1 || !text2 || text1.charAt(text1.length - 1) !== text2.charAt(text2.length - 1)) { + return 0; + } + + // Binary search. + // Performance analysis: https://neil.fraser.name/news/2007/10/09/ + pointermin = 0; + pointermax = Math.min(text1.length, text2.length); + pointermid = pointermax; + pointerend = 0; + while (pointermin < pointermid) { + if (text1.substring(text1.length - pointermid, text1.length - pointerend) === text2.substring(text2.length - pointermid, text2.length - pointerend)) { + pointermin = pointermid; + pointerend = pointermin; + } else { + pointermax = pointermid; + } + pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin); + } + return pointermid; + }; + + /** + * Find the differences between two texts. Assumes that the texts do not + * have any common prefix or suffix. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {boolean} checklines Speedup flag. If false, then don't run a + * line-level diff first to identify the changed areas. + * If true, then run a faster, slightly less optimal diff. + * @param {number} deadline Time when the diff should be complete by. + * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. + * @private + */ + DiffMatchPatch.prototype.diffCompute = function (text1, text2, checklines, deadline) { + var diffs, longtext, shorttext, i, hm, text1A, text2A, text1B, text2B, midCommon, diffsA, + diffsB; + + if (!text1) { + + // Just add some text (speedup). + return [[DIFF_INSERT, text2]]; + } + + if (!text2) { + + // Just delete some text (speedup). + return [[DIFF_DELETE, text1]]; + } + + longtext = text1.length > text2.length ? text1 : text2; + shorttext = text1.length > text2.length ? text2 : text1; + i = longtext.indexOf(shorttext); + if (i !== -1) { + + // Shorter text is inside the longer text (speedup). + diffs = [[DIFF_INSERT, longtext.substring(0, i)], [DIFF_EQUAL, shorttext], [DIFF_INSERT, longtext.substring(i + shorttext.length)]]; + + // Swap insertions for deletions if diff is reversed. + if (text1.length > text2.length) { + diffs[0][0] = diffs[2][0] = DIFF_DELETE; + } + return diffs; + } + + if (shorttext.length === 1) { + + // Single character string. + // After the previous speedup, the character can't be an equality. + return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]]; + } + + // Check to see if the problem can be split in two. + hm = this.diffHalfMatch(text1, text2); + if (hm) { + + // A half-match was found, sort out the return data. + text1A = hm[0]; + text1B = hm[1]; + text2A = hm[2]; + text2B = hm[3]; + midCommon = hm[4]; + + // Send both pairs off for separate processing. + diffsA = this.DiffMain(text1A, text2A, checklines, deadline); + diffsB = this.DiffMain(text1B, text2B, checklines, deadline); + + // Merge the results. + return diffsA.concat([[DIFF_EQUAL, midCommon]], diffsB); + } + + if (checklines && text1.length > 100 && text2.length > 100) { + return this.diffLineMode(text1, text2, deadline); + } + + return this.diffBisect(text1, text2, deadline); + }; + + /** + * Do the two texts share a substring which is at least half the length of the + * longer text? + * This speedup can produce non-minimal diffs. + * @param {string} text1 First string. + * @param {string} text2 Second string. * @return {Array.<string>} Five element Array, containing the prefix of - * longtext, the suffix of longtext, the prefix of shorttext, the suffix - * of shorttext and the common middle. Or null if there was no match. + * text1, the suffix of text1, the prefix of text2, the suffix of + * text2 and the common middle. Or null if there was no match. * @private */ - function diffHalfMatchI(longtext, shorttext, i) { - var seed, j, bestCommon, prefixLength, suffixLength, bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB; - - // Start with a 1/4 length substring at position i as a seed. - seed = longtext.substring(i, i + Math.floor(longtext.length / 4)); - j = -1; - bestCommon = ""; - while ((j = shorttext.indexOf(seed, j + 1)) !== -1) { - prefixLength = dmp.diffCommonPrefix(longtext.substring(i), shorttext.substring(j)); - suffixLength = dmp.diffCommonSuffix(longtext.substring(0, i), shorttext.substring(0, j)); - if (bestCommon.length < suffixLength + prefixLength) { - bestCommon = shorttext.substring(j - suffixLength, j) + shorttext.substring(j, j + prefixLength); - bestLongtextA = longtext.substring(0, i - suffixLength); - bestLongtextB = longtext.substring(i + prefixLength); - bestShorttextA = shorttext.substring(0, j - suffixLength); - bestShorttextB = shorttext.substring(j + prefixLength); - } - } - if (bestCommon.length * 2 >= longtext.length) { - return [bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB, bestCommon]; - } else { - return null; - } - } - - // First check if the second quarter is the seed for a half-match. - hm1 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 4)); - - // Check again based on the third quarter. - hm2 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 2)); - if (!hm1 && !hm2) { - return null; - } else if (!hm2) { - hm = hm1; - } else if (!hm1) { - hm = hm2; - } else { - - // Both matched. Select the longest. - hm = hm1[4].length > hm2[4].length ? hm1 : hm2; - } - - // A half-match was found, sort out the return data. - if (text1.length > text2.length) { - text1A = hm[0]; - text1B = hm[1]; - text2A = hm[2]; - text2B = hm[3]; - } else { - text2A = hm[0]; - text2B = hm[1]; - text1A = hm[2]; - text1B = hm[3]; - } - midCommon = hm[4]; - return [text1A, text1B, text2A, text2B, midCommon]; - }; - - /** - * Do a quick line-level diff on both strings, then rediff the parts for - * greater accuracy. - * This speedup can produce non-minimal diffs. - * @param {string} text1 Old string to be diffed. - * @param {string} text2 New string to be diffed. - * @param {number} deadline Time when the diff should be complete by. - * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. - * @private - */ - DiffMatchPatch.prototype.diffLineMode = function (text1, text2, deadline) { - var a, diffs, linearray, pointer, countInsert, countDelete, textInsert, textDelete, j; - - // Scan the text on a line-by-line basis first. - a = this.diffLinesToChars(text1, text2); - text1 = a.chars1; - text2 = a.chars2; - linearray = a.lineArray; - - diffs = this.DiffMain(text1, text2, false, deadline); - - // Convert the diff back to original text. - this.diffCharsToLines(diffs, linearray); - - // Eliminate freak matches (e.g. blank lines) - this.diffCleanupSemantic(diffs); - - // Rediff any replacement blocks, this time character-by-character. - // Add a dummy entry at the end. - diffs.push([DIFF_EQUAL, ""]); - pointer = 0; - countDelete = 0; - countInsert = 0; - textDelete = ""; - textInsert = ""; - while (pointer < diffs.length) { - switch (diffs[pointer][0]) { - case DIFF_INSERT: - countInsert++; - textInsert += diffs[pointer][1]; - break; - case DIFF_DELETE: - countDelete++; - textDelete += diffs[pointer][1]; - break; - case DIFF_EQUAL: - - // Upon reaching an equality, check for prior redundancies. - if (countDelete >= 1 && countInsert >= 1) { - - // Delete the offending records and add the merged ones. - diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert); - pointer = pointer - countDelete - countInsert; - a = this.DiffMain(textDelete, textInsert, false, deadline); - for (j = a.length - 1; j >= 0; j--) { - diffs.splice(pointer, 0, a[j]); - } - pointer = pointer + a.length; - } - countInsert = 0; - countDelete = 0; - textDelete = ""; - textInsert = ""; - break; - } - pointer++; - } - diffs.pop(); // Remove the dummy entry at the end. - - return diffs; - }; - - /** - * Find the 'middle snake' of a diff, split the problem in two - * and return the recursively constructed diff. - * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations. - * @param {string} text1 Old string to be diffed. - * @param {string} text2 New string to be diffed. - * @param {number} deadline Time at which to bail if not yet complete. - * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. - * @private - */ - DiffMatchPatch.prototype.diffBisect = function (text1, text2, deadline) { - var text1Length, text2Length, maxD, vOffset, vLength, v1, v2, x, delta, front, k1start, k1end, k2start, k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2; - - // Cache the text lengths to prevent multiple calls. - text1Length = text1.length; - text2Length = text2.length; - maxD = Math.ceil((text1Length + text2Length) / 2); - vOffset = maxD; - vLength = 2 * maxD; - v1 = new Array(vLength); - v2 = new Array(vLength); - - // Setting all elements to -1 is faster in Chrome & Firefox than mixing - // integers and undefined. - for (x = 0; x < vLength; x++) { - v1[x] = -1; - v2[x] = -1; - } - v1[vOffset + 1] = 0; - v2[vOffset + 1] = 0; - delta = text1Length - text2Length; - - // If the total number of characters is odd, then the front path will collide - // with the reverse path. - front = delta % 2 !== 0; - - // Offsets for start and end of k loop. - // Prevents mapping of space beyond the grid. - k1start = 0; - k1end = 0; - k2start = 0; - k2end = 0; - for (d = 0; d < maxD; d++) { - - // Bail out if deadline is reached. - if (new Date().getTime() > deadline) { - break; - } - - // Walk the front path one step. - for (k1 = -d + k1start; k1 <= d - k1end; k1 += 2) { - k1Offset = vOffset + k1; - if (k1 === -d || k1 !== d && v1[k1Offset - 1] < v1[k1Offset + 1]) { - x1 = v1[k1Offset + 1]; - } else { - x1 = v1[k1Offset - 1] + 1; - } - y1 = x1 - k1; - while (x1 < text1Length && y1 < text2Length && text1.charAt(x1) === text2.charAt(y1)) { - x1++; - y1++; - } - v1[k1Offset] = x1; - if (x1 > text1Length) { - - // Ran off the right of the graph. - k1end += 2; - } else if (y1 > text2Length) { - - // Ran off the bottom of the graph. - k1start += 2; - } else if (front) { - k2Offset = vOffset + delta - k1; - if (k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] !== -1) { - - // Mirror x2 onto top-left coordinate system. - x2 = text1Length - v2[k2Offset]; - if (x1 >= x2) { - - // Overlap detected. - return this.diffBisectSplit(text1, text2, x1, y1, deadline); - } - } - } - } - - // Walk the reverse path one step. - for (k2 = -d + k2start; k2 <= d - k2end; k2 += 2) { - k2Offset = vOffset + k2; - if (k2 === -d || k2 !== d && v2[k2Offset - 1] < v2[k2Offset + 1]) { - x2 = v2[k2Offset + 1]; - } else { - x2 = v2[k2Offset - 1] + 1; - } - y2 = x2 - k2; - while (x2 < text1Length && y2 < text2Length && text1.charAt(text1Length - x2 - 1) === text2.charAt(text2Length - y2 - 1)) { - x2++; - y2++; - } - v2[k2Offset] = x2; - if (x2 > text1Length) { - - // Ran off the left of the graph. - k2end += 2; - } else if (y2 > text2Length) { - - // Ran off the top of the graph. - k2start += 2; - } else if (!front) { - k1Offset = vOffset + delta - k2; - if (k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] !== -1) { - x1 = v1[k1Offset]; - y1 = vOffset + x1 - k1Offset; - - // Mirror x2 onto top-left coordinate system. - x2 = text1Length - x2; - if (x1 >= x2) { - - // Overlap detected. - return this.diffBisectSplit(text1, text2, x1, y1, deadline); - } - } - } - } - } - - // Diff took too long and hit the deadline or - // number of diffs equals number of characters, no commonality at all. - return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]]; - }; - - /** - * Given the location of the 'middle snake', split the diff in two parts - * and recurse. - * @param {string} text1 Old string to be diffed. - * @param {string} text2 New string to be diffed. - * @param {number} x Index of split point in text1. - * @param {number} y Index of split point in text2. - * @param {number} deadline Time at which to bail if not yet complete. - * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. - * @private - */ - DiffMatchPatch.prototype.diffBisectSplit = function (text1, text2, x, y, deadline) { - var text1a, text1b, text2a, text2b, diffs, diffsb; - text1a = text1.substring(0, x); - text2a = text2.substring(0, y); - text1b = text1.substring(x); - text2b = text2.substring(y); - - // Compute both diffs serially. - diffs = this.DiffMain(text1a, text2a, false, deadline); - diffsb = this.DiffMain(text1b, text2b, false, deadline); - - return diffs.concat(diffsb); - }; - - /** - * Reduce the number of edits by eliminating semantically trivial equalities. - * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. - */ - DiffMatchPatch.prototype.diffCleanupSemantic = function (diffs) { - var changes, equalities, equalitiesLength, lastequality, pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1, lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2; - changes = false; - equalities = []; // Stack of indices where equalities are found. - equalitiesLength = 0; // Keeping our own length var is faster in JS. - /** @type {?string} */ - lastequality = null; - - // Always equal to diffs[equalities[equalitiesLength - 1]][1] - pointer = 0; // Index of current position. - - // Number of characters that changed prior to the equality. - lengthInsertions1 = 0; - lengthDeletions1 = 0; - - // Number of characters that changed after the equality. - lengthInsertions2 = 0; - lengthDeletions2 = 0; - while (pointer < diffs.length) { - if (diffs[pointer][0] === DIFF_EQUAL) { - // Equality found. - equalities[equalitiesLength++] = pointer; - lengthInsertions1 = lengthInsertions2; - lengthDeletions1 = lengthDeletions2; - lengthInsertions2 = 0; - lengthDeletions2 = 0; - lastequality = diffs[pointer][1]; - } else { - // An insertion or deletion. - if (diffs[pointer][0] === DIFF_INSERT) { - lengthInsertions2 += diffs[pointer][1].length; - } else { - lengthDeletions2 += diffs[pointer][1].length; - } - - // Eliminate an equality that is smaller or equal to the edits on both - // sides of it. - if (lastequality && lastequality.length <= Math.max(lengthInsertions1, lengthDeletions1) && lastequality.length <= Math.max(lengthInsertions2, lengthDeletions2)) { - - // Duplicate record. - diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]); - - // Change second copy to insert. - diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT; - - // Throw away the equality we just deleted. - equalitiesLength--; - - // Throw away the previous equality (it needs to be reevaluated). - equalitiesLength--; - pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1; - - // Reset the counters. - lengthInsertions1 = 0; - lengthDeletions1 = 0; - lengthInsertions2 = 0; - lengthDeletions2 = 0; - lastequality = null; - changes = true; - } - } - pointer++; - } - - // Normalize the diff. - if (changes) { - this.diffCleanupMerge(diffs); - } - - // Find any overlaps between deletions and insertions. - // e.g: <del>abcxxx</del><ins>xxxdef</ins> - // -> <del>abc</del>xxx<ins>def</ins> - // e.g: <del>xxxabc</del><ins>defxxx</ins> - // -> <ins>def</ins>xxx<del>abc</del> - // Only extract an overlap if it is as big as the edit ahead or behind it. - pointer = 1; - while (pointer < diffs.length) { - if (diffs[pointer - 1][0] === DIFF_DELETE && diffs[pointer][0] === DIFF_INSERT) { - deletion = diffs[pointer - 1][1]; - insertion = diffs[pointer][1]; - overlapLength1 = this.diffCommonOverlap(deletion, insertion); - overlapLength2 = this.diffCommonOverlap(insertion, deletion); - if (overlapLength1 >= overlapLength2) { - if (overlapLength1 >= deletion.length / 2 || overlapLength1 >= insertion.length / 2) { - - // Overlap found. Insert an equality and trim the surrounding edits. - diffs.splice(pointer, 0, [DIFF_EQUAL, insertion.substring(0, overlapLength1)]); - diffs[pointer - 1][1] = deletion.substring(0, deletion.length - overlapLength1); - diffs[pointer + 1][1] = insertion.substring(overlapLength1); - pointer++; - } - } else { - if (overlapLength2 >= deletion.length / 2 || overlapLength2 >= insertion.length / 2) { - - // Reverse overlap found. - // Insert an equality and swap and trim the surrounding edits. - diffs.splice(pointer, 0, [DIFF_EQUAL, deletion.substring(0, overlapLength2)]); - - diffs[pointer - 1][0] = DIFF_INSERT; - diffs[pointer - 1][1] = insertion.substring(0, insertion.length - overlapLength2); - diffs[pointer + 1][0] = DIFF_DELETE; - diffs[pointer + 1][1] = deletion.substring(overlapLength2); - pointer++; - } - } - pointer++; - } - pointer++; - } - }; - - /** - * Determine if the suffix of one string is the prefix of another. - * @param {string} text1 First string. - * @param {string} text2 Second string. - * @return {number} The number of characters common to the end of the first - * string and the start of the second string. - * @private - */ - DiffMatchPatch.prototype.diffCommonOverlap = function (text1, text2) { - var text1Length, text2Length, textLength, best, length, pattern, found; - - // Cache the text lengths to prevent multiple calls. - text1Length = text1.length; - text2Length = text2.length; - - // Eliminate the null case. - if (text1Length === 0 || text2Length === 0) { - return 0; - } - - // Truncate the longer string. - if (text1Length > text2Length) { - text1 = text1.substring(text1Length - text2Length); - } else if (text1Length < text2Length) { - text2 = text2.substring(0, text1Length); - } - textLength = Math.min(text1Length, text2Length); - - // Quick check for the worst case. - if (text1 === text2) { - return textLength; - } - - // Start by looking for a single character match - // and increase length until no match is found. - // Performance analysis: https://neil.fraser.name/news/2010/11/04/ - best = 0; - length = 1; - while (true) { - pattern = text1.substring(textLength - length); - found = text2.indexOf(pattern); - if (found === -1) { - return best; - } - length += found; - if (found === 0 || text1.substring(textLength - length) === text2.substring(0, length)) { - best = length; - length++; - } - } - }; - - /** - * Split two texts into an array of strings. Reduce the texts to a string of - * hashes where each Unicode character represents one line. - * @param {string} text1 First string. - * @param {string} text2 Second string. - * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}} - * An object containing the encoded text1, the encoded text2 and - * the array of unique strings. - * The zeroth element of the array of unique strings is intentionally blank. - * @private - */ - DiffMatchPatch.prototype.diffLinesToChars = function (text1, text2) { - var lineArray, lineHash, chars1, chars2; - lineArray = []; // E.g. lineArray[4] === 'Hello\n' - lineHash = {}; // E.g. lineHash['Hello\n'] === 4 - - // '\x00' is a valid character, but various debuggers don't like it. - // So we'll insert a junk entry to avoid generating a null character. - lineArray[0] = ""; - - /** - * Split a text into an array of strings. Reduce the texts to a string of + DiffMatchPatch.prototype.diffHalfMatch = function (text1, text2) { + var longtext, shorttext, dmp, text1A, text2B, text2A, text1B, midCommon, hm1, hm2, hm; + + longtext = text1.length > text2.length ? text1 : text2; + shorttext = text1.length > text2.length ? text2 : text1; + if (longtext.length < 4 || shorttext.length * 2 < longtext.length) { + return null; // Pointless. + } + dmp = this; // 'this' becomes 'window' in a closure. + + /** + * Does a substring of shorttext exist within longtext such that the substring + * is at least half the length of longtext? + * Closure, but does not reference any external variables. + * @param {string} longtext Longer string. + * @param {string} shorttext Shorter string. + * @param {number} i Start index of quarter length substring within longtext. + * @return {Array.<string>} Five element Array, containing the prefix of + * longtext, the suffix of longtext, the prefix of shorttext, the suffix + * of shorttext and the common middle. Or null if there was no match. + * @private + */ + function diffHalfMatchI(longtext, shorttext, i) { + var seed, j, bestCommon, prefixLength, suffixLength, bestLongtextA, bestLongtextB, + bestShorttextA, bestShorttextB; + + // Start with a 1/4 length substring at position i as a seed. + seed = longtext.substring(i, i + Math.floor(longtext.length / 4)); + j = -1; + bestCommon = ""; + while ((j = shorttext.indexOf(seed, j + 1)) !== -1) { + prefixLength = dmp.diffCommonPrefix(longtext.substring(i), shorttext.substring(j)); + suffixLength = dmp.diffCommonSuffix(longtext.substring(0, i), shorttext.substring(0, j)); + if (bestCommon.length < suffixLength + prefixLength) { + bestCommon = shorttext.substring(j - suffixLength, j) + shorttext.substring(j, j + prefixLength); + bestLongtextA = longtext.substring(0, i - suffixLength); + bestLongtextB = longtext.substring(i + prefixLength); + bestShorttextA = shorttext.substring(0, j - suffixLength); + bestShorttextB = shorttext.substring(j + prefixLength); + } + } + if (bestCommon.length * 2 >= longtext.length) { + return [bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB, bestCommon]; + } else { + return null; + } + } + + // First check if the second quarter is the seed for a half-match. + hm1 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 4)); + + // Check again based on the third quarter. + hm2 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 2)); + if (!hm1 && !hm2) { + return null; + } else if (!hm2) { + hm = hm1; + } else if (!hm1) { + hm = hm2; + } else { + + // Both matched. Select the longest. + hm = hm1[4].length > hm2[4].length ? hm1 : hm2; + } + + // A half-match was found, sort out the return data. + if (text1.length > text2.length) { + text1A = hm[0]; + text1B = hm[1]; + text2A = hm[2]; + text2B = hm[3]; + } else { + text2A = hm[0]; + text2B = hm[1]; + text1A = hm[2]; + text1B = hm[3]; + } + midCommon = hm[4]; + return [text1A, text1B, text2A, text2B, midCommon]; + }; + + /** + * Do a quick line-level diff on both strings, then rediff the parts for + * greater accuracy. + * This speedup can produce non-minimal diffs. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {number} deadline Time when the diff should be complete by. + * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. + * @private + */ + DiffMatchPatch.prototype.diffLineMode = function (text1, text2, deadline) { + var a, diffs, linearray, pointer, countInsert, countDelete, textInsert, textDelete, j; + + // Scan the text on a line-by-line basis first. + a = this.diffLinesToChars(text1, text2); + text1 = a.chars1; + text2 = a.chars2; + linearray = a.lineArray; + + diffs = this.DiffMain(text1, text2, false, deadline); + + // Convert the diff back to original text. + this.diffCharsToLines(diffs, linearray); + + // Eliminate freak matches (e.g. blank lines) + this.diffCleanupSemantic(diffs); + + // Rediff any replacement blocks, this time character-by-character. + // Add a dummy entry at the end. + diffs.push([DIFF_EQUAL, ""]); + pointer = 0; + countDelete = 0; + countInsert = 0; + textDelete = ""; + textInsert = ""; + while (pointer < diffs.length) { + switch (diffs[pointer][0]) { + case DIFF_INSERT: + countInsert++; + textInsert += diffs[pointer][1]; + break; + case DIFF_DELETE: + countDelete++; + textDelete += diffs[pointer][1]; + break; + case DIFF_EQUAL: + + // Upon reaching an equality, check for prior redundancies. + if (countDelete >= 1 && countInsert >= 1) { + + // Delete the offending records and add the merged ones. + diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert); + pointer = pointer - countDelete - countInsert; + a = this.DiffMain(textDelete, textInsert, false, deadline); + for (j = a.length - 1; j >= 0; j--) { + diffs.splice(pointer, 0, a[j]); + } + pointer = pointer + a.length; + } + countInsert = 0; + countDelete = 0; + textDelete = ""; + textInsert = ""; + break; + } + pointer++; + } + diffs.pop(); // Remove the dummy entry at the end. + + return diffs; + }; + + /** + * Find the 'middle snake' of a diff, split the problem in two + * and return the recursively constructed diff. + * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {number} deadline Time at which to bail if not yet complete. + * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. + * @private + */ + DiffMatchPatch.prototype.diffBisect = function (text1, text2, deadline) { + var text1Length, text2Length, maxD, vOffset, vLength, v1, v2, x, delta, front, k1start, k1end, + k2start, k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2; + + // Cache the text lengths to prevent multiple calls. + text1Length = text1.length; + text2Length = text2.length; + maxD = Math.ceil((text1Length + text2Length) / 2); + vOffset = maxD; + vLength = 2 * maxD; + v1 = new Array(vLength); + v2 = new Array(vLength); + + // Setting all elements to -1 is faster in Chrome & Firefox than mixing + // integers and undefined. + for (x = 0; x < vLength; x++) { + v1[x] = -1; + v2[x] = -1; + } + v1[vOffset + 1] = 0; + v2[vOffset + 1] = 0; + delta = text1Length - text2Length; + + // If the total number of characters is odd, then the front path will collide + // with the reverse path. + front = delta % 2 !== 0; + + // Offsets for start and end of k loop. + // Prevents mapping of space beyond the grid. + k1start = 0; + k1end = 0; + k2start = 0; + k2end = 0; + for (d = 0; d < maxD; d++) { + + // Bail out if deadline is reached. + if (new Date().getTime() > deadline) { + break; + } + + // Walk the front path one step. + for (k1 = -d + k1start; k1 <= d - k1end; k1 += 2) { + k1Offset = vOffset + k1; + if (k1 === -d || k1 !== d && v1[k1Offset - 1] < v1[k1Offset + 1]) { + x1 = v1[k1Offset + 1]; + } else { + x1 = v1[k1Offset - 1] + 1; + } + y1 = x1 - k1; + while (x1 < text1Length && y1 < text2Length && text1.charAt(x1) === text2.charAt(y1)) { + x1++; + y1++; + } + v1[k1Offset] = x1; + if (x1 > text1Length) { + + // Ran off the right of the graph. + k1end += 2; + } else if (y1 > text2Length) { + + // Ran off the bottom of the graph. + k1start += 2; + } else if (front) { + k2Offset = vOffset + delta - k1; + if (k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] !== -1) { + + // Mirror x2 onto top-left coordinate system. + x2 = text1Length - v2[k2Offset]; + if (x1 >= x2) { + + // Overlap detected. + return this.diffBisectSplit(text1, text2, x1, y1, deadline); + } + } + } + } + + // Walk the reverse path one step. + for (k2 = -d + k2start; k2 <= d - k2end; k2 += 2) { + k2Offset = vOffset + k2; + if (k2 === -d || k2 !== d && v2[k2Offset - 1] < v2[k2Offset + 1]) { + x2 = v2[k2Offset + 1]; + } else { + x2 = v2[k2Offset - 1] + 1; + } + y2 = x2 - k2; + while (x2 < text1Length && y2 < text2Length && text1.charAt(text1Length - x2 - 1) === text2.charAt(text2Length - y2 - 1)) { + x2++; + y2++; + } + v2[k2Offset] = x2; + if (x2 > text1Length) { + + // Ran off the left of the graph. + k2end += 2; + } else if (y2 > text2Length) { + + // Ran off the top of the graph. + k2start += 2; + } else if (!front) { + k1Offset = vOffset + delta - k2; + if (k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] !== -1) { + x1 = v1[k1Offset]; + y1 = vOffset + x1 - k1Offset; + + // Mirror x2 onto top-left coordinate system. + x2 = text1Length - x2; + if (x1 >= x2) { + + // Overlap detected. + return this.diffBisectSplit(text1, text2, x1, y1, deadline); + } + } + } + } + } + + // Diff took too long and hit the deadline or + // number of diffs equals number of characters, no commonality at all. + return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]]; + }; + + /** + * Given the location of the 'middle snake', split the diff in two parts + * and recurse. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {number} x Index of split point in text1. + * @param {number} y Index of split point in text2. + * @param {number} deadline Time at which to bail if not yet complete. + * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. + * @private + */ + DiffMatchPatch.prototype.diffBisectSplit = function (text1, text2, x, y, deadline) { + var text1a, text1b, text2a, text2b, diffs, diffsb; + text1a = text1.substring(0, x); + text2a = text2.substring(0, y); + text1b = text1.substring(x); + text2b = text2.substring(y); + + // Compute both diffs serially. + diffs = this.DiffMain(text1a, text2a, false, deadline); + diffsb = this.DiffMain(text1b, text2b, false, deadline); + + return diffs.concat(diffsb); + }; + + /** + * Reduce the number of edits by eliminating semantically trivial equalities. + * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. + */ + DiffMatchPatch.prototype.diffCleanupSemantic = function (diffs) { + var changes, equalities, equalitiesLength, lastequality, pointer, lengthInsertions2, + lengthDeletions2, lengthInsertions1, lengthDeletions1, deletion, insertion, overlapLength1, + overlapLength2; + changes = false; + equalities = []; // Stack of indices where equalities are found. + equalitiesLength = 0; // Keeping our own length var is faster in JS. + /** @type {?string} */ + lastequality = null; + + // Always equal to diffs[equalities[equalitiesLength - 1]][1] + pointer = 0; // Index of current position. + + // Number of characters that changed prior to the equality. + lengthInsertions1 = 0; + lengthDeletions1 = 0; + + // Number of characters that changed after the equality. + lengthInsertions2 = 0; + lengthDeletions2 = 0; + while (pointer < diffs.length) { + if (diffs[pointer][0] === DIFF_EQUAL) { + // Equality found. + equalities[equalitiesLength++] = pointer; + lengthInsertions1 = lengthInsertions2; + lengthDeletions1 = lengthDeletions2; + lengthInsertions2 = 0; + lengthDeletions2 = 0; + lastequality = diffs[pointer][1]; + } else { + // An insertion or deletion. + if (diffs[pointer][0] === DIFF_INSERT) { + lengthInsertions2 += diffs[pointer][1].length; + } else { + lengthDeletions2 += diffs[pointer][1].length; + } + + // Eliminate an equality that is smaller or equal to the edits on both + // sides of it. + if (lastequality && lastequality.length <= Math.max(lengthInsertions1, lengthDeletions1) && lastequality.length <= Math.max(lengthInsertions2, lengthDeletions2)) { + + // Duplicate record. + diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]); + + // Change second copy to insert. + diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT; + + // Throw away the equality we just deleted. + equalitiesLength--; + + // Throw away the previous equality (it needs to be reevaluated). + equalitiesLength--; + pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1; + + // Reset the counters. + lengthInsertions1 = 0; + lengthDeletions1 = 0; + lengthInsertions2 = 0; + lengthDeletions2 = 0; + lastequality = null; + changes = true; + } + } + pointer++; + } + + // Normalize the diff. + if (changes) { + this.diffCleanupMerge(diffs); + } + + // Find any overlaps between deletions and insertions. + // e.g: <del>abcxxx</del><ins>xxxdef</ins> + // -> <del>abc</del>xxx<ins>def</ins> + // e.g: <del>xxxabc</del><ins>defxxx</ins> + // -> <ins>def</ins>xxx<del>abc</del> + // Only extract an overlap if it is as big as the edit ahead or behind it. + pointer = 1; + while (pointer < diffs.length) { + if (diffs[pointer - 1][0] === DIFF_DELETE && diffs[pointer][0] === DIFF_INSERT) { + deletion = diffs[pointer - 1][1]; + insertion = diffs[pointer][1]; + overlapLength1 = this.diffCommonOverlap(deletion, insertion); + overlapLength2 = this.diffCommonOverlap(insertion, deletion); + if (overlapLength1 >= overlapLength2) { + if (overlapLength1 >= deletion.length / 2 || overlapLength1 >= insertion.length / 2) { + + // Overlap found. Insert an equality and trim the surrounding edits. + diffs.splice(pointer, 0, [DIFF_EQUAL, insertion.substring(0, overlapLength1)]); + diffs[pointer - 1][1] = deletion.substring(0, deletion.length - overlapLength1); + diffs[pointer + 1][1] = insertion.substring(overlapLength1); + pointer++; + } + } else { + if (overlapLength2 >= deletion.length / 2 || overlapLength2 >= insertion.length / 2) { + + // Reverse overlap found. + // Insert an equality and swap and trim the surrounding edits. + diffs.splice(pointer, 0, [DIFF_EQUAL, deletion.substring(0, overlapLength2)]); + + diffs[pointer - 1][0] = DIFF_INSERT; + diffs[pointer - 1][1] = insertion.substring(0, insertion.length - overlapLength2); + diffs[pointer + 1][0] = DIFF_DELETE; + diffs[pointer + 1][1] = deletion.substring(overlapLength2); + pointer++; + } + } + pointer++; + } + pointer++; + } + }; + + /** + * Determine if the suffix of one string is the prefix of another. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {number} The number of characters common to the end of the first + * string and the start of the second string. + * @private + */ + DiffMatchPatch.prototype.diffCommonOverlap = function (text1, text2) { + var text1Length, text2Length, textLength, best, length, pattern, found; + + // Cache the text lengths to prevent multiple calls. + text1Length = text1.length; + text2Length = text2.length; + + // Eliminate the null case. + if (text1Length === 0 || text2Length === 0) { + return 0; + } + + // Truncate the longer string. + if (text1Length > text2Length) { + text1 = text1.substring(text1Length - text2Length); + } else if (text1Length < text2Length) { + text2 = text2.substring(0, text1Length); + } + textLength = Math.min(text1Length, text2Length); + + // Quick check for the worst case. + if (text1 === text2) { + return textLength; + } + + // Start by looking for a single character match + // and increase length until no match is found. + // Performance analysis: https://neil.fraser.name/news/2010/11/04/ + best = 0; + length = 1; + while (true) { + pattern = text1.substring(textLength - length); + found = text2.indexOf(pattern); + if (found === -1) { + return best; + } + length += found; + if (found === 0 || text1.substring(textLength - length) === text2.substring(0, length)) { + best = length; + length++; + } + } + }; + + /** + * Split two texts into an array of strings. Reduce the texts to a string of * hashes where each Unicode character represents one line. - * Modifies linearray and linehash through being a closure. - * @param {string} text String to encode. - * @return {string} Encoded string. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}} + * An object containing the encoded text1, the encoded text2 and + * the array of unique strings. + * The zeroth element of the array of unique strings is intentionally blank. + * @private + */ + DiffMatchPatch.prototype.diffLinesToChars = function (text1, text2) { + var lineArray, lineHash, chars1, chars2; + lineArray = []; // E.g. lineArray[4] === 'Hello\n' + lineHash = {}; // E.g. lineHash['Hello\n'] === 4 + + // '\x00' is a valid character, but various debuggers don't like it. + // So we'll insert a junk entry to avoid generating a null character. + lineArray[0] = ""; + + /** + * Split a text into an array of strings. Reduce the texts to a string of + * hashes where each Unicode character represents one line. + * Modifies linearray and linehash through being a closure. + * @param {string} text String to encode. + * @return {string} Encoded string. + * @private + */ + function diffLinesToCharsMunge(text) { + var chars, lineStart, lineEnd, lineArrayLength, line; + chars = ""; + + // Walk the text, pulling out a substring for each line. + // text.split('\n') would would temporarily double our memory footprint. + // Modifying text would create many large strings to garbage collect. + lineStart = 0; + lineEnd = -1; + + // Keeping our own length variable is faster than looking it up. + lineArrayLength = lineArray.length; + while (lineEnd < text.length - 1) { + lineEnd = text.indexOf("\n", lineStart); + if (lineEnd === -1) { + lineEnd = text.length - 1; + } + line = text.substring(lineStart, lineEnd + 1); + lineStart = lineEnd + 1; + + var lineHashExists = lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : lineHash[line] !== undefined; + + if (lineHashExists) { + chars += String.fromCharCode(lineHash[line]); + } else { + chars += String.fromCharCode(lineArrayLength); + lineHash[line] = lineArrayLength; + lineArray[lineArrayLength++] = line; + } + } + return chars; + } + + chars1 = diffLinesToCharsMunge(text1); + chars2 = diffLinesToCharsMunge(text2); + return { + chars1: chars1, + chars2: chars2, + lineArray: lineArray + }; + }; + + /** + * Rehydrate the text in a diff from a string of line hashes to real lines of + * text. + * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. + * @param {!Array.<string>} lineArray Array of unique strings. * @private */ - function diffLinesToCharsMunge(text) { - var chars, lineStart, lineEnd, lineArrayLength, line; - chars = ""; - - // Walk the text, pulling out a substring for each line. - // text.split('\n') would would temporarily double our memory footprint. - // Modifying text would create many large strings to garbage collect. - lineStart = 0; - lineEnd = -1; - - // Keeping our own length variable is faster than looking it up. - lineArrayLength = lineArray.length; - while (lineEnd < text.length - 1) { - lineEnd = text.indexOf("\n", lineStart); - if (lineEnd === -1) { - lineEnd = text.length - 1; - } - line = text.substring(lineStart, lineEnd + 1); - lineStart = lineEnd + 1; - - var lineHashExists = lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : lineHash[line] !== undefined; - - if (lineHashExists) { - chars += String.fromCharCode(lineHash[line]); - } else { - chars += String.fromCharCode(lineArrayLength); - lineHash[line] = lineArrayLength; - lineArray[lineArrayLength++] = line; - } - } - return chars; - } - - chars1 = diffLinesToCharsMunge(text1); - chars2 = diffLinesToCharsMunge(text2); - return { - chars1: chars1, - chars2: chars2, - lineArray: lineArray - }; - }; - - /** - * Rehydrate the text in a diff from a string of line hashes to real lines of - * text. - * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. - * @param {!Array.<string>} lineArray Array of unique strings. - * @private - */ - DiffMatchPatch.prototype.diffCharsToLines = function (diffs, lineArray) { - var x, chars, text, y; - for (x = 0; x < diffs.length; x++) { - chars = diffs[x][1]; - text = []; - for (y = 0; y < chars.length; y++) { - text[y] = lineArray[chars.charCodeAt(y)]; - } - diffs[x][1] = text.join(""); - } - }; - - /** - * Reorder and merge like edit sections. Merge equalities. - * Any edit section can move as long as it doesn't cross an equality. - * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. - */ - DiffMatchPatch.prototype.diffCleanupMerge = function (diffs) { - var pointer, countDelete, countInsert, textInsert, textDelete, commonlength, changes, diffPointer, position; - diffs.push([DIFF_EQUAL, ""]); // Add a dummy entry at the end. - pointer = 0; - countDelete = 0; - countInsert = 0; - textDelete = ""; - textInsert = ""; - - while (pointer < diffs.length) { - switch (diffs[pointer][0]) { - case DIFF_INSERT: - countInsert++; - textInsert += diffs[pointer][1]; - pointer++; - break; - case DIFF_DELETE: - countDelete++; - textDelete += diffs[pointer][1]; - pointer++; - break; - case DIFF_EQUAL: - - // Upon reaching an equality, check for prior redundancies. - if (countDelete + countInsert > 1) { - if (countDelete !== 0 && countInsert !== 0) { - - // Factor out any common prefixes. - commonlength = this.diffCommonPrefix(textInsert, textDelete); - if (commonlength !== 0) { - if (pointer - countDelete - countInsert > 0 && diffs[pointer - countDelete - countInsert - 1][0] === DIFF_EQUAL) { - diffs[pointer - countDelete - countInsert - 1][1] += textInsert.substring(0, commonlength); - } else { - diffs.splice(0, 0, [DIFF_EQUAL, textInsert.substring(0, commonlength)]); - pointer++; - } - textInsert = textInsert.substring(commonlength); - textDelete = textDelete.substring(commonlength); - } - - // Factor out any common suffixies. - commonlength = this.diffCommonSuffix(textInsert, textDelete); - if (commonlength !== 0) { - diffs[pointer][1] = textInsert.substring(textInsert.length - commonlength) + diffs[pointer][1]; - textInsert = textInsert.substring(0, textInsert.length - commonlength); - textDelete = textDelete.substring(0, textDelete.length - commonlength); - } - } - - // Delete the offending records and add the merged ones. - if (countDelete === 0) { - diffs.splice(pointer - countInsert, countDelete + countInsert, [DIFF_INSERT, textInsert]); - } else if (countInsert === 0) { - diffs.splice(pointer - countDelete, countDelete + countInsert, [DIFF_DELETE, textDelete]); - } else { - diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert, [DIFF_DELETE, textDelete], [DIFF_INSERT, textInsert]); - } - pointer = pointer - countDelete - countInsert + (countDelete ? 1 : 0) + (countInsert ? 1 : 0) + 1; - } else if (pointer !== 0 && diffs[pointer - 1][0] === DIFF_EQUAL) { - - // Merge this equality with the previous one. - diffs[pointer - 1][1] += diffs[pointer][1]; - diffs.splice(pointer, 1); - } else { - pointer++; - } - countInsert = 0; - countDelete = 0; - textDelete = ""; - textInsert = ""; - break; - } - } - if (diffs[diffs.length - 1][1] === "") { - diffs.pop(); // Remove the dummy entry at the end. - } - - // Second pass: look for single edits surrounded on both sides by equalities - // which can be shifted sideways to eliminate an equality. - // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC - changes = false; - pointer = 1; - - // Intentionally ignore the first and last element (don't need checking). - while (pointer < diffs.length - 1) { - if (diffs[pointer - 1][0] === DIFF_EQUAL && diffs[pointer + 1][0] === DIFF_EQUAL) { - - diffPointer = diffs[pointer][1]; - position = diffPointer.substring(diffPointer.length - diffs[pointer - 1][1].length); - - // This is a single edit surrounded by equalities. - if (position === diffs[pointer - 1][1]) { - - // Shift the edit over the previous equality. - diffs[pointer][1] = diffs[pointer - 1][1] + diffs[pointer][1].substring(0, diffs[pointer][1].length - diffs[pointer - 1][1].length); - diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1]; - diffs.splice(pointer - 1, 1); - changes = true; - } else if (diffPointer.substring(0, diffs[pointer + 1][1].length) === diffs[pointer + 1][1]) { - - // Shift the edit over the next equality. - diffs[pointer - 1][1] += diffs[pointer + 1][1]; - diffs[pointer][1] = diffs[pointer][1].substring(diffs[pointer + 1][1].length) + diffs[pointer + 1][1]; - diffs.splice(pointer + 1, 1); - changes = true; - } - } - pointer++; - } - - // If shifts were made, the diff needs reordering and another shift sweep. - if (changes) { - this.diffCleanupMerge(diffs); - } - }; - - return function (o, n) { - var diff, output, text; - diff = new DiffMatchPatch(); - output = diff.DiffMain(o, n); - diff.diffCleanupEfficiency(output); - text = diff.diffPrettyHtml(output); - - return text; - }; + DiffMatchPatch.prototype.diffCharsToLines = function (diffs, lineArray) { + var x, chars, text, y; + for (x = 0; x < diffs.length; x++) { + chars = diffs[x][1]; + text = []; + for (y = 0; y < chars.length; y++) { + text[y] = lineArray[chars.charCodeAt(y)]; + } + diffs[x][1] = text.join(""); + } + }; + + /** + * Reorder and merge like edit sections. Merge equalities. + * Any edit section can move as long as it doesn't cross an equality. + * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. + */ + DiffMatchPatch.prototype.diffCleanupMerge = function (diffs) { + var pointer, countDelete, countInsert, textInsert, textDelete, commonlength, changes, + diffPointer, position; + diffs.push([DIFF_EQUAL, ""]); // Add a dummy entry at the end. + pointer = 0; + countDelete = 0; + countInsert = 0; + textDelete = ""; + textInsert = ""; + + while (pointer < diffs.length) { + switch (diffs[pointer][0]) { + case DIFF_INSERT: + countInsert++; + textInsert += diffs[pointer][1]; + pointer++; + break; + case DIFF_DELETE: + countDelete++; + textDelete += diffs[pointer][1]; + pointer++; + break; + case DIFF_EQUAL: + + // Upon reaching an equality, check for prior redundancies. + if (countDelete + countInsert > 1) { + if (countDelete !== 0 && countInsert !== 0) { + + // Factor out any common prefixes. + commonlength = this.diffCommonPrefix(textInsert, textDelete); + if (commonlength !== 0) { + if (pointer - countDelete - countInsert > 0 && diffs[pointer - countDelete - countInsert - 1][0] === DIFF_EQUAL) { + diffs[pointer - countDelete - countInsert - 1][1] += textInsert.substring(0, commonlength); + } else { + diffs.splice(0, 0, [DIFF_EQUAL, textInsert.substring(0, commonlength)]); + pointer++; + } + textInsert = textInsert.substring(commonlength); + textDelete = textDelete.substring(commonlength); + } + + // Factor out any common suffixies. + commonlength = this.diffCommonSuffix(textInsert, textDelete); + if (commonlength !== 0) { + diffs[pointer][1] = textInsert.substring(textInsert.length - commonlength) + diffs[pointer][1]; + textInsert = textInsert.substring(0, textInsert.length - commonlength); + textDelete = textDelete.substring(0, textDelete.length - commonlength); + } + } + + // Delete the offending records and add the merged ones. + if (countDelete === 0) { + diffs.splice(pointer - countInsert, countDelete + countInsert, [DIFF_INSERT, textInsert]); + } else if (countInsert === 0) { + diffs.splice(pointer - countDelete, countDelete + countInsert, [DIFF_DELETE, textDelete]); + } else { + diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert, [DIFF_DELETE, textDelete], [DIFF_INSERT, textInsert]); + } + pointer = pointer - countDelete - countInsert + (countDelete ? 1 : 0) + (countInsert ? 1 : 0) + 1; + } else if (pointer !== 0 && diffs[pointer - 1][0] === DIFF_EQUAL) { + + // Merge this equality with the previous one. + diffs[pointer - 1][1] += diffs[pointer][1]; + diffs.splice(pointer, 1); + } else { + pointer++; + } + countInsert = 0; + countDelete = 0; + textDelete = ""; + textInsert = ""; + break; + } + } + if (diffs[diffs.length - 1][1] === "") { + diffs.pop(); // Remove the dummy entry at the end. + } + + // Second pass: look for single edits surrounded on both sides by equalities + // which can be shifted sideways to eliminate an equality. + // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC + changes = false; + pointer = 1; + + // Intentionally ignore the first and last element (don't need checking). + while (pointer < diffs.length - 1) { + if (diffs[pointer - 1][0] === DIFF_EQUAL && diffs[pointer + 1][0] === DIFF_EQUAL) { + + diffPointer = diffs[pointer][1]; + position = diffPointer.substring(diffPointer.length - diffs[pointer - 1][1].length); + + // This is a single edit surrounded by equalities. + if (position === diffs[pointer - 1][1]) { + + // Shift the edit over the previous equality. + diffs[pointer][1] = diffs[pointer - 1][1] + diffs[pointer][1].substring(0, diffs[pointer][1].length - diffs[pointer - 1][1].length); + diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1]; + diffs.splice(pointer - 1, 1); + changes = true; + } else if (diffPointer.substring(0, diffs[pointer + 1][1].length) === diffs[pointer + 1][1]) { + + // Shift the edit over the next equality. + diffs[pointer - 1][1] += diffs[pointer + 1][1]; + diffs[pointer][1] = diffs[pointer][1].substring(diffs[pointer + 1][1].length) + diffs[pointer + 1][1]; + diffs.splice(pointer + 1, 1); + changes = true; + } + } + pointer++; + } + + // If shifts were made, the diff needs reordering and another shift sweep. + if (changes) { + this.diffCleanupMerge(diffs); + } + }; + + return function (o, n) { + var diff, output, text; + diff = new DiffMatchPatch(); + output = diff.DiffMain(o, n); + diff.diffCleanupEfficiency(output); + text = diff.diffPrettyHtml(output); + + return text; + }; }(); -}((function() { return this; }()))); +}((function () { + return this; +}()))); diff --git a/test/test-markdown-element-attributes.html b/test/test-markdown-element-attributes.html index 4a09272..e15f0d6 100644 --- a/test/test-markdown-element-attributes.html +++ b/test/test-markdown-element-attributes.html @@ -1,134 +1,134 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Test Markdown Element Attributes</title> + <title>reveal.js - Test Markdown Element Attributes</title> - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> + <link href="../css/reveal.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> - <body style="overflow: auto;"> +<body style="overflow: auto;"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> +<div id="qunit"></div> +<div id="qunit-fixture"></div> - <div class="reveal" style="display: none;"> +<div class="reveal" style="display: none;"> - <div class="slides"> + <div class="slides"> - <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> --> + <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> --> - <!-- Slides are separated by newline + three dashes + newline, vertical slides identical but two dashes --> - <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$" data-element-attributes="{_\s*?([^}]+?)}">> - <script type="text/template"> - ## Slide 1.1 - <!-- {_class="fragment fade-out" data-fragment-index="1"} --> + <!-- Slides are separated by newline + three dashes + newline, vertical slides identical but two dashes --> + <section data-element-attributes="{_\s*?([^}]+?)}" data-markdown data-separator="^\n---\n$" + data-separator-vertical="^\n--\n$">> + <script type="text/template"> + ## Slide 1.1 + <!-- {_class="fragment fade-out" data-fragment-index="1"} --> - -- + -- - ## Slide 1.2 - <!-- {_class="fragment shrink"} --> + ## Slide 1.2 + <!-- {_class="fragment shrink"} --> - Paragraph 1 - <!-- {_class="fragment grow"} --> + Paragraph 1 + <!-- {_class="fragment grow"} --> - Paragraph 2 - <!-- {_class="fragment grow"} --> + Paragraph 2 + <!-- {_class="fragment grow"} --> - - list item 1 <!-- {_class="fragment grow"} --> - - list item 2 <!-- {_class="fragment grow"} --> - - list item 3 <!-- {_class="fragment grow"} --> + - list item 1 <!-- {_class="fragment grow"} --> + - list item 2 <!-- {_class="fragment grow"} --> + - list item 3 <!-- {_class="fragment grow"} --> - --- + --- - ## Slide 2 + ## Slide 2 - Paragraph 1.2 - multi-line <!-- {_class="fragment highlight-red"} --> + Paragraph 1.2 + multi-line <!-- {_class="fragment highlight-red"} --> - Paragraph 2.2 <!-- {_class="fragment highlight-red"} --> + Paragraph 2.2 <!-- {_class="fragment highlight-red"} --> - Paragraph 2.3 <!-- {_class="fragment highlight-red"} --> + Paragraph 2.3 <!-- {_class="fragment highlight-red"} --> - Paragraph 2.4 <!-- {_class="fragment highlight-red"} --> + Paragraph 2.4 <!-- {_class="fragment highlight-red"} --> - - list item 1 <!-- {_class="fragment highlight-green"} --> - - list item 2<!-- {_class="fragment highlight-green"} --> - - list item 3<!-- {_class="fragment highlight-green"} --> - - list item 4 - <!-- {_class="fragment highlight-green"} --> - - list item 5<!-- {_class="fragment highlight-green"} --> + - list item 1 <!-- {_class="fragment highlight-green"} --> + - list item 2<!-- {_class="fragment highlight-green"} --> + - list item 3<!-- {_class="fragment highlight-green"} --> + - list item 4 + <!-- {_class="fragment highlight-green"} --> + - list item 5<!-- {_class="fragment highlight-green"} --> - Test + Test -  - <!-- {_class="reveal stretch"} --> +  + <!-- {_class="reveal stretch"} --> - </script> - </section> + </script> + </section> + <section data-charset="utf-8" data-markdown + data-separator="^\n\n\n" + data-separator-notes="^Note:" + data-separator-vertical="^\n\n"> + <script type="text/template"> + # Test attributes in Markdown with default separator + ## Slide 1 Def <!-- .element: class="fragment highlight-red" data-fragment-index="1" --> - <section data-markdown data-separator="^\n\n\n" - data-separator-vertical="^\n\n" - data-separator-notes="^Note:" - data-charset="utf-8"> - <script type="text/template"> - # Test attributes in Markdown with default separator - ## Slide 1 Def <!-- .element: class="fragment highlight-red" data-fragment-index="1" --> + ## Slide 2 Def + <!-- .element: class="fragment highlight-red" --> - ## Slide 2 Def - <!-- .element: class="fragment highlight-red" --> + </script> + </section> - </script> - </section> + <section data-markdown> + <script type="text/template"> + ## Hello world + A paragraph + <!-- .element: class="fragment highlight-blue" --> + </script> + </section> - <section data-markdown> - <script type="text/template"> - ## Hello world - A paragraph - <!-- .element: class="fragment highlight-blue" --> - </script> - </section> + <section data-markdown> + <script type="text/template"> + ## Hello world - <section data-markdown> - <script type="text/template"> - ## Hello world + Multiple + Line + <!-- .element: class="fragment highlight-blue" --> + </script> + </section> - Multiple - Line - <!-- .element: class="fragment highlight-blue" --> - </script> - </section> + <section data-markdown> + <script type="text/template"> + ## Hello world - <section data-markdown> - <script type="text/template"> - ## Hello world + Test<!-- .element: class="fragment highlight-blue" --> - Test<!-- .element: class="fragment highlight-blue" --> + More Test + </script> + </section> - More Test - </script> - </section> + </div> - </div> +</div> - </div> +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="../plugin/markdown/marked.js"></script> +<script src="../plugin/markdown/markdown.js"></script> +<script src="qunit-2.5.0.js"></script> - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="../plugin/markdown/marked.js"></script> - <script src="../plugin/markdown/markdown.js"></script> - <script src="qunit-2.5.0.js"></script> +<script src="test-markdown-element-attributes.js"></script> - <script src="test-markdown-element-attributes.js"></script> - - </body> +</body> </html> diff --git a/test/test-markdown-element-attributes.js b/test/test-markdown-element-attributes.js index fc87b7b..8632fd7 100644 --- a/test/test-markdown-element-attributes.js +++ b/test/test-markdown-element-attributes.js @@ -1,44 +1,44 @@ -Reveal.addEventListener( 'ready', function() { +Reveal.addEventListener('ready', function () { - QUnit.module( 'Markdown' ); + QUnit.module('Markdown'); - QUnit.test( 'Vertical separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 4, 'found four slides' ); - }); + QUnit.test('Vertical separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section').length, 4, 'found four slides'); + }); - QUnit.test( 'Attributes on element header in vertical slides', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section>section h2.fragment.fade-out' ).length, 1, 'found one vertical slide with class fragment.fade-out on header' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides section>section h2.fragment.shrink' ).length, 1, 'found one vertical slide with class fragment.shrink on header' ); - }); + QUnit.test('Attributes on element header in vertical slides', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section>section h2.fragment.fade-out').length, 1, 'found one vertical slide with class fragment.fade-out on header'); + assert.strictEqual(document.querySelectorAll('.reveal .slides section>section h2.fragment.shrink').length, 1, 'found one vertical slide with class fragment.shrink on header'); + }); - QUnit.test( 'Attributes on element paragraphs in vertical slides', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section>section p.fragment.grow' ).length, 2, 'found a vertical slide with two paragraphs with class fragment.grow' ); - }); + QUnit.test('Attributes on element paragraphs in vertical slides', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section>section p.fragment.grow').length, 2, 'found a vertical slide with two paragraphs with class fragment.grow'); + }); - QUnit.test( 'Attributes on element list items in vertical slides', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section>section li.fragment.grow' ).length, 3, 'found a vertical slide with three list items with class fragment.grow' ); - }); + QUnit.test('Attributes on element list items in vertical slides', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section>section li.fragment.grow').length, 3, 'found a vertical slide with three list items with class fragment.grow'); + }); - QUnit.test( 'Attributes on element paragraphs in horizontal slides', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section p.fragment.highlight-red' ).length, 4, 'found a horizontal slide with four paragraphs with class fragment.grow' ); - }); + QUnit.test('Attributes on element paragraphs in horizontal slides', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section p.fragment.highlight-red').length, 4, 'found a horizontal slide with four paragraphs with class fragment.grow'); + }); - QUnit.test( 'Attributes on element list items in horizontal slides', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section li.fragment.highlight-green' ).length, 5, 'found a horizontal slide with five list items with class fragment.roll-in' ); - }); + QUnit.test('Attributes on element list items in horizontal slides', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section li.fragment.highlight-green').length, 5, 'found a horizontal slide with five list items with class fragment.roll-in'); + }); - QUnit.test( 'Attributes on element image in horizontal slides', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section img.reveal.stretch' ).length, 1, 'found a horizontal slide with stretched image, class img.reveal.stretch' ); - }); + QUnit.test('Attributes on element image in horizontal slides', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section img.reveal.stretch').length, 1, 'found a horizontal slide with stretched image, class img.reveal.stretch'); + }); - QUnit.test( 'Attributes on elements in vertical slides with default element attribute separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section h2.fragment.highlight-red' ).length, 2, 'found two h2 titles with fragment highlight-red in vertical slides with default element attribute separator' ); - }); + QUnit.test('Attributes on elements in vertical slides with default element attribute separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section h2.fragment.highlight-red').length, 2, 'found two h2 titles with fragment highlight-red in vertical slides with default element attribute separator'); + }); - QUnit.test( 'Attributes on elements in single slides with default element attribute separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides section p.fragment.highlight-blue' ).length, 3, 'found three elements with fragment highlight-blue in single slide with default element attribute separator' ); - }); + QUnit.test('Attributes on elements in single slides with default element attribute separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides section p.fragment.highlight-blue').length, 3, 'found three elements with fragment highlight-blue in single slide with default element attribute separator'); + }); -} ); +}); Reveal.initialize(); diff --git a/test/test-markdown-external.html b/test/test-markdown-external.html index d4912b0..9a368ba 100644 --- a/test/test-markdown-external.html +++ b/test/test-markdown-external.html @@ -1,36 +1,37 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Test Markdown</title> + <title>reveal.js - Test Markdown</title> - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> + <link href="../css/reveal.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> - <body style="overflow: auto;"> +<body style="overflow: auto;"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> +<div id="qunit"></div> +<div id="qunit-fixture"></div> - <div class="reveal" style="display: none;"> +<div class="reveal" style="display: none;"> - <div class="slides"> - <section data-markdown="simple.md" data-separator="^\r?\n\r?\n\r?\n" data-separator-vertical="^\r?\n\r?\n"></section> - </div> + <div class="slides"> + <section data-markdown="simple.md" data-separator="^\r?\n\r?\n\r?\n" + data-separator-vertical="^\r?\n\r?\n"></section> + </div> - </div> +</div> - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="../plugin/highlight/highlight.js"></script> - <script src="../plugin/markdown/marked.js"></script> - <script src="../plugin/markdown/markdown.js"></script> - <script src="qunit-2.5.0.js"></script> +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="../plugin/highlight/highlight.js"></script> +<script src="../plugin/markdown/marked.js"></script> +<script src="../plugin/markdown/markdown.js"></script> +<script src="qunit-2.5.0.js"></script> - <script src="test-markdown-external.js"></script> +<script src="test-markdown-external.js"></script> - </body> +</body> </html> diff --git a/test/test-markdown-external.js b/test/test-markdown-external.js index f924986..e72de7a 100644 --- a/test/test-markdown-external.js +++ b/test/test-markdown-external.js @@ -1,20 +1,20 @@ -Reveal.addEventListener( 'ready', function() { +Reveal.addEventListener('ready', function () { - QUnit.module( 'Markdown' ); + QUnit.module('Markdown'); - QUnit.test( 'Vertical separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' ); - }); + QUnit.test('Vertical separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section').length, 2, 'found two slides'); + }); - QUnit.test( 'Horizontal separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section' ).length, 2, 'found two slides' ); - }); + QUnit.test('Horizontal separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section').length, 2, 'found two slides'); + }); - QUnit.test( 'Language highlighter', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.hljs-keyword' ).length, 1, 'got rendered highlight tag.' ); - assert.strictEqual( document.querySelector( '.hljs-keyword' ).innerHTML, 'var', 'the same keyword: var.' ); - }); + QUnit.test('Language highlighter', function (assert) { + assert.strictEqual(document.querySelectorAll('.hljs-keyword').length, 1, 'got rendered highlight tag.'); + assert.strictEqual(document.querySelector('.hljs-keyword').innerHTML, 'var', 'the same keyword: var.'); + }); -} ); +}); Reveal.initialize(); diff --git a/test/test-markdown-options.html b/test/test-markdown-options.html index 598243a..eefd851 100644 --- a/test/test-markdown-options.html +++ b/test/test-markdown-options.html @@ -1,41 +1,41 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Test Markdown Options</title> + <title>reveal.js - Test Markdown Options</title> - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> + <link href="../css/reveal.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> - <body style="overflow: auto;"> +<body style="overflow: auto;"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> +<div id="qunit"></div> +<div id="qunit-fixture"></div> - <div class="reveal" style="display: none;"> +<div class="reveal" style="display: none;"> - <div class="slides"> + <div class="slides"> - <section data-markdown> - <script type="text/template"> - ## Testing Markdown Options + <section data-markdown> + <script type="text/template"> + ## Testing Markdown Options - This "slide" should contain 'smart' quotes. - </script> - </section> + This "slide" should contain 'smart' quotes. + </script> + </section> - </div> + </div> - </div> +</div> - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="qunit-2.5.0.js"></script> +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="qunit-2.5.0.js"></script> - <script src="test-markdown-options.js"></script> +<script src="test-markdown-options.js"></script> - </body> +</body> </html> diff --git a/test/test-markdown-options.js b/test/test-markdown-options.js index ef61659..a9eb18d 100644 --- a/test/test-markdown-options.js +++ b/test/test-markdown-options.js @@ -1,27 +1,27 @@ -Reveal.addEventListener( 'ready', function() { +Reveal.addEventListener('ready', function () { - QUnit.module( 'Markdown' ); + QUnit.module('Markdown'); - QUnit.test( 'Options are set', function( assert ) { - assert.strictEqual( marked.defaults.smartypants, true ); - }); + QUnit.test('Options are set', function (assert) { + assert.strictEqual(marked.defaults.smartypants, true); + }); - QUnit.test( 'Smart quotes are activated', function( assert ) { - var text = document.querySelector( '.reveal .slides>section>p' ).textContent; + QUnit.test('Smart quotes are activated', function (assert) { + var text = document.querySelector('.reveal .slides>section>p').textContent; - assert.strictEqual( /['"]/.test( text ), false ); - assert.strictEqual( /[“”‘’]/.test( text ), true ); - }); + assert.strictEqual(/['"]/.test(text), false); + assert.strictEqual(/[“”‘’]/.test(text), true); + }); -} ); +}); Reveal.initialize({ - dependencies: [ - { src: '../plugin/markdown/marked.js' }, - // Test loading JS files with query strings - { src: '../plugin/markdown/markdown.js?query=string' }, - ], - markdown: { - smartypants: true - } + dependencies: [ + {src: '../plugin/markdown/marked.js'}, + // Test loading JS files with query strings + {src: '../plugin/markdown/markdown.js?query=string'}, + ], + markdown: { + smartypants: true + } }); diff --git a/test/test-markdown-slide-attributes.html b/test/test-markdown-slide-attributes.html index e90a9cf..8e56c2c 100644 --- a/test/test-markdown-slide-attributes.html +++ b/test/test-markdown-slide-attributes.html @@ -1,128 +1,122 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Test Markdown Attributes</title> + <title>reveal.js - Test Markdown Attributes</title> - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> + <link href="../css/reveal.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> - <body style="overflow: auto;"> +<body style="overflow: auto;"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> +<div id="qunit"></div> +<div id="qunit-fixture"></div> - <div class="reveal" style="display: none;"> +<div class="reveal" style="display: none;"> - <div class="slides"> + <div class="slides"> - <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> --> + <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> --> - <!-- Slides are separated by three lines, vertical slides by two lines, attributes are one any line starting with (spaces and) two dashes --> - <section data-markdown data-separator="^\n\n\n" - data-separator-vertical="^\n\n" - data-separator-notes="^Note:" - data-attributes="--\s(.*?)$" - data-charset="utf-8"> - <script type="text/template"> - # Test attributes in Markdown - ## Slide 1 + <!-- Slides are separated by three lines, vertical slides by two lines, attributes are one any line starting with (spaces and) two dashes --> + <section data-attributes="--\s(.*?)$" data-charset="utf-8" + data-markdown + data-separator="^\n\n\n" + data-separator-notes="^Note:" + data-separator-vertical="^\n\n"> + <script type="text/template"> + # Test attributes in Markdown + ## Slide 1 + ## Slide 2 + <!-- -- id="slide2" data-transition="zoom" data-background="#A0C66B" --> - ## Slide 2 - <!-- -- id="slide2" data-transition="zoom" data-background="#A0C66B" --> + ## Slide 2.1 + <!-- -- data-background="#ff0000" data-transition="fade" --> - ## Slide 2.1 - <!-- -- data-background="#ff0000" data-transition="fade" --> + ## Slide 2.2 + [Link to Slide2](#/slide2) - ## Slide 2.2 - [Link to Slide2](#/slide2) + ## Slide 3 + <!-- -- data-transition="zoom" data-background="#C6916B" --> - ## Slide 3 - <!-- -- data-transition="zoom" data-background="#C6916B" --> + ## Slide 4 + </script> + </section> + <section data-charset="utf-8" data-markdown + data-separator="^\n\n\n" + data-separator-notes="^Note:" + data-separator-vertical="^\n\n"> + <script type="text/template"> + # Test attributes in Markdown with default separator + ## Slide 1 Def - ## Slide 4 - </script> - </section> + ## Slide 2 Def + <!-- .slide: id="slide2def" data-transition="concave" data-background="#A7C66B" --> - <section data-markdown data-separator="^\n\n\n" - data-separator-vertical="^\n\n" - data-separator-notes="^Note:" - data-charset="utf-8"> - <script type="text/template"> - # Test attributes in Markdown with default separator - ## Slide 1 Def + ## Slide 2.1 Def + <!-- .slide: data-background="#f70000" data-transition="page" --> - ## Slide 2 Def - <!-- .slide: id="slide2def" data-transition="concave" data-background="#A7C66B" --> + ## Slide 2.2 Def + [Link to Slide2](#/slide2def) - ## Slide 2.1 Def - <!-- .slide: data-background="#f70000" data-transition="page" --> + ## Slide 3 Def + <!-- .slide: data-transition="concave" data-background="#C7916B" --> - ## Slide 2.2 Def - [Link to Slide2](#/slide2def) + ## Slide 4 + </script> + </section> + <section data-markdown> + <script type="text/template"> + <!-- .slide: data-background="#ff0000" --> + ## Hello world + </script> + </section> + <section data-markdown> + <script type="text/template"> + ## Hello world + <!-- .slide: data-background="#ff0000" --> + </script> + </section> - ## Slide 3 Def - <!-- .slide: data-transition="concave" data-background="#C7916B" --> + <section data-markdown> + <script type="text/template"> + ## Hello world + Test + <!-- .slide: data-background="#ff0000" --> + More Test + </script> + </section> - ## Slide 4 - </script> - </section> + </div> - <section data-markdown> - <script type="text/template"> - <!-- .slide: data-background="#ff0000" --> - ## Hello world - </script> - </section> +</div> - <section data-markdown> - <script type="text/template"> - ## Hello world - <!-- .slide: data-background="#ff0000" --> - </script> - </section> +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="../plugin/markdown/marked.js"></script> +<script src="../plugin/markdown/markdown.js"></script> +<script src="qunit-2.5.0.js"></script> - <section data-markdown> - <script type="text/template"> - ## Hello world +<script src="test-markdown-slide-attributes.js"></script> - Test - <!-- .slide: data-background="#ff0000" --> - - More Test - </script> - </section> - - </div> - - </div> - - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="../plugin/markdown/marked.js"></script> - <script src="../plugin/markdown/markdown.js"></script> - <script src="qunit-2.5.0.js"></script> - - <script src="test-markdown-slide-attributes.js"></script> - - </body> +</body> </html> diff --git a/test/test-markdown-slide-attributes.js b/test/test-markdown-slide-attributes.js index b44323a..0dbe529 100644 --- a/test/test-markdown-slide-attributes.js +++ b/test/test-markdown-slide-attributes.js @@ -1,44 +1,44 @@ -Reveal.addEventListener( 'ready', function() { - - QUnit.module( 'Markdown' ); - - QUnit.test( 'Vertical separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 6, 'found six vertical slides' ); - }); - - QUnit.test( 'Id on slide', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section#slide2' ).length, 1, 'found one slide with id slide2' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section a[href="#/slide2"]' ).length, 1, 'found one slide with a link to slide2' ); - }); - - QUnit.test( 'data-background attributes', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-background="#A0C66B"]' ).length, 1, 'found one vertical slide with data-background="#A0C66B"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-background="#ff0000"]' ).length, 1, 'found one vertical slide with data-background="#ff0000"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section[data-background="#C6916B"]' ).length, 1, 'found one slide with data-background="#C6916B"' ); - }); - - QUnit.test( 'data-transition attributes', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-transition="zoom"]' ).length, 1, 'found one vertical slide with data-transition="zoom"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-transition="fade"]' ).length, 1, 'found one vertical slide with data-transition="fade"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides section [data-transition="zoom"]' ).length, 1, 'found one slide with data-transition="zoom"' ); - }); - - QUnit.test( 'data-background attributes with default separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-background="#A7C66B"]' ).length, 1, 'found one vertical slide with data-background="#A0C66B"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-background="#f70000"]' ).length, 1, 'found one vertical slide with data-background="#ff0000"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section[data-background="#C7916B"]' ).length, 1, 'found one slide with data-background="#C6916B"' ); - }); - - QUnit.test( 'data-transition attributes with default separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-transition="concave"]' ).length, 1, 'found one vertical slide with data-transition="zoom"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section[data-transition="page"]' ).length, 1, 'found one vertical slide with data-transition="fade"' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides section [data-transition="concave"]' ).length, 1, 'found one slide with data-transition="zoom"' ); - }); - - QUnit.test( 'data-transition attributes with inline content', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section[data-background="#ff0000"]' ).length, 3, 'found three horizontal slides with data-background="#ff0000"' ); - }); - -} ); +Reveal.addEventListener('ready', function () { + + QUnit.module('Markdown'); + + QUnit.test('Vertical separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section').length, 6, 'found six vertical slides'); + }); + + QUnit.test('Id on slide', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section#slide2').length, 1, 'found one slide with id slide2'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section a[href="#/slide2"]').length, 1, 'found one slide with a link to slide2'); + }); + + QUnit.test('data-background attributes', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-background="#A0C66B"]').length, 1, 'found one vertical slide with data-background="#A0C66B"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-background="#ff0000"]').length, 1, 'found one vertical slide with data-background="#ff0000"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section[data-background="#C6916B"]').length, 1, 'found one slide with data-background="#C6916B"'); + }); + + QUnit.test('data-transition attributes', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-transition="zoom"]').length, 1, 'found one vertical slide with data-transition="zoom"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-transition="fade"]').length, 1, 'found one vertical slide with data-transition="fade"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides section [data-transition="zoom"]').length, 1, 'found one slide with data-transition="zoom"'); + }); + + QUnit.test('data-background attributes with default separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-background="#A7C66B"]').length, 1, 'found one vertical slide with data-background="#A0C66B"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-background="#f70000"]').length, 1, 'found one vertical slide with data-background="#ff0000"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section[data-background="#C7916B"]').length, 1, 'found one slide with data-background="#C6916B"'); + }); + + QUnit.test('data-transition attributes with default separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-transition="concave"]').length, 1, 'found one vertical slide with data-transition="zoom"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section[data-transition="page"]').length, 1, 'found one vertical slide with data-transition="fade"'); + assert.strictEqual(document.querySelectorAll('.reveal .slides section [data-transition="concave"]').length, 1, 'found one slide with data-transition="zoom"'); + }); + + QUnit.test('data-transition attributes with inline content', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section[data-background="#ff0000"]').length, 3, 'found three horizontal slides with data-background="#ff0000"'); + }); + +}); Reveal.initialize(); diff --git a/test/test-markdown.html b/test/test-markdown.html index 00f7e7a..c9e49da 100644 --- a/test/test-markdown.html +++ b/test/test-markdown.html @@ -1,52 +1,52 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> +<head> + <meta charset="utf-8"> - <title>reveal.js - Test Markdown</title> + <title>reveal.js - Test Markdown</title> - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> + <link href="../css/reveal.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> - <body style="overflow: auto;"> +<body style="overflow: auto;"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> +<div id="qunit"></div> +<div id="qunit-fixture"></div> - <div class="reveal" style="display: none;"> +<div class="reveal" style="display: none;"> - <div class="slides"> + <div class="slides"> - <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> --> + <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> --> - <!-- Slides are separated by newline + three dashes + newline, vertical slides identical but two dashes --> - <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$"> - <script type="text/template"> - ## Slide 1.1 + <!-- Slides are separated by newline + three dashes + newline, vertical slides identical but two dashes --> + <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$"> + <script type="text/template"> + ## Slide 1.1 - -- + -- - ## Slide 1.2 + ## Slide 1.2 - --- + --- - ## Slide 2 - </script> - </section> + ## Slide 2 + </script> + </section> - </div> + </div> - </div> +</div> - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="../plugin/markdown/marked.js"></script> - <script src="../plugin/markdown/markdown.js"></script> - <script src="qunit-2.5.0.js"></script> +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="../plugin/markdown/marked.js"></script> +<script src="../plugin/markdown/markdown.js"></script> +<script src="qunit-2.5.0.js"></script> - <script src="test-markdown.js"></script> +<script src="test-markdown.js"></script> - </body> +</body> </html> diff --git a/test/test-markdown.js b/test/test-markdown.js index 5ea8bf2..a2758ec 100644 --- a/test/test-markdown.js +++ b/test/test-markdown.js @@ -1,11 +1,11 @@ -Reveal.addEventListener( 'ready', function() { +Reveal.addEventListener('ready', function () { - QUnit.module( 'Markdown' ); + QUnit.module('Markdown'); - QUnit.test( 'Vertical separator', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' ); - }); + QUnit.test('Vertical separator', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal .slides>section>section').length, 2, 'found two slides'); + }); -} ); +}); Reveal.initialize(); diff --git a/test/test-pdf.html b/test/test-pdf.html index 5ab8578..4de9591 100644 --- a/test/test-pdf.html +++ b/test/test-pdf.html @@ -1,83 +1,83 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> - - <title>reveal.js - Test PDF exports</title> - - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="../css/print/pdf.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> - - <body style="overflow: auto;"> - - <div id="qunit"></div> - <div id="qunit-fixture"></div> - - <div class="reveal" style="display: none;"> - - <div class="slides"> - - <section> - <h1>1</h1> - <img data-src="fake-url.png"> - </section> - - <section> - <section> - <h1>2.1</h1> - </section> - <section> - <h1>2.2</h1> - </section> - <section> - <h1>2.3</h1> - </section> - </section> - - <section id="fragment-slides"> - <section> - <h1>3.1</h1> - <ul> - <li class="fragment">4.1</li> - <li class="fragment">4.2</li> - <li class="fragment">4.3</li> - </ul> - </section> - - <section> - <h1>3.2</h1> - <ul> - <li class="fragment" data-fragment-index="0">4.1</li> - <li class="fragment" data-fragment-index="0">4.2</li> - </ul> - </section> - - <section> - <h1>3.3</h1> - <ul> - <li class="fragment" data-fragment-index="1">3.3.1</li> - <li class="fragment" data-fragment-index="4">3.3.2</li> - <li class="fragment" data-fragment-index="4">3.3.3</li> - </ul> - </section> - </section> - - <section> - <h1>4</h1> - </section> - - </div> - - </div> - - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="qunit-2.5.0.js"></script> - - <script src="test-pdf.js"></script> - - </body> +<head> + <meta charset="utf-8"> + + <title>reveal.js - Test PDF exports</title> + + <link href="../css/reveal.css" rel="stylesheet"> + <link href="../css/print/pdf.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> + +<body style="overflow: auto;"> + +<div id="qunit"></div> +<div id="qunit-fixture"></div> + +<div class="reveal" style="display: none;"> + + <div class="slides"> + + <section> + <h1>1</h1> + <img data-src="fake-url.png"> + </section> + + <section> + <section> + <h1>2.1</h1> + </section> + <section> + <h1>2.2</h1> + </section> + <section> + <h1>2.3</h1> + </section> + </section> + + <section id="fragment-slides"> + <section> + <h1>3.1</h1> + <ul> + <li class="fragment">4.1</li> + <li class="fragment">4.2</li> + <li class="fragment">4.3</li> + </ul> + </section> + + <section> + <h1>3.2</h1> + <ul> + <li class="fragment" data-fragment-index="0">4.1</li> + <li class="fragment" data-fragment-index="0">4.2</li> + </ul> + </section> + + <section> + <h1>3.3</h1> + <ul> + <li class="fragment" data-fragment-index="1">3.3.1</li> + <li class="fragment" data-fragment-index="4">3.3.2</li> + <li class="fragment" data-fragment-index="4">3.3.3</li> + </ul> + </section> + </section> + + <section> + <h1>4</h1> + </section> + + </div> + +</div> + +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="qunit-2.5.0.js"></script> + +<script src="test-pdf.js"></script> + +</body> </html> diff --git a/test/test-pdf.js b/test/test-pdf.js index 1ebf997..60e1bae 100644 --- a/test/test-pdf.js +++ b/test/test-pdf.js @@ -1,12 +1,12 @@ -Reveal.addEventListener( 'ready', function() { +Reveal.addEventListener('ready', function () { - // Only one test for now, we're mainly ensuring that there - // are no execution errors when running PDF mode + // Only one test for now, we're mainly ensuring that there + // are no execution errors when running PDF mode - QUnit.test( 'Reveal.isReady', function( assert ) { - assert.strictEqual( Reveal.isReady(), true, 'returns true' ); - }); + QUnit.test('Reveal.isReady', function (assert) { + assert.strictEqual(Reveal.isReady(), true, 'returns true'); + }); -} ); +}); -Reveal.initialize({ pdf: true }); +Reveal.initialize({pdf: true}); diff --git a/test/test.html b/test/test.html index f0a5050..e30ae74 100644 --- a/test/test.html +++ b/test/test.html @@ -1,86 +1,86 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> - - <title>reveal.js - Tests</title> - - <link rel="stylesheet" href="../css/reveal.css"> - <link rel="stylesheet" href="qunit-2.5.0.css"> - </head> - - <body style="overflow: auto;"> - - <div id="qunit"></div> - <div id="qunit-fixture"></div> - - <div class="reveal" style="display: none;"> - - <div class="slides"> - - <section data-background-image="examples/assets/image1.png"> - <h1>1</h1> - <img data-src="fake-url.png"> - <video data-src="fake-url.mp4"></video> - <audio data-src="fake-url.mp3"></audio> - <aside class="notes">speaker notes 1</aside> - </section> - - <section> - <section data-background="examples/assets/image2.png" data-notes="speaker notes 2"> - <h1>2.1</h1> - </section> - <section> - <h1>2.2</h1> - </section> - <section> - <h1>2.3</h1> - </section> - </section> - - <section id="fragment-slides"> - <section> - <h1>3.1</h1> - <ul> - <li class="fragment">4.1</li> - <li class="fragment">4.2</li> - <li class="fragment">4.3</li> - </ul> - </section> - - <section> - <h1>3.2</h1> - <ul> - <li class="fragment" data-fragment-index="0">4.1</li> - <li class="fragment" data-fragment-index="0">4.2</li> - </ul> - <iframe data-src="http://example.com"></iframe> - </section> - - <section> - <h1>3.3</h1> - <ul> - <li class="fragment" data-fragment-index="1">3.3.1</li> - <li class="fragment" data-fragment-index="4">3.3.2</li> - <li class="fragment" data-fragment-index="4">3.3.3</li> - </ul> - </section> - </section> - - <section> - <h1>4</h1> - </section> - - </div> - - </div> - - <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.js"></script> - <script src="qunit-2.5.0.js"></script> - - <script src="test.js"></script> - - </body> +<head> + <meta charset="utf-8"> + + <title>reveal.js - Tests</title> + + <link href="../css/reveal.css" rel="stylesheet"> + <link href="qunit-2.5.0.css" rel="stylesheet"> +</head> + +<body style="overflow: auto;"> + +<div id="qunit"></div> +<div id="qunit-fixture"></div> + +<div class="reveal" style="display: none;"> + + <div class="slides"> + + <section data-background-image="examples/assets/image1.png"> + <h1>1</h1> + <img data-src="fake-url.png"> + <video data-src="fake-url.mp4"></video> + <audio data-src="fake-url.mp3"></audio> + <aside class="notes">speaker notes 1</aside> + </section> + + <section> + <section data-background="examples/assets/image2.png" data-notes="speaker notes 2"> + <h1>2.1</h1> + </section> + <section> + <h1>2.2</h1> + </section> + <section> + <h1>2.3</h1> + </section> + </section> + + <section id="fragment-slides"> + <section> + <h1>3.1</h1> + <ul> + <li class="fragment">4.1</li> + <li class="fragment">4.2</li> + <li class="fragment">4.3</li> + </ul> + </section> + + <section> + <h1>3.2</h1> + <ul> + <li class="fragment" data-fragment-index="0">4.1</li> + <li class="fragment" data-fragment-index="0">4.2</li> + </ul> + <iframe data-src="http://example.com"></iframe> + </section> + + <section> + <h1>3.3</h1> + <ul> + <li class="fragment" data-fragment-index="1">3.3.1</li> + <li class="fragment" data-fragment-index="4">3.3.2</li> + <li class="fragment" data-fragment-index="4">3.3.3</li> + </ul> + </section> + </section> + + <section> + <h1>4</h1> + </section> + + </div> + +</div> + +<script src="../lib/js/head.min.js"></script> +<script src="../js/reveal.js"></script> +<script src="qunit-2.5.0.js"></script> + +<script src="test.js"></script> + +</body> </html> diff --git a/test/test.js b/test/test.js index f8515a0..ce86717 100644 --- a/test/test.js +++ b/test/test.js @@ -7,587 +7,597 @@ // 3 - Two fragments with same data-fragment-index // 4 -Reveal.addEventListener( 'ready', function() { +Reveal.addEventListener('ready', function () { - // --------------------------------------------------------------- - // DOM TESTS + // --------------------------------------------------------------- + // DOM TESTS - QUnit.module( 'DOM' ); + QUnit.module('DOM'); - QUnit.test( 'Initial slides classes', function( assert ) { - var horizontalSlides = document.querySelectorAll( '.reveal .slides>section' ) + QUnit.test('Initial slides classes', function (assert) { + var horizontalSlides = document.querySelectorAll('.reveal .slides>section'); - assert.strictEqual( document.querySelectorAll( '.reveal .slides section.past' ).length, 0, 'no .past slides' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides section.present' ).length, 1, 'one .present slide' ); - assert.strictEqual( document.querySelectorAll( '.reveal .slides>section.future' ).length, horizontalSlides.length - 1, 'remaining horizontal slides are .future' ); + assert.strictEqual(document.querySelectorAll('.reveal .slides section.past').length, 0, 'no .past slides'); + assert.strictEqual(document.querySelectorAll('.reveal .slides section.present').length, 1, 'one .present slide'); + assert.strictEqual(document.querySelectorAll('.reveal .slides>section.future').length, horizontalSlides.length - 1, 'remaining horizontal slides are .future'); - assert.strictEqual( document.querySelectorAll( '.reveal .slides section.stack' ).length, 2, 'two .stacks' ); + assert.strictEqual(document.querySelectorAll('.reveal .slides section.stack').length, 2, 'two .stacks'); - assert.ok( document.querySelectorAll( '.reveal .slides section.stack' )[0].querySelectorAll( '.future' ).length > 0, 'vertical slides are given .future' ); - }); + assert.ok(document.querySelectorAll('.reveal .slides section.stack')[0].querySelectorAll('.future').length > 0, 'vertical slides are given .future'); + }); - // --------------------------------------------------------------- - // API TESTS + // --------------------------------------------------------------- + // API TESTS - QUnit.module( 'API' ); + QUnit.module('API'); - QUnit.test( 'Reveal.isReady', function( assert ) { - assert.strictEqual( Reveal.isReady(), true, 'returns true' ); - }); + QUnit.test('Reveal.isReady', function (assert) { + assert.strictEqual(Reveal.isReady(), true, 'returns true'); + }); - QUnit.test( 'Reveal.isOverview', function( assert ) { - assert.strictEqual( Reveal.isOverview(), false, 'false by default' ); + QUnit.test('Reveal.isOverview', function (assert) { + assert.strictEqual(Reveal.isOverview(), false, 'false by default'); - Reveal.toggleOverview(); - assert.strictEqual( Reveal.isOverview(), true, 'true after toggling on' ); + Reveal.toggleOverview(); + assert.strictEqual(Reveal.isOverview(), true, 'true after toggling on'); - Reveal.toggleOverview(); - assert.strictEqual( Reveal.isOverview(), false, 'false after toggling off' ); - }); + Reveal.toggleOverview(); + assert.strictEqual(Reveal.isOverview(), false, 'false after toggling off'); + }); - QUnit.test( 'Reveal.isPaused', function( assert ) { - assert.strictEqual( Reveal.isPaused(), false, 'false by default' ); + QUnit.test('Reveal.isPaused', function (assert) { + assert.strictEqual(Reveal.isPaused(), false, 'false by default'); - Reveal.togglePause(); - assert.strictEqual( Reveal.isPaused(), true, 'true after pausing' ); + Reveal.togglePause(); + assert.strictEqual(Reveal.isPaused(), true, 'true after pausing'); - Reveal.togglePause(); - assert.strictEqual( Reveal.isPaused(), false, 'false after resuming' ); - }); + Reveal.togglePause(); + assert.strictEqual(Reveal.isPaused(), false, 'false after resuming'); + }); - QUnit.test( 'Reveal.isFirstSlide', function( assert ) { - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.isFirstSlide(), true, 'true after Reveal.slide( 0, 0 )' ); + QUnit.test('Reveal.isFirstSlide', function (assert) { + Reveal.slide(0, 0); + assert.strictEqual(Reveal.isFirstSlide(), true, 'true after Reveal.slide( 0, 0 )'); - Reveal.slide( 1, 0 ); - assert.strictEqual( Reveal.isFirstSlide(), false, 'false after Reveal.slide( 1, 0 )' ); + Reveal.slide(1, 0); + assert.strictEqual(Reveal.isFirstSlide(), false, 'false after Reveal.slide( 1, 0 )'); - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.isFirstSlide(), true, 'true after Reveal.slide( 0, 0 )' ); - }); + Reveal.slide(0, 0); + assert.strictEqual(Reveal.isFirstSlide(), true, 'true after Reveal.slide( 0, 0 )'); + }); - QUnit.test( 'Reveal.isFirstSlide after vertical slide', function( assert ) { - Reveal.slide( 1, 1 ); - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.isFirstSlide(), true, 'true after Reveal.slide( 1, 1 ) and then Reveal.slide( 0, 0 )' ); - }); + QUnit.test('Reveal.isFirstSlide after vertical slide', function (assert) { + Reveal.slide(1, 1); + Reveal.slide(0, 0); + assert.strictEqual(Reveal.isFirstSlide(), true, 'true after Reveal.slide( 1, 1 ) and then Reveal.slide( 0, 0 )'); + }); - QUnit.test( 'Reveal.isLastSlide', function( assert ) { - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.isLastSlide(), false, 'false after Reveal.slide( 0, 0 )' ); + QUnit.test('Reveal.isLastSlide', function (assert) { + Reveal.slide(0, 0); + assert.strictEqual(Reveal.isLastSlide(), false, 'false after Reveal.slide( 0, 0 )'); - var lastSlideIndex = document.querySelectorAll( '.reveal .slides>section' ).length - 1; + var lastSlideIndex = document.querySelectorAll('.reveal .slides>section').length - 1; - Reveal.slide( lastSlideIndex, 0 ); - assert.strictEqual( Reveal.isLastSlide(), true, 'true after Reveal.slide( '+ lastSlideIndex +', 0 )' ); + Reveal.slide(lastSlideIndex, 0); + assert.strictEqual(Reveal.isLastSlide(), true, 'true after Reveal.slide( ' + lastSlideIndex + ', 0 )'); - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.isLastSlide(), false, 'false after Reveal.slide( 0, 0 )' ); - }); + Reveal.slide(0, 0); + assert.strictEqual(Reveal.isLastSlide(), false, 'false after Reveal.slide( 0, 0 )'); + }); - QUnit.test( 'Reveal.isLastSlide after vertical slide', function( assert ) { - var lastSlideIndex = document.querySelectorAll( '.reveal .slides>section' ).length - 1; + QUnit.test('Reveal.isLastSlide after vertical slide', function (assert) { + var lastSlideIndex = document.querySelectorAll('.reveal .slides>section').length - 1; - Reveal.slide( 1, 1 ); - Reveal.slide( lastSlideIndex ); - assert.strictEqual( Reveal.isLastSlide(), true, 'true after Reveal.slide( 1, 1 ) and then Reveal.slide( '+ lastSlideIndex +', 0 )' ); - }); + Reveal.slide(1, 1); + Reveal.slide(lastSlideIndex); + assert.strictEqual(Reveal.isLastSlide(), true, 'true after Reveal.slide( 1, 1 ) and then Reveal.slide( ' + lastSlideIndex + ', 0 )'); + }); - QUnit.test( 'Reveal.getTotalSlides', function( assert ) { - assert.strictEqual( Reveal.getTotalSlides(), 8, 'eight slides in total' ); - }); + QUnit.test('Reveal.getTotalSlides', function (assert) { + assert.strictEqual(Reveal.getTotalSlides(), 8, 'eight slides in total'); + }); - QUnit.test( 'Reveal.getIndices', function( assert ) { - var indices = Reveal.getIndices(); + QUnit.test('Reveal.getIndices', function (assert) { + var indices = Reveal.getIndices(); - assert.ok( indices.hasOwnProperty( 'h' ), 'h exists' ); - assert.ok( indices.hasOwnProperty( 'v' ), 'v exists' ); - assert.ok( indices.hasOwnProperty( 'f' ), 'f exists' ); + assert.ok(indices.hasOwnProperty('h'), 'h exists'); + assert.ok(indices.hasOwnProperty('v'), 'v exists'); + assert.ok(indices.hasOwnProperty('f'), 'f exists'); - Reveal.slide( 1, 0 ); - assert.strictEqual( Reveal.getIndices().h, 1, 'h 1' ); - assert.strictEqual( Reveal.getIndices().v, 0, 'v 0' ); + Reveal.slide(1, 0); + assert.strictEqual(Reveal.getIndices().h, 1, 'h 1'); + assert.strictEqual(Reveal.getIndices().v, 0, 'v 0'); - Reveal.slide( 1, 2 ); - assert.strictEqual( Reveal.getIndices().h, 1, 'h 1' ); - assert.strictEqual( Reveal.getIndices().v, 2, 'v 2' ); + Reveal.slide(1, 2); + assert.strictEqual(Reveal.getIndices().h, 1, 'h 1'); + assert.strictEqual(Reveal.getIndices().v, 2, 'v 2'); - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.getIndices().h, 0, 'h 0' ); - assert.strictEqual( Reveal.getIndices().v, 0, 'v 0' ); - }); + Reveal.slide(0, 0); + assert.strictEqual(Reveal.getIndices().h, 0, 'h 0'); + assert.strictEqual(Reveal.getIndices().v, 0, 'v 0'); + }); - QUnit.test( 'Reveal.getSlide', function( assert ) { - assert.equal( Reveal.getSlide( 0 ), document.querySelector( '.reveal .slides>section:first-child' ), 'gets correct first slide' ); - assert.equal( Reveal.getSlide( 1 ), document.querySelector( '.reveal .slides>section:nth-child(2)' ), 'no v index returns stack' ); - assert.equal( Reveal.getSlide( 1, 0 ), document.querySelector( '.reveal .slides>section:nth-child(2)>section:nth-child(1)' ), 'v index 0 returns first vertical child' ); - assert.equal( Reveal.getSlide( 1, 1 ), document.querySelector( '.reveal .slides>section:nth-child(2)>section:nth-child(2)' ), 'v index 1 returns second vertical child' ); + QUnit.test('Reveal.getSlide', function (assert) { + assert.equal(Reveal.getSlide(0), document.querySelector('.reveal .slides>section:first-child'), 'gets correct first slide'); + assert.equal(Reveal.getSlide(1), document.querySelector('.reveal .slides>section:nth-child(2)'), 'no v index returns stack'); + assert.equal(Reveal.getSlide(1, 0), document.querySelector('.reveal .slides>section:nth-child(2)>section:nth-child(1)'), 'v index 0 returns first vertical child'); + assert.equal(Reveal.getSlide(1, 1), document.querySelector('.reveal .slides>section:nth-child(2)>section:nth-child(2)'), 'v index 1 returns second vertical child'); - assert.strictEqual( Reveal.getSlide( 100 ), undefined, 'undefined when out of horizontal bounds' ); - assert.strictEqual( Reveal.getSlide( 1, 100 ), undefined, 'undefined when out of vertical bounds' ); - }); + assert.strictEqual(Reveal.getSlide(100), undefined, 'undefined when out of horizontal bounds'); + assert.strictEqual(Reveal.getSlide(1, 100), undefined, 'undefined when out of vertical bounds'); + }); - QUnit.test( 'Reveal.getSlideBackground', function( assert ) { - assert.equal( Reveal.getSlideBackground( 0 ), document.querySelector( '.reveal .backgrounds>.slide-background:first-child' ), 'gets correct first background' ); - assert.equal( Reveal.getSlideBackground( 1 ), document.querySelector( '.reveal .backgrounds>.slide-background:nth-child(2)' ), 'no v index returns stack' ); - assert.equal( Reveal.getSlideBackground( 1, 0 ), document.querySelector( '.reveal .backgrounds>.slide-background:nth-child(2) .slide-background:nth-child(2)' ), 'v index 0 returns first vertical child' ); - assert.equal( Reveal.getSlideBackground( 1, 1 ), document.querySelector( '.reveal .backgrounds>.slide-background:nth-child(2) .slide-background:nth-child(3)' ), 'v index 1 returns second vertical child' ); + QUnit.test('Reveal.getSlideBackground', function (assert) { + assert.equal(Reveal.getSlideBackground(0), document.querySelector('.reveal .backgrounds>.slide-background:first-child'), 'gets correct first background'); + assert.equal(Reveal.getSlideBackground(1), document.querySelector('.reveal .backgrounds>.slide-background:nth-child(2)'), 'no v index returns stack'); + assert.equal(Reveal.getSlideBackground(1, 0), document.querySelector('.reveal .backgrounds>.slide-background:nth-child(2) .slide-background:nth-child(2)'), 'v index 0 returns first vertical child'); + assert.equal(Reveal.getSlideBackground(1, 1), document.querySelector('.reveal .backgrounds>.slide-background:nth-child(2) .slide-background:nth-child(3)'), 'v index 1 returns second vertical child'); - assert.strictEqual( Reveal.getSlideBackground( 100 ), undefined, 'undefined when out of horizontal bounds' ); - assert.strictEqual( Reveal.getSlideBackground( 1, 100 ), undefined, 'undefined when out of vertical bounds' ); - }); + assert.strictEqual(Reveal.getSlideBackground(100), undefined, 'undefined when out of horizontal bounds'); + assert.strictEqual(Reveal.getSlideBackground(1, 100), undefined, 'undefined when out of vertical bounds'); + }); - QUnit.test( 'Reveal.getSlideNotes', function( assert ) { - Reveal.slide( 0, 0 ); - assert.ok( Reveal.getSlideNotes() === 'speaker notes 1', 'works with <aside class="notes">' ); + QUnit.test('Reveal.getSlideNotes', function (assert) { + Reveal.slide(0, 0); + assert.ok(Reveal.getSlideNotes() === 'speaker notes 1', 'works with <aside class="notes">'); - Reveal.slide( 1, 0 ); - assert.ok( Reveal.getSlideNotes() === 'speaker notes 2', 'works with <section data-notes="">' ); - }); + Reveal.slide(1, 0); + assert.ok(Reveal.getSlideNotes() === 'speaker notes 2', 'works with <section data-notes="">'); + }); - QUnit.test( 'Reveal.getPreviousSlide/getCurrentSlide', function( assert ) { - Reveal.slide( 0, 0 ); - Reveal.slide( 1, 0 ); + QUnit.test('Reveal.getPreviousSlide/getCurrentSlide', function (assert) { + Reveal.slide(0, 0); + Reveal.slide(1, 0); - var firstSlide = document.querySelector( '.reveal .slides>section:first-child' ); - var secondSlide = document.querySelector( '.reveal .slides>section:nth-child(2)>section' ); + var firstSlide = document.querySelector('.reveal .slides>section:first-child'); + var secondSlide = document.querySelector('.reveal .slides>section:nth-child(2)>section'); - assert.equal( Reveal.getPreviousSlide(), firstSlide, 'previous is slide #0' ); - assert.equal( Reveal.getCurrentSlide(), secondSlide, 'current is slide #1' ); - }); + assert.equal(Reveal.getPreviousSlide(), firstSlide, 'previous is slide #0'); + assert.equal(Reveal.getCurrentSlide(), secondSlide, 'current is slide #1'); + }); - QUnit.test( 'Reveal.getProgress', function( assert ) { - Reveal.slide( 0, 0 ); - assert.strictEqual( Reveal.getProgress(), 0, 'progress is 0 on first slide' ); + QUnit.test('Reveal.getProgress', function (assert) { + Reveal.slide(0, 0); + assert.strictEqual(Reveal.getProgress(), 0, 'progress is 0 on first slide'); - var lastSlideIndex = document.querySelectorAll( '.reveal .slides>section' ).length - 1; + var lastSlideIndex = document.querySelectorAll('.reveal .slides>section').length - 1; - Reveal.slide( lastSlideIndex, 0 ); - assert.strictEqual( Reveal.getProgress(), 1, 'progress is 1 on last slide' ); - }); + Reveal.slide(lastSlideIndex, 0); + assert.strictEqual(Reveal.getProgress(), 1, 'progress is 1 on last slide'); + }); - QUnit.test( 'Reveal.getScale', function( assert ) { - assert.ok( typeof Reveal.getScale() === 'number', 'has scale' ); - }); + QUnit.test('Reveal.getScale', function (assert) { + assert.ok(typeof Reveal.getScale() === 'number', 'has scale'); + }); - QUnit.test( 'Reveal.getConfig', function( assert ) { - assert.ok( typeof Reveal.getConfig() === 'object', 'has config' ); - }); + QUnit.test('Reveal.getConfig', function (assert) { + assert.ok(typeof Reveal.getConfig() === 'object', 'has config'); + }); - QUnit.test( 'Reveal.configure', function( assert ) { - assert.strictEqual( Reveal.getConfig().loop, false, '"loop" is false to start with' ); + QUnit.test('Reveal.configure', function (assert) { + assert.strictEqual(Reveal.getConfig().loop, false, '"loop" is false to start with'); - Reveal.configure({ loop: true }); - assert.strictEqual( Reveal.getConfig().loop, true, '"loop" has changed to true' ); + Reveal.configure({loop: true}); + assert.strictEqual(Reveal.getConfig().loop, true, '"loop" has changed to true'); - Reveal.configure({ loop: false, customTestValue: 1 }); - assert.strictEqual( Reveal.getConfig().customTestValue, 1, 'supports custom values' ); - }); + Reveal.configure({loop: false, customTestValue: 1}); + assert.strictEqual(Reveal.getConfig().customTestValue, 1, 'supports custom values'); + }); - QUnit.test( 'Reveal.availableRoutes', function( assert ) { - Reveal.slide( 0, 0 ); - assert.deepEqual( Reveal.availableRoutes(), { left: false, up: false, down: false, right: true }, 'correct for first slide' ); + QUnit.test('Reveal.availableRoutes', function (assert) { + Reveal.slide(0, 0); + assert.deepEqual(Reveal.availableRoutes(), { + left: false, + up: false, + down: false, + right: true + }, 'correct for first slide'); - Reveal.slide( 1, 0 ); - assert.deepEqual( Reveal.availableRoutes(), { left: true, up: false, down: true, right: true }, 'correct for vertical slide' ); - }); + Reveal.slide(1, 0); + assert.deepEqual(Reveal.availableRoutes(), { + left: true, + up: false, + down: true, + right: true + }, 'correct for vertical slide'); + }); - QUnit.test( 'Reveal.next', function( assert ) { - Reveal.slide( 0, 0 ); + QUnit.test('Reveal.next', function (assert) { + Reveal.slide(0, 0); - // Step through vertical child slides - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 1, v: 0, f: undefined } ); + // Step through vertical child slides + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 1, v: 0, f: undefined}); - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 1, v: 1, f: undefined } ); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 1, v: 1, f: undefined}); - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 1, v: 2, f: undefined } ); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 1, v: 2, f: undefined}); - // Step through fragments - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: -1 } ); + // Step through fragments + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: -1}); - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 } ); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 0}); - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 } ); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 1}); - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 } ); - }); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 2}); + }); - QUnit.test( 'Reveal.next at end', function( assert ) { - Reveal.slide( 3 ); + QUnit.test('Reveal.next at end', function (assert) { + Reveal.slide(3); - // We're at the end, this should have no effect - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 3, v: 0, f: undefined } ); + // We're at the end, this should have no effect + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 3, v: 0, f: undefined}); - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 3, v: 0, f: undefined } ); - }); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 3, v: 0, f: undefined}); + }); - // --------------------------------------------------------------- - // FRAGMENT TESTS + // --------------------------------------------------------------- + // FRAGMENT TESTS - QUnit.module( 'Fragments' ); + QUnit.module('Fragments'); - QUnit.test( 'Sliding to fragments', function( assert ) { - Reveal.slide( 2, 0, -1 ); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: -1 }, 'Reveal.slide( 2, 0, -1 )' ); + QUnit.test('Sliding to fragments', function (assert) { + Reveal.slide(2, 0, -1); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: -1}, 'Reveal.slide( 2, 0, -1 )'); - Reveal.slide( 2, 0, 0 ); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'Reveal.slide( 2, 0, 0 )' ); + Reveal.slide(2, 0, 0); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 0}, 'Reveal.slide( 2, 0, 0 )'); - Reveal.slide( 2, 0, 2 ); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 }, 'Reveal.slide( 2, 0, 2 )' ); + Reveal.slide(2, 0, 2); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 2}, 'Reveal.slide( 2, 0, 2 )'); - Reveal.slide( 2, 0, 1 ); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'Reveal.slide( 2, 0, 1 )' ); - }); + Reveal.slide(2, 0, 1); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 1}, 'Reveal.slide( 2, 0, 1 )'); + }); - QUnit.test( 'Hiding all fragments', function( assert ) { - var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + QUnit.test('Hiding all fragments', function (assert) { + var fragmentSlide = document.querySelector('#fragment-slides>section:nth-child(1)'); - Reveal.slide( 2, 0, 0 ); - assert.strictEqual( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 1, 'one fragment visible when index is 0' ); + Reveal.slide(2, 0, 0); + assert.strictEqual(fragmentSlide.querySelectorAll('.fragment.visible').length, 1, 'one fragment visible when index is 0'); - Reveal.slide( 2, 0, -1 ); - assert.strictEqual( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 0, 'no fragments visible when index is -1' ); - }); + Reveal.slide(2, 0, -1); + assert.strictEqual(fragmentSlide.querySelectorAll('.fragment.visible').length, 0, 'no fragments visible when index is -1'); + }); - QUnit.test( 'Current fragment', function( assert ) { - var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + QUnit.test('Current fragment', function (assert) { + var fragmentSlide = document.querySelector('#fragment-slides>section:nth-child(1)'); - Reveal.slide( 2, 0 ); - assert.strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 0, 'no current fragment at index -1' ); + Reveal.slide(2, 0); + assert.strictEqual(fragmentSlide.querySelectorAll('.fragment.current-fragment').length, 0, 'no current fragment at index -1'); - Reveal.slide( 2, 0, 0 ); - assert.strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 1, 'one current fragment at index 0' ); + Reveal.slide(2, 0, 0); + assert.strictEqual(fragmentSlide.querySelectorAll('.fragment.current-fragment').length, 1, 'one current fragment at index 0'); - Reveal.slide( 1, 0, 0 ); - assert.strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 0, 'no current fragment when navigating to previous slide' ); + Reveal.slide(1, 0, 0); + assert.strictEqual(fragmentSlide.querySelectorAll('.fragment.current-fragment').length, 0, 'no current fragment when navigating to previous slide'); - Reveal.slide( 3, 0, 0 ); - assert.strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 0, 'no current fragment when navigating to next slide' ); - }); + Reveal.slide(3, 0, 0); + assert.strictEqual(fragmentSlide.querySelectorAll('.fragment.current-fragment').length, 0, 'no current fragment when navigating to next slide'); + }); - QUnit.test( 'Stepping through fragments', function( assert ) { - Reveal.slide( 2, 0, -1 ); + QUnit.test('Stepping through fragments', function (assert) { + Reveal.slide(2, 0, -1); - // forwards: + // forwards: - Reveal.next(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'next() goes to next fragment' ); + Reveal.next(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 0}, 'next() goes to next fragment'); - Reveal.right(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'right() goes to next fragment' ); + Reveal.right(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 1}, 'right() goes to next fragment'); - Reveal.down(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 }, 'down() goes to next fragment' ); + Reveal.down(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 2}, 'down() goes to next fragment'); - Reveal.down(); // moves to f #3 + Reveal.down(); // moves to f #3 - // backwards: + // backwards: - Reveal.prev(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 }, 'prev() goes to prev fragment' ); + Reveal.prev(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 2}, 'prev() goes to prev fragment'); - Reveal.left(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'left() goes to prev fragment' ); + Reveal.left(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 1}, 'left() goes to prev fragment'); - Reveal.up(); - assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'up() goes to prev fragment' ); - }); + Reveal.up(); + assert.deepEqual(Reveal.getIndices(), {h: 2, v: 0, f: 0}, 'up() goes to prev fragment'); + }); - QUnit.test( 'Stepping past fragments', function( assert ) { - var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + QUnit.test('Stepping past fragments', function (assert) { + var fragmentSlide = document.querySelector('#fragment-slides>section:nth-child(1)'); - Reveal.slide( 0, 0, 0 ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 0, 'no fragments visible when on previous slide' ); + Reveal.slide(0, 0, 0); + assert.equal(fragmentSlide.querySelectorAll('.fragment.visible').length, 0, 'no fragments visible when on previous slide'); - Reveal.slide( 3, 0, 0 ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 3, 'all fragments visible when on future slide' ); - }); + Reveal.slide(3, 0, 0); + assert.equal(fragmentSlide.querySelectorAll('.fragment.visible').length, 3, 'all fragments visible when on future slide'); + }); - QUnit.test( 'Fragment indices', function( assert ) { - var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(2)' ); + QUnit.test('Fragment indices', function (assert) { + var fragmentSlide = document.querySelector('#fragment-slides>section:nth-child(2)'); - Reveal.slide( 3, 0, 0 ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 2, 'both fragments of same index are shown' ); + Reveal.slide(3, 0, 0); + assert.equal(fragmentSlide.querySelectorAll('.fragment.visible').length, 2, 'both fragments of same index are shown'); - // This slide has three fragments, first one is index 0, second and third have index 1 - Reveal.slide( 2, 2, 0 ); - assert.equal( Reveal.getIndices().f, 0, 'returns correct index for first fragment' ); + // This slide has three fragments, first one is index 0, second and third have index 1 + Reveal.slide(2, 2, 0); + assert.equal(Reveal.getIndices().f, 0, 'returns correct index for first fragment'); - Reveal.slide( 2, 2, 1 ); - assert.equal( Reveal.getIndices().f, 1, 'returns correct index for two fragments with same index' ); - }); + Reveal.slide(2, 2, 1); + assert.equal(Reveal.getIndices().f, 1, 'returns correct index for two fragments with same index'); + }); - QUnit.test( 'Index generation', function( assert ) { - var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + QUnit.test('Index generation', function (assert) { + var fragmentSlide = document.querySelector('#fragment-slides>section:nth-child(1)'); - // These have no indices defined to start with - assert.equal( fragmentSlide.querySelectorAll( '.fragment' )[0].getAttribute( 'data-fragment-index' ), '0' ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment' )[1].getAttribute( 'data-fragment-index' ), '1' ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment' )[2].getAttribute( 'data-fragment-index' ), '2' ); - }); + // These have no indices defined to start with + assert.equal(fragmentSlide.querySelectorAll('.fragment')[0].getAttribute('data-fragment-index'), '0'); + assert.equal(fragmentSlide.querySelectorAll('.fragment')[1].getAttribute('data-fragment-index'), '1'); + assert.equal(fragmentSlide.querySelectorAll('.fragment')[2].getAttribute('data-fragment-index'), '2'); + }); - QUnit.test( 'Index normalization', function( assert ) { - var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(3)' ); + QUnit.test('Index normalization', function (assert) { + var fragmentSlide = document.querySelector('#fragment-slides>section:nth-child(3)'); - // These start out as 1-4-4 and should normalize to 0-1-1 - assert.equal( fragmentSlide.querySelectorAll( '.fragment' )[0].getAttribute( 'data-fragment-index' ), '0' ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment' )[1].getAttribute( 'data-fragment-index' ), '1' ); - assert.equal( fragmentSlide.querySelectorAll( '.fragment' )[2].getAttribute( 'data-fragment-index' ), '1' ); - }); + // These start out as 1-4-4 and should normalize to 0-1-1 + assert.equal(fragmentSlide.querySelectorAll('.fragment')[0].getAttribute('data-fragment-index'), '0'); + assert.equal(fragmentSlide.querySelectorAll('.fragment')[1].getAttribute('data-fragment-index'), '1'); + assert.equal(fragmentSlide.querySelectorAll('.fragment')[2].getAttribute('data-fragment-index'), '1'); + }); - QUnit.test( 'fragmentshown event', function( assert ) { - assert.expect( 2 ); - var done = assert.async( 2 ); + QUnit.test('fragmentshown event', function (assert) { + assert.expect(2); + var done = assert.async(2); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'fragmentshown', _onEvent ); + Reveal.addEventListener('fragmentshown', _onEvent); - Reveal.slide( 2, 0 ); - Reveal.slide( 2, 0 ); // should do nothing - Reveal.slide( 2, 0, 0 ); // should do nothing - Reveal.next(); - Reveal.next(); - Reveal.prev(); // shouldn't fire fragmentshown + Reveal.slide(2, 0); + Reveal.slide(2, 0); // should do nothing + Reveal.slide(2, 0, 0); // should do nothing + Reveal.next(); + Reveal.next(); + Reveal.prev(); // shouldn't fire fragmentshown - Reveal.removeEventListener( 'fragmentshown', _onEvent ); - }); + Reveal.removeEventListener('fragmentshown', _onEvent); + }); - QUnit.test( 'fragmenthidden event', function( assert ) { - assert.expect( 2 ); - var done = assert.async( 2 ); + QUnit.test('fragmenthidden event', function (assert) { + assert.expect(2); + var done = assert.async(2); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'fragmenthidden', _onEvent ); + Reveal.addEventListener('fragmenthidden', _onEvent); - Reveal.slide( 2, 0, 2 ); - Reveal.slide( 2, 0, 2 ); // should do nothing - Reveal.prev(); - Reveal.prev(); - Reveal.next(); // shouldn't fire fragmenthidden + Reveal.slide(2, 0, 2); + Reveal.slide(2, 0, 2); // should do nothing + Reveal.prev(); + Reveal.prev(); + Reveal.next(); // shouldn't fire fragmenthidden - Reveal.removeEventListener( 'fragmenthidden', _onEvent ); - }); + Reveal.removeEventListener('fragmenthidden', _onEvent); + }); - // --------------------------------------------------------------- - // AUTO-SLIDE TESTS + // --------------------------------------------------------------- + // AUTO-SLIDE TESTS - QUnit.module( 'Auto Sliding' ); + QUnit.module('Auto Sliding'); - QUnit.test( 'Reveal.isAutoSliding', function( assert ) { - assert.strictEqual( Reveal.isAutoSliding(), false, 'false by default' ); + QUnit.test('Reveal.isAutoSliding', function (assert) { + assert.strictEqual(Reveal.isAutoSliding(), false, 'false by default'); - Reveal.configure({ autoSlide: 10000 }); - assert.strictEqual( Reveal.isAutoSliding(), true, 'true after starting' ); + Reveal.configure({autoSlide: 10000}); + assert.strictEqual(Reveal.isAutoSliding(), true, 'true after starting'); - Reveal.configure({ autoSlide: 0 }); - assert.strictEqual( Reveal.isAutoSliding(), false, 'false after setting to 0' ); - }); + Reveal.configure({autoSlide: 0}); + assert.strictEqual(Reveal.isAutoSliding(), false, 'false after setting to 0'); + }); - QUnit.test( 'Reveal.toggleAutoSlide', function( assert ) { - Reveal.configure({ autoSlide: 10000 }); + QUnit.test('Reveal.toggleAutoSlide', function (assert) { + Reveal.configure({autoSlide: 10000}); - Reveal.toggleAutoSlide(); - assert.strictEqual( Reveal.isAutoSliding(), false, 'false after first toggle' ); - Reveal.toggleAutoSlide(); - assert.strictEqual( Reveal.isAutoSliding(), true, 'true after second toggle' ); + Reveal.toggleAutoSlide(); + assert.strictEqual(Reveal.isAutoSliding(), false, 'false after first toggle'); + Reveal.toggleAutoSlide(); + assert.strictEqual(Reveal.isAutoSliding(), true, 'true after second toggle'); - Reveal.configure({ autoSlide: 0 }); - }); + Reveal.configure({autoSlide: 0}); + }); - QUnit.test( 'autoslidepaused', function( assert ) { - assert.expect( 1 ); - var done = assert.async(); + QUnit.test('autoslidepaused', function (assert) { + assert.expect(1); + var done = assert.async(); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'autoslidepaused', _onEvent ); - Reveal.configure({ autoSlide: 10000 }); - Reveal.toggleAutoSlide(); + Reveal.addEventListener('autoslidepaused', _onEvent); + Reveal.configure({autoSlide: 10000}); + Reveal.toggleAutoSlide(); - // cleanup - Reveal.configure({ autoSlide: 0 }); - Reveal.removeEventListener( 'autoslidepaused', _onEvent ); - }); + // cleanup + Reveal.configure({autoSlide: 0}); + Reveal.removeEventListener('autoslidepaused', _onEvent); + }); - QUnit.test( 'autoslideresumed', function( assert ) { - assert.expect( 1 ); - var done = assert.async(); + QUnit.test('autoslideresumed', function (assert) { + assert.expect(1); + var done = assert.async(); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'autoslideresumed', _onEvent ); - Reveal.configure({ autoSlide: 10000 }); - Reveal.toggleAutoSlide(); - Reveal.toggleAutoSlide(); + Reveal.addEventListener('autoslideresumed', _onEvent); + Reveal.configure({autoSlide: 10000}); + Reveal.toggleAutoSlide(); + Reveal.toggleAutoSlide(); - // cleanup - Reveal.configure({ autoSlide: 0 }); - Reveal.removeEventListener( 'autoslideresumed', _onEvent ); - }); + // cleanup + Reveal.configure({autoSlide: 0}); + Reveal.removeEventListener('autoslideresumed', _onEvent); + }); - // --------------------------------------------------------------- - // CONFIGURATION VALUES + // --------------------------------------------------------------- + // CONFIGURATION VALUES - QUnit.module( 'Configuration' ); + QUnit.module('Configuration'); - QUnit.test( 'Controls', function( assert ) { - var controlsElement = document.querySelector( '.reveal>.controls' ); + QUnit.test('Controls', function (assert) { + var controlsElement = document.querySelector('.reveal>.controls'); - Reveal.configure({ controls: false }); - assert.equal( controlsElement.style.display, 'none', 'controls are hidden' ); + Reveal.configure({controls: false}); + assert.equal(controlsElement.style.display, 'none', 'controls are hidden'); - Reveal.configure({ controls: true }); - assert.equal( controlsElement.style.display, 'block', 'controls are visible' ); - }); + Reveal.configure({controls: true}); + assert.equal(controlsElement.style.display, 'block', 'controls are visible'); + }); - QUnit.test( 'Progress', function( assert ) { - var progressElement = document.querySelector( '.reveal>.progress' ); + QUnit.test('Progress', function (assert) { + var progressElement = document.querySelector('.reveal>.progress'); - Reveal.configure({ progress: false }); - assert.equal( progressElement.style.display, 'none', 'progress are hidden' ); + Reveal.configure({progress: false}); + assert.equal(progressElement.style.display, 'none', 'progress are hidden'); - Reveal.configure({ progress: true }); - assert.equal( progressElement.style.display, 'block', 'progress are visible' ); - }); + Reveal.configure({progress: true}); + assert.equal(progressElement.style.display, 'block', 'progress are visible'); + }); - QUnit.test( 'Loop', function( assert ) { - Reveal.configure({ loop: true }); + QUnit.test('Loop', function (assert) { + Reveal.configure({loop: true}); - Reveal.slide( 0, 0 ); + Reveal.slide(0, 0); - Reveal.left(); - assert.notEqual( Reveal.getIndices().h, 0, 'looped from start to end' ); + Reveal.left(); + assert.notEqual(Reveal.getIndices().h, 0, 'looped from start to end'); - Reveal.right(); - assert.equal( Reveal.getIndices().h, 0, 'looped from end to start' ); + Reveal.right(); + assert.equal(Reveal.getIndices().h, 0, 'looped from end to start'); - Reveal.configure({ loop: false }); - }); + Reveal.configure({loop: false}); + }); - // --------------------------------------------------------------- - // LAZY-LOADING TESTS + // --------------------------------------------------------------- + // LAZY-LOADING TESTS - QUnit.module( 'Lazy-Loading' ); + QUnit.module('Lazy-Loading'); - QUnit.test( 'img with data-src', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal section img[src]' ).length, 1, 'Image source has been set' ); - }); + QUnit.test('img with data-src', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal section img[src]').length, 1, 'Image source has been set'); + }); - QUnit.test( 'video with data-src', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal section video[src]' ).length, 1, 'Video source has been set' ); - }); + QUnit.test('video with data-src', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal section video[src]').length, 1, 'Video source has been set'); + }); - QUnit.test( 'audio with data-src', function( assert ) { - assert.strictEqual( document.querySelectorAll( '.reveal section audio[src]' ).length, 1, 'Audio source has been set' ); - }); + QUnit.test('audio with data-src', function (assert) { + assert.strictEqual(document.querySelectorAll('.reveal section audio[src]').length, 1, 'Audio source has been set'); + }); - QUnit.test( 'iframe with data-src', function( assert ) { - Reveal.slide( 0, 0 ); - assert.strictEqual( document.querySelectorAll( '.reveal section iframe[src]' ).length, 0, 'Iframe source is not set' ); - Reveal.slide( 2, 1 ); - assert.strictEqual( document.querySelectorAll( '.reveal section iframe[src]' ).length, 1, 'Iframe source is set' ); - Reveal.slide( 2, 2 ); - assert.strictEqual( document.querySelectorAll( '.reveal section iframe[src]' ).length, 0, 'Iframe source is not set' ); - }); + QUnit.test('iframe with data-src', function (assert) { + Reveal.slide(0, 0); + assert.strictEqual(document.querySelectorAll('.reveal section iframe[src]').length, 0, 'Iframe source is not set'); + Reveal.slide(2, 1); + assert.strictEqual(document.querySelectorAll('.reveal section iframe[src]').length, 1, 'Iframe source is set'); + Reveal.slide(2, 2); + assert.strictEqual(document.querySelectorAll('.reveal section iframe[src]').length, 0, 'Iframe source is not set'); + }); - QUnit.test( 'background images', function( assert ) { - var imageSource1 = Reveal.getSlide( 0 ).getAttribute( 'data-background-image' ); - var imageSource2 = Reveal.getSlide( 1, 0 ).getAttribute( 'data-background' ); + QUnit.test('background images', function (assert) { + var imageSource1 = Reveal.getSlide(0).getAttribute('data-background-image'); + var imageSource2 = Reveal.getSlide(1, 0).getAttribute('data-background'); - // check that the images are applied to the background elements - assert.ok( Reveal.getSlideBackground( 0 ).querySelector( '.slide-background-content' ).style.backgroundImage.indexOf( imageSource1 ) !== -1, 'data-background-image worked' ); - assert.ok( Reveal.getSlideBackground( 1, 0 ).querySelector( '.slide-background-content' ).style.backgroundImage.indexOf( imageSource2 ) !== -1, 'data-background worked' ); - }); + // check that the images are applied to the background elements + assert.ok(Reveal.getSlideBackground(0).querySelector('.slide-background-content').style.backgroundImage.indexOf(imageSource1) !== -1, 'data-background-image worked'); + assert.ok(Reveal.getSlideBackground(1, 0).querySelector('.slide-background-content').style.backgroundImage.indexOf(imageSource2) !== -1, 'data-background worked'); + }); - // --------------------------------------------------------------- - // EVENT TESTS + // --------------------------------------------------------------- + // EVENT TESTS - QUnit.module( 'Events' ); + QUnit.module('Events'); - QUnit.test( 'slidechanged', function( assert ) { - assert.expect( 3 ); - var done = assert.async( 3 ); + QUnit.test('slidechanged', function (assert) { + assert.expect(3); + var done = assert.async(3); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'slidechanged', _onEvent ); + Reveal.addEventListener('slidechanged', _onEvent); - Reveal.slide( 1, 0 ); // should trigger - Reveal.slide( 1, 0 ); // should do nothing - Reveal.next(); // should trigger - Reveal.slide( 3, 0 ); // should trigger - Reveal.next(); // should do nothing + Reveal.slide(1, 0); // should trigger + Reveal.slide(1, 0); // should do nothing + Reveal.next(); // should trigger + Reveal.slide(3, 0); // should trigger + Reveal.next(); // should do nothing - Reveal.removeEventListener( 'slidechanged', _onEvent ); + Reveal.removeEventListener('slidechanged', _onEvent); - }); + }); - QUnit.test( 'paused', function( assert ) { - assert.expect( 1 ); - var done = assert.async(); + QUnit.test('paused', function (assert) { + assert.expect(1); + var done = assert.async(); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'paused', _onEvent ); + Reveal.addEventListener('paused', _onEvent); - Reveal.togglePause(); - Reveal.togglePause(); + Reveal.togglePause(); + Reveal.togglePause(); - Reveal.removeEventListener( 'paused', _onEvent ); - }); + Reveal.removeEventListener('paused', _onEvent); + }); - QUnit.test( 'resumed', function( assert ) { - assert.expect( 1 ); - var done = assert.async(); + QUnit.test('resumed', function (assert) { + assert.expect(1); + var done = assert.async(); - var _onEvent = function( event ) { - assert.ok( true, 'event fired' ); - done(); - } + var _onEvent = function (event) { + assert.ok(true, 'event fired'); + done(); + }; - Reveal.addEventListener( 'resumed', _onEvent ); + Reveal.addEventListener('resumed', _onEvent); - Reveal.togglePause(); - Reveal.togglePause(); + Reveal.togglePause(); + Reveal.togglePause(); - Reveal.removeEventListener( 'resumed', _onEvent ); - }); + Reveal.removeEventListener('resumed', _onEvent); + }); -} ); +}); Reveal.initialize(); |