Close yeomanGH-522: Replaced coffescript task with grunt-coffee. Fixes …

…yeoman#407, Fixes yeoman#387
fitzchak · Sep 24, 2012 · 00d39a2 · 00d39a2
1 parent 663d8ff
commit 00d39a2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 33 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -56,7 +56,8 @@
     "prompt": "~0.1.12",
     "colors": "~0.6.0",
     "grunt-mocha": "~0.1.3",
-    "es6-collections": ">=0.2.0"
+    "es6-collections": ">=0.2.0",
+    "grunt-contrib-coffee": "~0.3.0"
   },
   "devDependencies": {
     "mocha": "~1.4.0",

diff --git a/cli/tasks/coffee.js b/cli/tasks/coffee.js
diff --git a/cli/tasks/yeoman.js b/cli/tasks/yeoman.js
@@ -21,6 +21,7 @@ module.exports = function(grunt) {
   //
   grunt.loadTasks(join(__dirname, '../node_modules/grunt-jasmine-task/tasks'));
   grunt.loadTasks(join(__dirname, '../node_modules/grunt-mocha/tasks'));
+  grunt.loadTasks(join(__dirname, '../node_modules/grunt-contrib-coffee/tasks'));
 
   // build targets: these are equivalent to grunt alias except that we defined
   // a single task and use arguments to trigger the appropriate target

diff --git a/cli/test/test-build.js b/cli/test/test-build.js
@@ -104,8 +104,7 @@ describe('yeoman init && yeoman build', function() {
         it('should go through coffee:dist', function() {
           // handled version file, get back filename via grunt globbing
           var foo = grunt.file.expandFiles('temp/scripts/*.foo.js')[0];
-          assert.equal(grunt.file.read(foo), 'var foo;\n\nfoo = "yeo";\n');
-          assert.equal(grunt.file.read(foo), 'var foo;\n\nfoo = "yeo";\n');
+          assert.equal(grunt.file.read(foo), '(function() {\n  var foo;\n\n  foo = "yeo";\n\n}).call(this);\n');
         });
       });