merged master

grunt/config/run.js

@@ -1,20 +1,35 @@
 module.exports = {
   generate: {
-    exec: 'node scripts/generate'
+    exec: 'node ./scripts/generate/index.js',
+    options: {
+      passArgs: [
+        'verbose',
+        'es_branch'
+      ]
+    }
+  },
+  generate_yaml_tests: {
+    exec: 'node ./scripts/generate/index.js --no-api',
+    options: {
+      passArgs: [
+        'verbose',
+        'es_branch'
+      ]
+    }
+  },
+  browser_integration_tests: {
+    exec: 'node ./scripts/run_browser_integration_suite',
+    options: {
+      passArgs: [
+        'browsers'
+      ]
+    }
   },
   browser_unit_tests: {
     exec: './node_modules/.bin/testling .',
     options: {
-      cwd: '.'
-    }
-  },
-  browser_integration_tests: {
-    exec: 'node scripts/run_tests --integration --no-server',
-    options: {
-      cwd: '.',
       passArgs: [
-        'port',
-        'host'
+        'x'
       ]
     }
   }

grunt/tasks.js

@@ -5,17 +5,18 @@ module.exports = function (grunt) {
     'test'
   ]);
 
-  grunt.registerTask('generate', [
-    'run:generate'
-  ]);
-
   grunt.registerTask('test', [
     'jshint',
     'mochacov:unit',
-    'generate',
+    'run:generate',
     'mochacov:integration',
   ]);
 
+  grunt.registerTask('unit_test', [
+    'jshint',
+    'mochacov:unit'
+  ]);
+
   grunt.registerTask('coverage', [
     'mochacov:make_coverage_html',
     'open:coverage'