diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/examples/barebones.html | 4 | ||||
-rw-r--r-- | test/examples/embedded-media.html | 4 | ||||
-rw-r--r-- | test/examples/math.html | 4 | ||||
-rw-r--r-- | test/examples/slide-backgrounds.html | 4 | ||||
-rw-r--r-- | test/test-markdown-element-attributes.html | 12 | ||||
-rw-r--r-- | test/test-markdown-slide-attributes.html | 14 | ||||
-rw-r--r-- | test/test-markdown.html | 8 | ||||
-rw-r--r-- | test/test-pdf.html | 83 | ||||
-rw-r--r-- | test/test-pdf.js | 15 | ||||
-rw-r--r-- | test/test.html | 9 | ||||
-rw-r--r-- | test/test.js | 145 |
11 files changed, 264 insertions, 38 deletions
diff --git a/test/examples/barebones.html b/test/examples/barebones.html index c948d00..2bee3cb 100644 --- a/test/examples/barebones.html +++ b/test/examples/barebones.html @@ -6,7 +6,7 @@ <title>reveal.js - Barebones</title> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> </head> <body> @@ -29,7 +29,7 @@ </div> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/embedded-media.html b/test/examples/embedded-media.html index c654278..bbad4be 100644 --- a/test/examples/embedded-media.html +++ b/test/examples/embedded-media.html @@ -8,7 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> <link rel="stylesheet" href="../../css/theme/default.css" id="theme"> </head> @@ -35,7 +35,7 @@ </div> <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/math.html b/test/examples/math.html index 93eff22..1b80e03 100644 --- a/test/examples/math.html +++ b/test/examples/math.html @@ -8,7 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> <link rel="stylesheet" href="../../css/theme/night.css" id="theme"> </head> @@ -160,7 +160,7 @@ </div> <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/slide-backgrounds.html b/test/examples/slide-backgrounds.html index 4f0fe62..ba020cb 100644 --- a/test/examples/slide-backgrounds.html +++ b/test/examples/slide-backgrounds.html @@ -8,7 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> <link rel="stylesheet" href="../../css/theme/serif.css" id="theme"> </head> @@ -101,7 +101,7 @@ </div> <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/test-markdown-element-attributes.html b/test/test-markdown-element-attributes.html index b638082..5dba085 100644 --- a/test/test-markdown-element-attributes.html +++ b/test/test-markdown-element-attributes.html @@ -6,7 +6,7 @@ <title>reveal.js - Test Markdown Element Attributes</title> - <link rel="stylesheet" href="../css/reveal.min.css"> + <link rel="stylesheet" href="../css/reveal.css"> <link rel="stylesheet" href="qunit-1.12.0.css"> </head> @@ -19,10 +19,10 @@ <div class="slides"> - <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-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-vertical="^\n--\n$" data-element-attributes="{_\s*?([^}]+?)}">> + <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"} --> @@ -75,8 +75,8 @@ <section data-markdown data-separator="^\n\n\n" - data-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-charset="utf-8"> <script type="text/template"> # Test attributes in Markdown with default separator @@ -123,7 +123,7 @@ </div> <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.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-1.12.0.js"></script> diff --git a/test/test-markdown-slide-attributes.html b/test/test-markdown-slide-attributes.html index 3b91784..ab6ece4 100644 --- a/test/test-markdown-slide-attributes.html +++ b/test/test-markdown-slide-attributes.html @@ -6,7 +6,7 @@ <title>reveal.js - Test Markdown Attributes</title> - <link rel="stylesheet" href="../css/reveal.min.css"> + <link rel="stylesheet" href="../css/reveal.css"> <link rel="stylesheet" href="qunit-1.12.0.css"> </head> @@ -19,12 +19,12 @@ <div class="slides"> - <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-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-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-attributes="--\s(.*?)$" data-charset="utf-8"> <script type="text/template"> @@ -56,8 +56,8 @@ </section> <section data-markdown data-separator="^\n\n\n" - data-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-charset="utf-8"> <script type="text/template"> # Test attributes in Markdown with default separator @@ -117,7 +117,7 @@ </div> <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.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-1.12.0.js"></script> diff --git a/test/test-markdown.html b/test/test-markdown.html index c89af30..7ff0efe 100644 --- a/test/test-markdown.html +++ b/test/test-markdown.html @@ -6,7 +6,7 @@ <title>reveal.js - Test Markdown</title> - <link rel="stylesheet" href="../css/reveal.min.css"> + <link rel="stylesheet" href="../css/reveal.css"> <link rel="stylesheet" href="qunit-1.12.0.css"> </head> @@ -19,10 +19,10 @@ <div class="slides"> - <!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-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-vertical="^\n--\n$"> + <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$"> <script type="text/template"> ## Slide 1.1 @@ -41,7 +41,7 @@ </div> <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.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-1.12.0.js"></script> diff --git a/test/test-pdf.html b/test/test-pdf.html new file mode 100644 index 0000000..751ed26 --- /dev/null +++ b/test/test-pdf.html @@ -0,0 +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-1.12.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-1.12.0.js"></script> + + <script src="test-pdf.js"></script> + + </body> +</html> diff --git a/test/test-pdf.js b/test/test-pdf.js new file mode 100644 index 0000000..8ec34fd --- /dev/null +++ b/test/test-pdf.js @@ -0,0 +1,15 @@ + +Reveal.addEventListener( 'ready', function() { + + // Only one test for now, we're mainly ensuring that there + // are no execution errors when running PDF mode + + test( 'Reveal.isReady', function() { + strictEqual( Reveal.isReady(), true, 'returns true' ); + }); + + +} ); + +Reveal.initialize({ pdf: true }); + diff --git a/test/test.html b/test/test.html index 094f3c7..29d02a9 100644 --- a/test/test.html +++ b/test/test.html @@ -6,7 +6,7 @@ <title>reveal.js - Tests</title> - <link rel="stylesheet" href="../css/reveal.min.css"> + <link rel="stylesheet" href="../css/reveal.css"> <link rel="stylesheet" href="qunit-1.12.0.css"> </head> @@ -19,12 +19,13 @@ <div class="slides"> - <section> + <section data-background-image="examples/assets/image1.png"> <h1>1</h1> + <img data-src="fake-url.png"> </section> <section> - <section> + <section data-background="examples/assets/image2.png"> <h1>2.1</h1> </section> <section> @@ -72,7 +73,7 @@ </div> <script src="../lib/js/head.min.js"></script> - <script src="../js/reveal.min.js"></script> + <script src="../js/reveal.js"></script> <script src="qunit-1.12.0.js"></script> <script src="test.js"></script> diff --git a/test/test.js b/test/test.js index f620b5b..6c7270f 100644 --- a/test/test.js +++ b/test/test.js @@ -68,6 +68,12 @@ Reveal.addEventListener( 'ready', function() { strictEqual( Reveal.isFirstSlide(), true, 'true after Reveal.slide( 0, 0 )' ); }); + test( 'Reveal.isFirstSlide after vertical slide', function() { + Reveal.slide( 1, 1 ); + Reveal.slide( 0, 0 ); + strictEqual( Reveal.isFirstSlide(), true, 'true after Reveal.slide( 1, 1 ) and then Reveal.slide( 0, 0 )' ); + }); + test( 'Reveal.isLastSlide', function() { Reveal.slide( 0, 0 ); strictEqual( Reveal.isLastSlide(), false, 'false after Reveal.slide( 0, 0 )' ); @@ -75,34 +81,62 @@ Reveal.addEventListener( 'ready', function() { var lastSlideIndex = document.querySelectorAll( '.reveal .slides>section' ).length - 1; Reveal.slide( lastSlideIndex, 0 ); - strictEqual( Reveal.isLastSlide(), true, 'true after Reveal.slide( ', 0+ lastSlideIndex +' )' ); + strictEqual( Reveal.isLastSlide(), true, 'true after Reveal.slide( '+ lastSlideIndex +', 0 )' ); Reveal.slide( 0, 0 ); strictEqual( Reveal.isLastSlide(), false, 'false after Reveal.slide( 0, 0 )' ); }); + test( 'Reveal.isLastSlide after vertical slide', function() { + var lastSlideIndex = document.querySelectorAll( '.reveal .slides>section' ).length - 1; + + Reveal.slide( 1, 1 ); + Reveal.slide( lastSlideIndex ); + strictEqual( Reveal.isLastSlide(), true, 'true after Reveal.slide( 1, 1 ) and then Reveal.slide( '+ lastSlideIndex +', 0 )' ); + }); + + test( 'Reveal.getTotalSlides', function() { + strictEqual( Reveal.getTotalSlides(), 8, 'eight slides in total' ); + }); + test( 'Reveal.getIndices', function() { var indices = Reveal.getIndices(); - ok( typeof indices.hasOwnProperty( 'h' ), 'h exists' ); - ok( typeof indices.hasOwnProperty( 'v' ), 'v exists' ); - ok( typeof indices.hasOwnProperty( 'f' ), 'f exists' ); + ok( indices.hasOwnProperty( 'h' ), 'h exists' ); + ok( indices.hasOwnProperty( 'v' ), 'v exists' ); + ok( indices.hasOwnProperty( 'f' ), 'f exists' ); Reveal.slide( 1, 0 ); - ok( Reveal.getIndices().h === 1 && Reveal.getIndices().v === 0, 'h 1, v 0' ); + strictEqual( Reveal.getIndices().h, 1, 'h 1' ); + strictEqual( Reveal.getIndices().v, 0, 'v 0' ); Reveal.slide( 1, 2 ); - ok( Reveal.getIndices().h === 1 && Reveal.getIndices().v === 2, 'h 1, v 2' ); + strictEqual( Reveal.getIndices().h, 1, 'h 1' ); + strictEqual( Reveal.getIndices().v, 2, 'v 2' ); Reveal.slide( 0, 0 ); + strictEqual( Reveal.getIndices().h, 0, 'h 0' ); + strictEqual( Reveal.getIndices().v, 0, 'v 0' ); }); test( 'Reveal.getSlide', function() { - var firstSlide = document.querySelector( '.reveal .slides>section:first-child' ); + equal( Reveal.getSlide( 0 ), document.querySelector( '.reveal .slides>section:first-child' ), 'gets correct first slide' ); + equal( Reveal.getSlide( 1 ), document.querySelector( '.reveal .slides>section:nth-child(2)' ), 'no v index returns stack' ); + equal( Reveal.getSlide( 1, 0 ), document.querySelector( '.reveal .slides>section:nth-child(2)>section:nth-child(1)' ), 'v index 0 returns first vertical child' ); + equal( Reveal.getSlide( 1, 1 ), document.querySelector( '.reveal .slides>section:nth-child(2)>section:nth-child(2)' ), 'v index 1 returns second vertical child' ); + + strictEqual( Reveal.getSlide( 100 ), undefined, 'undefined when out of horizontal bounds' ); + strictEqual( Reveal.getSlide( 1, 100 ), undefined, 'undefined when out of vertical bounds' ); + }); - equal( Reveal.getSlide( 0 ), firstSlide, 'gets correct first slide' ); + test( 'Reveal.getSlideBackground', function() { + equal( Reveal.getSlideBackground( 0 ), document.querySelector( '.reveal .backgrounds>.slide-background:first-child' ), 'gets correct first background' ); + equal( Reveal.getSlideBackground( 1 ), document.querySelector( '.reveal .backgrounds>.slide-background:nth-child(2)' ), 'no v index returns stack' ); + equal( Reveal.getSlideBackground( 1, 0 ), document.querySelector( '.reveal .backgrounds>.slide-background:nth-child(2) .slide-background:nth-child(1)' ), 'v index 0 returns first vertical child' ); + equal( Reveal.getSlideBackground( 1, 1 ), document.querySelector( '.reveal .backgrounds>.slide-background:nth-child(2) .slide-background:nth-child(2)' ), 'v index 1 returns second vertical child' ); - strictEqual( Reveal.getSlide( 100 ), undefined, 'returns undefined when slide can\'t be found' ); + strictEqual( Reveal.getSlideBackground( 100 ), undefined, 'undefined when out of horizontal bounds' ); + strictEqual( Reveal.getSlideBackground( 1, 100 ), undefined, 'undefined when out of vertical bounds' ); }); test( 'Reveal.getPreviousSlide/getCurrentSlide', function() { @@ -116,6 +150,16 @@ Reveal.addEventListener( 'ready', function() { equal( Reveal.getCurrentSlide(), secondSlide, 'current is slide #1' ); }); + test( 'Reveal.getProgress', function() { + Reveal.slide( 0, 0 ); + strictEqual( Reveal.getProgress(), 0, 'progress is 0 on first slide' ); + + var lastSlideIndex = document.querySelectorAll( '.reveal .slides>section' ).length - 1; + + Reveal.slide( lastSlideIndex, 0 ); + strictEqual( Reveal.getProgress(), 1, 'progress is 1 on last slide' ); + }); + test( 'Reveal.getScale', function() { ok( typeof Reveal.getScale() === 'number', 'has scale' ); }); @@ -332,6 +376,70 @@ Reveal.addEventListener( 'ready', function() { // --------------------------------------------------------------- + // AUTO-SLIDE TESTS + + QUnit.module( 'Auto Sliding' ); + + test( 'Reveal.isAutoSliding', function() { + strictEqual( Reveal.isAutoSliding(), false, 'false by default' ); + + Reveal.configure({ autoSlide: 10000 }); + strictEqual( Reveal.isAutoSliding(), true, 'true after starting' ); + + Reveal.configure({ autoSlide: 0 }); + strictEqual( Reveal.isAutoSliding(), false, 'false after setting to 0' ); + }); + + test( 'Reveal.toggleAutoSlide', function() { + Reveal.configure({ autoSlide: 10000 }); + + Reveal.toggleAutoSlide(); + strictEqual( Reveal.isAutoSliding(), false, 'false after first toggle' ); + Reveal.toggleAutoSlide(); + strictEqual( Reveal.isAutoSliding(), true, 'true after second toggle' ); + + Reveal.configure({ autoSlide: 0 }); + }); + + asyncTest( 'autoslidepaused', function() { + expect( 1 ); + + var _onEvent = function( event ) { + ok( true, 'event fired' ); + } + + Reveal.addEventListener( 'autoslidepaused', _onEvent ); + Reveal.configure({ autoSlide: 10000 }); + Reveal.toggleAutoSlide(); + + start(); + + // cleanup + Reveal.configure({ autoSlide: 0 }); + Reveal.removeEventListener( 'autoslidepaused', _onEvent ); + }); + + asyncTest( 'autoslideresumed', function() { + expect( 1 ); + + var _onEvent = function( event ) { + ok( true, 'event fired' ); + } + + Reveal.addEventListener( 'autoslideresumed', _onEvent ); + Reveal.configure({ autoSlide: 10000 }); + Reveal.toggleAutoSlide(); + Reveal.toggleAutoSlide(); + + start(); + + // cleanup + Reveal.configure({ autoSlide: 0 }); + Reveal.removeEventListener( 'autoslideresumed', _onEvent ); + }); + + + // --------------------------------------------------------------- // CONFIGURATION VALUES QUnit.module( 'Configuration' ); @@ -372,6 +480,25 @@ Reveal.addEventListener( 'ready', function() { // --------------------------------------------------------------- + // LAZY-LOADING TESTS + + QUnit.module( 'Lazy-Loading' ); + + test( 'img with data-src', function() { + strictEqual( document.querySelectorAll( '.reveal section img[src]' ).length, 1, 'Image source has been set' ); + }); + + test( 'background images', function() { + 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 + ok( Reveal.getSlideBackground( 0 ).style.backgroundImage.indexOf( imageSource1 ) !== -1, 'data-background-image worked' ); + ok( Reveal.getSlideBackground( 1, 0 ).style.backgroundImage.indexOf( imageSource2 ) !== -1, 'data-background worked' ); + }); + + + // --------------------------------------------------------------- // EVENT TESTS QUnit.module( 'Events' ); |