Merge pull request #725 from johanneswuerbach/lazy-mocha-test

Lazy mocha test
testem · Jan 4, 2016 · 3c4120b · 3c4120b
2 parents 19d9bcb + cb1e0a2
commit 3c4120b
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 2 deletions.
diff --git a/examples/mocha_lazy/hello.js b/examples/mocha_lazy/hello.js
@@ -0,0 +1,3 @@
+function hello(name){
+    return "hello " + (name || 'world');
+}
diff --git a/examples/mocha_lazy/hello_spec.js b/examples/mocha_lazy/hello_spec.js
@@ -0,0 +1,10 @@
+var expect = chai.expect;
+
+describe('hello', function(){
+    it('should say hello', function(){
+        expect(hello()).to.equal('hello world');
+    });
+    it('should say hello to person', function(){
+        expect(hello('Bob')).to.equal('hello Bob');
+    });
+});
diff --git a/examples/mocha_lazy/test.html b/examples/mocha_lazy/test.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+<head>
+<title>Test'em</title>
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.css">
+</head>
+<body>
+<div id="mocha"></div>
+<script src="/testem.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/chai/3.4.1/chai.js"></script>
+<script>mocha.setup('bdd')</script>
+<script src="hello.js"></script>
+<script src="hello_spec.js"></script>
+<script>
+Testem.hookIntoTestFramework();
+mocha.run()
+</script>
+</body>
+</html>
diff --git a/examples/mocha_lazy/testem.json b/examples/mocha_lazy/testem.json
@@ -0,0 +1,7 @@
+{
+  "framework": "mocha",
+  "test_page": "test.html",
+  "src_files": [
+    "*.js"
+  ]
+}
diff --git a/tests/examples/examples_tests.js b/tests/examples/examples_tests.js
@@ -33,6 +33,10 @@ describe('examples', function() {
     testExample(path.join('examples/mocha_simple'), done);
   });
 
+  it('runs lazy mocha', function(done) {
+    testExample(path.join('examples/mocha_lazy'), done);
+  });
+
   it('runs qunit', function(done) {
     testExample(path.join('examples/qunit_simple'), done);
   });

diff --git a/views/mochachairunner.mustache b/views/mochachairunner.mustache
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Test'em</title>
-<link rel="stylesheet" href="//cdjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.css">
 <script src="//cdnjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/chai/3.4.1/chai.js"></script>
 <script src="/testem.js"></script>

diff --git a/views/mocharunner.mustache b/views/mocharunner.mustache
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Test'em</title>
-<link rel="stylesheet" href="//cdjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.css">
 <script src="//cdnjs.cloudflare.com/ajax/libs/mocha/2.3.4/mocha.js"></script>
 <script src="/testem.js"></script>
 <script>mocha.setup('bdd')</script>