首頁 探索 說明
註冊 登入
oleg
/
reveal.js
镜像来自 https://github.com/hakimel/reveal.js.git
1
0
複刻 0
Files 問題管理 0 Wiki
瀏覽代碼

refactor unit tests, now consistently initializing reveal.js in the same way

Hakim El Hattab 5 年之前
父節點
20b8def298
當前提交
0814176f3c
共有 22 個文件被更改，包括 216 次插入 和 246 次删除
分割檢視 顯示文件統計
  1. 2 5
      test/test-auto-animate.html
  2. 1 2
      test/test-dependencies-async.html
  3. 8 11
      test/test-dependencies.html
  4. 2 5
      test/test-grid-navigation.html
  5. 2 8
      test/test-iframe-backgrounds.html
  6. 2 8
      test/test-iframes.html
  7. 50 5
      test/test-markdown-element-attributes.html
  8. 0 44
      test/test-markdown-element-attributes.js
  9. 21 7
      test/test-markdown-external.html
  10. 0 20
      test/test-markdown-external.js
  11. 29 2
      test/test-markdown-options.html
  12. 0 27
      test/test-markdown-options.js
  13. 50 4
      test/test-markdown-slide-attributes.html
  14. 0 44
      test/test-markdown-slide-attributes.js
  15. 17 5
      test/test-markdown.html
  16. 0 11
      test/test-markdown.js
  17. 13 2
      test/test-pdf.html
  18. 0 12
      test/test-pdf.js
  19. 15 14
      test/test-plugins.html
  20. 2 5
      test/test-state.html
  21. 1 2
      test/test.html
  22. 1 3
      test/test.js

+ 2 - 5
test/test-auto-animate.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -46,8 +47,6 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 
 			const slides = Array.prototype.map.call( document.querySelectorAll( '.slides section' ), slide => {
 
@@ -59,7 +58,7 @@
 
 				};
 
 			} );
 
 
-			Reveal.addEventListener( 'ready', () => {
 
+			Reveal.initialize().then( () => {
 
 
 				QUnit.module( 'Auto-Animate' );
 
 
@@ -121,8 +120,6 @@
 
 				});
 
 
 			} );
 
-
 
-			Reveal.initialize();
 
 		</script>
 
 
 	</body>

+ 1 - 2
test/test-dependencies-async.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -26,8 +27,6 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 			var	externalScriptSequence = '';
 
 			var scriptCount = 0;

+ 8 - 11
test/test-dependencies.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -26,12 +27,16 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 			window.externalScriptSequence = '';
 
 
-			Reveal.addEventListener( 'ready', function() {
 
+			Reveal.initialize({
 
+				dependencies: [
 
+					{ src: 'assets/external-script-a.js' },
 
+					{ src: 'assets/external-script-b.js' },
 
+					{ src: 'assets/external-script-c.js' }
 
+				]
 
+			}).then( () => {
 
 
 				QUnit.module( 'Dependencies' );
 
 
@@ -40,14 +45,6 @@
 
 				});
 
 
 			} );
 
-
 
-			Reveal.initialize({
 
-				dependencies: [
 
-					{ src: 'assets/external-script-a.js' },
 
-					{ src: 'assets/external-script-b.js' },
 
-					{ src: 'assets/external-script-c.js' }
 
-				]
 
-			});
 
 		</script>
 
 
 	</body>

+ 2 - 5
test/test-grid-navigation.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -38,10 +39,8 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
-			Reveal.addEventListener( 'ready', function() {
 
+			Reveal.initialize().then( () => {
 
 
 				QUnit.module( 'Grid Navigation' );
 
 
@@ -66,8 +65,6 @@
 
 				});
 
 
 			} );
 
-
 
-			Reveal.initialize();
 
 		</script>
 
 
 	</body>

+ 2 - 8
test/test-iframe-backgrounds.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -31,12 +32,9 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 
-
 
-			Reveal.addEventListener( 'ready', function() {
 
+			Reveal.initialize({ viewDistance: 3 }).then( () => {
 
 
 				function getIframe( index ) {
 
 					return document.querySelectorAll( '.slide-background' )[index].querySelector( 'iframe' );
 
@@ -94,10 +92,6 @@
 
 				});
 
 
 			} );
 
-
 
-			Reveal.initialize({
 
-				viewDistance: 3
 
-			});
 
 		</script>
 
 
 	</body>

+ 2 - 8
test/test-iframes.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -31,12 +32,9 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 
-
 
-			Reveal.addEventListener( 'ready', function() {
 
+			Reveal.initialize({ viewDistance: 2 }).then( () => {
 
 
 				var defaultIframe = document.querySelector( '.default-iframe' ),
 
 					preloadIframe = document.querySelector( '.preload-iframe' );
 
@@ -98,10 +96,6 @@
 
 				});
 
 
 			} );
 
-
 
-			Reveal.initialize({
 
-				viewDistance: 2
 
-			});
 
 		</script>
 
 
 	</body>

+ 50 - 5
test/test-markdown-element-attributes.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -122,11 +123,55 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.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>
 
+			Reveal.initialize({
 
+				dependencies: [
 
+					{ src: '../plugin/markdown/marked.js' },
 
+					{ src: '../plugin/markdown/markdown.js' },
 
+				]
 
+			}).then( function() {
 
+
 
+				QUnit.module( 'Markdown' );
 
+
 
+				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 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 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 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 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' );
 
+				});
 
+
 
+			} );
 
+		</script>
 
 
 	</body>
 
 </html>

+ 0 - 44
test/test-markdown-element-attributes.js
查看文件 

@@ -1,44 +0,0 @@
 
-Reveal.addEventListener( 'ready', function() {
 
-
 
-	QUnit.module( 'Markdown' );
 
-
 
-	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 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 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 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 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();

+ 21 - 7
test/test-markdown-external.html
查看文件 

@@ -18,20 +18,34 @@
 
 		<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> -->
 
+				<section data-markdown="simple.md" data-separator="^\r?\n\r?\n\r?\n" data-separator-vertical="^\r?\n\r?\n"></section>
 
 			</div>
 
 
 		</div>
 
 
-		<script src="../dist/reveal.min.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="../dist/reveal.min.js"></script>
 
+
 
+		<script>
 
+			Reveal.initialize({
 
+				dependencies: [
 
+					{ src: '../plugin/markdown/marked.js' },
 
+					{ src: '../plugin/markdown/markdown.js' },
 
+				]
 
+			}).then( function() {
 
+
 
+				QUnit.module( 'Markdown' );
 
+
 
+				QUnit.test( 'Vertical separator', function( assert ) {
 
+					assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' );
 
+				});
 
 
-		<!-- <script src="test-markdown-external.js"></script> -->
 
+				QUnit.test( 'Horizontal separator', function( assert ) {
 
+					assert.strictEqual( document.querySelectorAll( '.reveal .slides>section' ).length, 2, 'found two slides' );
 
+				});
 
 
-		<!-- Test disabled 28/2/2019 by Hakim – Markdown plugin needs to be updated to load extenal files asycnhronously -->
 
+			} );
 
+		</script>
 
 
 	</body>
 
 </html>

+ 0 - 20
test/test-markdown-external.js
查看文件 

@@ -1,20 +0,0 @@
 
-Reveal.addEventListener( 'ready', function() {
 
-
 
-	QUnit.module( 'Markdown' );
 
-
 
-	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( '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();

+ 29 - 2
test/test-markdown-options.html
查看文件 

@@ -31,10 +31,37 @@
 
 
 		</div>
 
 
-		<script src="../dist/reveal.min.js"></script>
 
 		<script src="qunit-2.5.0.js"></script>
 
+		<script src="../dist/reveal.min.js"></script>
 
+
 
+		<script>
 
+			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
 
+				}
 
+			}).then( function() {
 
+
 
+				QUnit.module( 'Markdown' );
 
+
 
+				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;
 
+
 
+					assert.strictEqual( /['"]/.test( text ), false );
 
+					assert.strictEqual( /[“”‘’]/.test( text ), true );
 
+				});
 
+
 
+			} );
 
 
-		<script src="test-markdown-options.js"></script>
 
+		</script>
 
 
 	</body>
 
 </html>

+ 0 - 27
test/test-markdown-options.js
查看文件 

@@ -1,27 +0,0 @@
 
-Reveal.addEventListener( 'ready', function() {
 
-
 
-	QUnit.module( 'Markdown' );
 
-
 
-	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;
 
-
 
-		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
 
-	}
 
-});

+ 50 - 4
test/test-markdown-slide-attributes.html
查看文件 

@@ -116,12 +116,58 @@
 
 
 		</div>
 
 
-		<script src="../dist/reveal.min.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="../dist/reveal.min.js"></script>
 
 
-		<script src="test-markdown-slide-attributes.js"></script>
 
+		<script>
 
+			Reveal.initialize({
 
+				dependencies: [
 
+					{ src: '../plugin/markdown/marked.js' },
 
+					{ src: '../plugin/markdown/markdown.js' },
 
+				]
 
+			}).then( 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"' );
 
+				});
 
+
 
+			} );
 
+		</script>
 
 
 	</body>
 
 </html>

+ 0 - 44
test/test-markdown-slide-attributes.js
查看文件 

@@ -1,44 +0,0 @@
 
-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();

+ 17 - 5
test/test-markdown.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -41,11 +42,22 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.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>
 
+			Reveal.initialize({
 
+				dependencies: [
 
+					{ src: '../plugin/markdown/marked.js' },
 
+					{ src: '../plugin/markdown/markdown.js' },
 
+				]
 
+			}).then( function() {
 
+
 
+				QUnit.module( 'Markdown' );
 
+
 
+				QUnit.test( 'Vertical separator', function( assert ) {
 
+					assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' );
 
+				});
 
+
 
+			} );
 
+		</script>
 
 
 	</body>
 
 </html>

+ 0 - 11
test/test-markdown.js
查看文件 

@@ -1,11 +0,0 @@
 
-Reveal.addEventListener( 'ready', function() {
 
-
 
-	QUnit.module( 'Markdown' );
 
-
 
-	QUnit.test( 'Vertical separator', function( assert ) {
 
-		assert.strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' );
 
-	});
 
-
 
-} );
 
-
 
-Reveal.initialize();

+ 13 - 2
test/test-pdf.html
查看文件 

@@ -9,6 +9,7 @@
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="../css/print/pdf.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -74,9 +75,19 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
+		<script>
 
+			Reveal.initialize({ pdf: true }).then( function() {
 
+
 
+				// 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' );
 
+				});
 
+
 
+			} );
 
 
-		<script src="test-pdf.js"></script>
 
+		</script>
 
 
 	</body>
 
 </html>

+ 0 - 12
test/test-pdf.js
查看文件 

@@ -1,12 +0,0 @@
 
-Reveal.addEventListener( 'ready', function() {
 
-
 
-	// 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' );
 
-	});
 
-
 
-} );
 
-
 
-Reveal.initialize({ pdf: true });

+ 15 - 14
test/test-plugins.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -26,8 +27,6 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 
 			QUnit.module( 'Plugins' );
 
@@ -59,16 +58,18 @@
 
 
 			var PluginE = {};
 
 
-			Reveal.registerPlugin( 'PluginA', PluginA );
 
-			Reveal.registerPlugin( 'PluginB', PluginB );
 
-			Reveal.registerPlugin( 'PluginC', PluginC );
 
+			var reveal = new Reveal();
 
+
 
+			reveal.registerPlugin( 'PluginA', PluginA );
 
+			reveal.registerPlugin( 'PluginB', PluginB );
 
+			reveal.registerPlugin( 'PluginC', PluginC );
 
 
-			Reveal.initialize();
 
+			reveal.initialize();
 
 
 			QUnit.test( 'Can initialize synchronously', function( assert ) {
 
 				assert.strictEqual( initCounter['PluginB'], 1 );
 
 
-				Reveal.registerPlugin( 'PluginB', PluginB );
 
+				reveal.registerPlugin( 'PluginB', PluginB );
 
 
 				assert.strictEqual( initCounter['PluginB'], 1, 'prevents duplicate registration' );
 
 			});
 
@@ -79,25 +80,25 @@
 
 
 				assert.strictEqual( initCounter['PluginC'], 0, 'async plugin not immediately initialized' );
 
 
-				Reveal.addEventListener( 'ready', function() {
 
+				reveal.addEventListener( 'ready', function() {
 
 					assert.strictEqual( initCounter['PluginC'], 1, 'finsihed initializing when reveal.js dispatches "ready"' );
 
 					done();
 
 
-					Reveal.registerPlugin( 'PluginD', PluginD );
 
+					reveal.registerPlugin( 'PluginD', PluginD );
 
 					assert.strictEqual( initCounter['PluginD'], 1, 'plugin registered after reveal.js is ready still initiailizes' );
 
 					done();
 
 				});
 
 			} );
 
 
 			QUnit.test( 'Can check if plugin is registered', function( assert ) {
 
-				assert.strictEqual( Reveal.hasPlugin( 'PluginA' ), true );
 
-				assert.strictEqual( Reveal.hasPlugin( 'PluginE' ), false );
 
-				Reveal.registerPlugin( 'PluginE', PluginE );
 
-				assert.strictEqual( Reveal.hasPlugin( 'PluginE' ), true );
 
+				assert.strictEqual( reveal.hasPlugin( 'PluginA' ), true );
 
+				assert.strictEqual( reveal.hasPlugin( 'PluginE' ), false );
 
+				reveal.registerPlugin( 'PluginE', PluginE );
 
+				assert.strictEqual( reveal.hasPlugin( 'PluginE' ), true );
 
 			} );
 
 
 			QUnit.test( 'Can retrieve plugin instance', function( assert ) {
 
-				assert.strictEqual( Reveal.getPlugin( 'PluginB' ), PluginB );
 
+				assert.strictEqual( reveal.getPlugin( 'PluginB' ), PluginB );
 
 			} );
 
 		</script>

+ 2 - 5
test/test-state.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -36,12 +37,10 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script>
 
 
 
-			Reveal.addEventListener( 'ready', function() {
 
+			Reveal.initialize().then( function() {
 
 
 				QUnit.module( 'State' );
 
 
@@ -131,8 +130,6 @@
 
 				});
 
 
 			} );
 
-
 
-			Reveal.initialize();
 
 		</script>
 
 
 	</body>

+ 1 - 2
test/test.html
查看文件 

@@ -8,6 +8,7 @@
 
 
 		<link rel="stylesheet" href="../dist/reveal.css">
 
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+		<script src="qunit-2.5.0.js"></script>
 
 	</head>
 
 
 	<body style="overflow: auto;">
 
@@ -77,8 +78,6 @@
 
 		</div>
 
 
 		<script src="../dist/reveal.min.js"></script>
 
-		<script src="qunit-2.5.0.js"></script>
 
-
 
 		<script src="test.js"></script>
 
 
 	</body>

+ 1 - 3
test/test.js
查看文件 

@@ -7,7 +7,7 @@
 
 // 3 - Two fragments with same data-fragment-index
 
 // 4
 
 
-Reveal.addEventListener( 'ready', function() {
 
+Reveal.initialize().then( function() {
 
 
 	// ---------------------------------------------------------------
 
 	// DOM TESTS
 
@@ -610,5 +610,3 @@ Reveal.addEventListener( 'ready', function() {
 
 	});
 
 
 } );
 
-
 
-Reveal.initialize();