diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-markdown-element-attributes.html (renamed from test/test-element-attributes-markdown.html) | 2 | ||||
| -rw-r--r-- | test/test-markdown-element-attributes.js (renamed from test/test-element-attributes-markdown.js) | 0 | ||||
| -rw-r--r-- | test/test.html | 33 | ||||
| -rw-r--r-- | test/test.js | 81 |
4 files changed, 97 insertions, 19 deletions
diff --git a/test/test-element-attributes-markdown.html b/test/test-markdown-element-attributes.html index 0853801..417ce30 100644 --- a/test/test-element-attributes-markdown.html +++ b/test/test-markdown-element-attributes.html @@ -76,7 +76,7 @@ <script src="../plugin/markdown/markdown.js"></script> <script src="qunit-1.12.0.js"></script> - <script src="test-element-attributes-markdown.js"></script> + <script src="test-markdown-element-attributes.js"></script> </body> </html> diff --git a/test/test-element-attributes-markdown.js b/test/test-markdown-element-attributes.js index e79806c..e79806c 100644 --- a/test/test-element-attributes-markdown.js +++ b/test/test-markdown-element-attributes.js diff --git a/test/test.html b/test/test.html index 81d2f16..094f3c7 100644 --- a/test/test.html +++ b/test/test.html @@ -35,13 +35,32 @@ </section> </section> - <section> - <h1>4</h1> - <ul> - <li class="fragment">4.1</li> - <li class="fragment">4.2</li> - <li class="fragment">4.3</li> - </ul> + <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> diff --git a/test/test.js b/test/test.js index bd5cad1..36983c8 100644 --- a/test/test.js +++ b/test/test.js @@ -5,6 +5,7 @@ // 1 // 2 - Three sub-slides // 3 - Three fragment elements +// 3 - Two fragments with same data-fragment-index // 4 @@ -128,7 +129,7 @@ Reveal.addEventListener( 'ready', function() { test( 'Reveal.next', function() { Reveal.slide( 0, 0 ); - // Step through the vertical child slides + // Step through vertical child slides Reveal.next(); deepEqual( Reveal.getIndices(), { h: 1, v: 0, f: undefined } ); @@ -138,7 +139,10 @@ Reveal.addEventListener( 'ready', function() { Reveal.next(); deepEqual( Reveal.getIndices(), { h: 1, v: 2, f: undefined } ); - // There's fragments on this slide + // Step through fragments + Reveal.next(); + deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: -1 } ); + Reveal.next(); deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 } ); @@ -147,14 +151,15 @@ Reveal.addEventListener( 'ready', function() { Reveal.next(); deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 } ); + }); - Reveal.next(); - deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 3 } ); + test( 'Reveal.next at end', function() { + Reveal.slide( 3 ); + // We're at the end, this should have no effect Reveal.next(); deepEqual( Reveal.getIndices(), { h: 3, v: 0, f: undefined } ); - // We're at the end, this should have no effect Reveal.next(); deepEqual( Reveal.getIndices(), { h: 3, v: 0, f: undefined } ); }); @@ -166,6 +171,9 @@ Reveal.addEventListener( 'ready', function() { QUnit.module( 'Fragments' ); test( 'Sliding to fragments', function() { + Reveal.slide( 2, 0, -1 ); + deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: -1 }, 'Reveal.slide( 2, 0, -1 )' ); + Reveal.slide( 2, 0, 0 ); deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'Reveal.slide( 2, 0, 0 )' ); @@ -176,19 +184,45 @@ Reveal.addEventListener( 'ready', function() { deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'Reveal.slide( 2, 0, 1 )' ); }); - test( 'Stepping through fragments', function() { + test( 'Hiding all fragments', function() { + var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + + Reveal.slide( 2, 0, 0 ); + strictEqual( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 1, 'one fragment visible when index is 0' ); + + Reveal.slide( 2, 0, -1 ); + strictEqual( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 0, 'no fragments visible when index is -1' ); + }); + + test( 'Current fragment', function() { + var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + + Reveal.slide( 2, 0 ); + strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 0, 'no current fragment at index -1' ); + Reveal.slide( 2, 0, 0 ); + strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 1, 'one current fragment at index 0' ); + + Reveal.slide( 1, 0, 0 ); + strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 0, 'no current fragment when navigating to previous slide' ); + + Reveal.slide( 3, 0, 0 ); + strictEqual( fragmentSlide.querySelectorAll( '.fragment.current-fragment' ).length, 0, 'no current fragment when navigating to next slide' ); + }); + + test( 'Stepping through fragments', function() { + Reveal.slide( 2, 0, -1 ); // forwards: Reveal.next(); - deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'next() goes to next fragment' ); + deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'next() goes to next fragment' ); Reveal.right(); - deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 }, 'right() goes to next fragment' ); + deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'right() goes to next fragment' ); Reveal.down(); - deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 3 }, 'down() goes to next fragment' ); + deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 2 }, 'down() goes to next fragment' ); Reveal.down(); // moves to f #3 @@ -201,11 +235,11 @@ Reveal.addEventListener( 'ready', function() { deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 1 }, 'left() goes to prev fragment' ); Reveal.up(); - deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'left() goes to prev fragment' ); + deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: 0 }, 'up() goes to prev fragment' ); }); test( 'Stepping past fragments', function() { - var fragmentSlide = document.querySelector( '.reveal .slides>section:nth-child(3)' ); + var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); Reveal.slide( 0, 0, 0 ); equal( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 0, 'no fragments visible when on previous slide' ); @@ -214,6 +248,31 @@ Reveal.addEventListener( 'ready', function() { equal( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 3, 'all fragments visible when on future slide' ); }); + test( 'Fragment indices', function() { + var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(2)' ); + + Reveal.slide( 3, 0, 0 ); + equal( fragmentSlide.querySelectorAll( '.fragment.visible' ).length, 2, 'both fragments of same index are shown' ); + }); + + test( 'Index generation', function() { + var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(1)' ); + + // These have no indices defined to start with + equal( fragmentSlide.querySelectorAll( '.fragment' )[0].getAttribute( 'data-fragment-index' ), '0' ); + equal( fragmentSlide.querySelectorAll( '.fragment' )[1].getAttribute( 'data-fragment-index' ), '1' ); + equal( fragmentSlide.querySelectorAll( '.fragment' )[2].getAttribute( 'data-fragment-index' ), '2' ); + }); + + test( 'Index normalization', function() { + var fragmentSlide = document.querySelector( '#fragment-slides>section:nth-child(3)' ); + + // These start out as 1-4-4 and should normalize to 0-1-1 + equal( fragmentSlide.querySelectorAll( '.fragment' )[0].getAttribute( 'data-fragment-index' ), '0' ); + equal( fragmentSlide.querySelectorAll( '.fragment' )[1].getAttribute( 'data-fragment-index' ), '1' ); + equal( fragmentSlide.querySelectorAll( '.fragment' )[2].getAttribute( 'data-fragment-index' ), '1' ); + }); + asyncTest( 'fragmentshown event', function() { expect( 2 ); |