projects / reveal.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d4e04b8)
test-markdown-element-attributes: formats and test.
authorVonC <vonc@laposte.net>
Sat, 30 Nov 2013 22:08:43 +0000 (23:08 +0100)
committerVonC <vonc@laposte.net>
Sat, 30 Nov 2013 22:12:41 +0000 (23:12 +0100)
- Reformat
- Use new default separator format: '.element: x=y'
- Add new tests for testing that default format

test/test-markdown-element-attributes.html patch | blob | history
test/test-markdown-element-attributes.js patch | blob | history

diff --git a/test/test-markdown-element-attributes.html b/test/test-markdown-element-attributes.html
index 6fe7f9a286f5d93aa41e5f7712c2c432003dc440..b638082b3278b1e02314eaf61371d3b6dd84d94d 100644 (file)
--- a/test/test-markdown-element-attributes.html
+++ b/test/test-markdown-element-attributes.html
@@ -4,7 +4,7 @@
        <head>
                <meta charset="utf-8">
 
-               <title>reveal.js - Test Markdown</title>
+               <title>reveal.js - Test Markdown Element Attributes</title>
 
                <link rel="stylesheet" href="../css/reveal.min.css">
                <link rel="stylesheet" href="qunit-1.12.0.css">
@@ -13,9 +13,9 @@
        <body style="overflow: auto;">
 
                <div id="qunit"></div>
-               <div id="qunit-fixture"></div>
+               <div id="qunit-fixture"></div>
 
-               <div class="reveal" style="display: true;">
+               <div class="reveal" style="display: none;">
 
                        <div class="slides">
 
@@ -38,12 +38,9 @@
                                                Paragraph 2
                                                <!-- {_class="fragment grow"} -->
 
-                                               - list item 1
-                                               <!-- {_class="fragment roll-in"} -->
-                                               - list item 2
-                                               <!-- {_class="fragment roll-in"} -->
-                                               - list item 3
-                                               <!-- {_class="fragment roll-in"} -->
+                                               - list item 1 <!-- {_class="fragment roll-in"} -->
+                                               - list item 2 <!-- {_class="fragment roll-in"} -->
+                                               - list item 3 <!-- {_class="fragment roll-in"} -->
 
 
                                                ---
@@ -52,28 +49,20 @@
 
 
                                                Paragraph 1.2  
-                                               multi-line
-                                               <!-- {_class="fragment highlight-red"} -->
+                                               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 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 5<!-- {_class="fragment highlight-green"} -->
 
                                                Test
 
@@ -83,6 +72,52 @@
                                        </script>
                                </section>
 
+
+
+                               <section        data-markdown data-separator="^\n\n\n"
+                                                                       data-vertical="^\n\n"
+                                                                       data-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" -->
+
+                                       </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
+
+                                       Multiple  
+                                       Line
+                                       <!-- .element: class="fragment highlight-blue" -->
+                                 </script>
+                               </section>
+
+                               <section data-markdown>
+                                 <script type="text/template">
+                                       ## Hello world
+
+                                       Test<!-- .element: class="fragment highlight-blue" -->
+
+                                       More Test
+                                 </script>
+                               </section>
+
+
                        </div>
 
                </div>
diff --git a/test/test-markdown-element-attributes.js b/test/test-markdown-element-attributes.js
index e79806c63ed86376d36aa5f5ce8523bc9b0c1895..4541077a03000533b62d17a295b3410812235fed 100644 (file)
--- a/test/test-markdown-element-attributes.js
+++ b/test/test-markdown-element-attributes.js
@@ -5,33 +5,41 @@ Reveal.addEventListener( 'ready', function() {
        QUnit.module( 'Markdown' );
 
        test( 'Vertical separator', function() {
-               strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' );
+               strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 4, 'found four slides' );
        });
 
 
-       test( 'Attributes on vertical slides header', function() {
+       test( 'Attributes on element header in vertical slides', function() {
                strictEqual( document.querySelectorAll( '.reveal .slides section>section h2.fragment.fade-out' ).length, 1, 'found one vertical slide with class fragment.fade-out on header' );
                strictEqual( document.querySelectorAll( '.reveal .slides section>section h2.fragment.shrink' ).length, 1, 'found one vertical slide with class fragment.shrink on header' );
        });
 
-       test( 'Attributes on vertical slides paragraphs', function() {
+       test( 'Attributes on element paragraphs in vertical slides', function() {
                strictEqual( document.querySelectorAll( '.reveal .slides section>section p.fragment.grow' ).length, 2, 'found a vertical slide with two paragraphs with class fragment.grow' );
        });
 
-       test( 'Attributes on vertical slides list items', function() {
+       test( 'Attributes on element list items in vertical slides', function() {
                strictEqual( document.querySelectorAll( '.reveal .slides section>section li.fragment.roll-in' ).length, 3, 'found a vertical slide with three list items with class fragment.roll-in' );
        });
 
-       test( 'Attributes on horizontal slides paragraphs', function() {
+       test( 'Attributes on element paragraphs in horizontal slides', function() {
                strictEqual( document.querySelectorAll( '.reveal .slides section p.fragment.highlight-red' ).length, 4, 'found a horizontal slide with four paragraphs with class fragment.grow' );
        });
-       test( 'Attributes on horizontal slides list items', function() {
+       test( 'Attributes on element list items in horizontal slides', function() {
                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' );
        });
-       test( 'Attributes on horizontal slides list items', function() {
+       test( 'Attributes on element list items in horizontal slides', function() {
                strictEqual( document.querySelectorAll( '.reveal .slides section img.reveal.stretch' ).length, 1, 'found a horizontal slide with stretched image, class img.reveal.stretch' );
        });
 
+       test( 'Attributes on elements in vertical slides with default element attribute separator', function() {
+               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' );
+       });
+
+       test( 'Attributes on elements in single slides with default element attribute separator', function() {
+               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();
Assorted talks written in reveal.js.