Add mocha tests to app generator

yeoman · Sep 12, 2014 · f9e168c · f9e168c
1 parent d48160a
commit f9e168c
Show file tree

Hide file tree

Showing 17 changed files with 148 additions and 9,473 deletions.
diff --git a/app/index.js b/app/index.js
@@ -94,5 +94,6 @@ module.exports = yeoman.generators.Base.extend({
       this.includeSass ? 'app/elements/yo-greeting/yo-greeting.scss':
                          'app/elements/yo-greeting/yo-greeting.css');
     this.copy('app/index.html', 'app/index.html');
+    this.directory('test', 'app/test');
   }
 });
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -53,11 +53,7 @@ module.exports = function (grunt) {
           '<%%= yeoman.app %>/elements/{,*/}*.css'
         ],
         tasks: ['copy:styles', 'autoprefixer:server']
-      }<% if (testFramework === 'jasmine') { %>,
-      test: {
-        files: ['<%%= yeoman.app %>/scripts/{,*/}*.js', 'test/spec/**/*.js'],
-        tasks: ['test']
-      }<% } %><% if (includeSass) { %>,
+      }<% if (includeSass) { %>,
       sass: {
         files: [
           '<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}',
@@ -137,13 +133,15 @@ module.exports = function (grunt) {
       },
       test: {
         options: {
+          open: {
+            target: 'http://localhost:<%%= connect.options.port %>/test/runner.html'
+          },
           middleware: function (connect) {
             return [
-              mountFolder(connect, '.tmp'),
-              mountFolder(connect, 'test'),
               mountFolder(connect, yeomanConfig.app)
             ];
-          }
+          },
+          keepalive: true
         }
       },
       dist: {
@@ -175,29 +173,7 @@ module.exports = function (grunt) {
         '!<%%= yeoman.app %>/scripts/vendor/*',
         'test/spec/{,*/}*.js'
       ]
-    }<% if (testFramework === 'mocha') { %>,
-    mocha: {
-      all: {
-        options: {
-          run: true,
-          urls: ['http://localhost:<%%= connect.options.port %>/index.html']
-        }
-      }
-    }<% } else { %>,
-    jasmine: {
-      all:{
-        src : '.tmp/scripts/combined-scripts.js',
-        options: {
-          keepRunner: true,
-          specs : 'test/spec/**/*.js',
-          vendor : [
-            '<%%= yeoman.app %>/bower_components/jquery/jquery.js',
-            '<%%= yeoman.app %>/bower_components/underscore/underscore.js',
-            '<%%= yeoman.app %>/bower_components/backbone/backbone.js'
-          ]
-        }
-      }
-    }<% } %>,
+    },
     useminPrepare: {
       html: '<%%= yeoman.app %>/index.html',
       options: {
@@ -341,11 +317,8 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('test', [
-    'clean:server',<% if(testFramework === 'mocha') { %>
-    'connect:test',
-    'mocha'<% } else { %>
-    'jasmine',
-    'watch:test'<% } %>
+    'clean:server',
+    'connect:test'
   ]);
 
   grunt.registerTask('build', [

diff --git a/app/templates/_bower.json b/app/templates/_bower.json
@@ -6,5 +6,7 @@
     "paper-elements": "Polymer/paper-elements#^0.4.0",<% } %>
     "polymer": "Polymer/polymer#^0.4.0"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "polymer-test-tools": "Polymer/polymer-test-tools#^0.4.0"
+  }
 }
diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -16,9 +16,7 @@
     "grunt-contrib-connect": "0.8.0",
     "grunt-contrib-clean": "0.5.0",
     "grunt-contrib-imagemin": "0.7.1",
-    "grunt-contrib-watch": "~0.6.1",<% if (testFramework === 'jasmine') { %>
-    "grunt-contrib-jasmine": "~0.5.1",<% } else { %>
-    "grunt-mocha": "~0.4.7",<% } %>
+    "grunt-contrib-watch": "~0.6.1",
     "grunt-usemin": "~2.3.0",
     "grunt-pagespeed": "~0.3.0",
     "grunt-rev": "~0.1.0",

diff --git a/app/templates/app/yo-greeting.html b/app/templates/app/yo-greeting.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<polymer-element name="yo-greeting"  attributes="">
+<polymer-element name="yo-greeting" attributes="">
   <template>
     <link rel="stylesheet" href="yo-greeting.css">
     <h1>{{ greeting }}, {{ greeting }}!</h1>

diff --git a/app/templates/app/yo-list.html b/app/templates/app/yo-list.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<polymer-element name="yo-list"  attributes="">
+<polymer-element name="yo-list" attributes="">
   <template>
     <link rel="stylesheet" href="yo-list.css">
     <ul>

diff --git a/app/templates/test/index.html b/app/templates/test/index.html