cloud-coders
diff --git a/‎README.md‎
Lines changed: 3 additions & 2 deletions b/‎README.md‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎gulpfile.js‎
Lines changed: 9 additions & 1 deletion b/‎gulpfile.js‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎modules/angular2/src/core/compiler/pipeline/element_binder_builder.js‎
Lines changed: 3 additions & 1 deletion b/‎modules/angular2/src/core/compiler/pipeline/element_binder_builder.js‎
Lines changed: 3 additions & 1 deletion
@@ -45,8 +45,9 @@ If you don't already have `npm`, get it by installing [node.js](http://nodejs.or
 
 ### Unit tests
 
-1. `gulp test.unit.js`: JS tests
-2. `gulp test.unit.dart`: Dart tests
+1. `gulp test.unit.js`: JS tests in a browser
+2. `gulp test.unit.cjs`: JS tests in NodeJS (requires a build before)
+3. `gulp test.unit.dart`: Dart tests
 
 Notes for transpiler tests:
 
 
@@ -19,6 +19,7 @@ var karma = require('karma').server;
 var minimist = require('minimist');
 var es5build = require('./tools/build/es5build');
 var runServerDartTests = require('./tools/build/run_server_dart_tests');
+var transformCJSTests = require('./tools/build/transformCJSTests');
 var util = require('./tools/build/util');
 
 var DART_SDK = require('./tools/build/dartdetect')(gulp);
@@ -299,12 +300,15 @@ gulp.task('build/transpile.js.prod', function(done) {
 });
 
 gulp.task('build/transpile.js.cjs', transpile(gulp, gulpPlugins, {
-  src: CONFIG.transpile.src.js,
+  src: CONFIG.transpile.src.js.concat(['modules/**/*.cjs']),
   dest: CONFIG.dest.js.cjs,
   outputExt: 'js',
   options: CONFIG.transpile.options.js.cjs,
   srcFolderInsertion: CONFIG.srcFolderInsertion.js
 }));
+gulp.task('build/transformCJSTests', function() {
+  return gulp.src(CONFIG.dest.js.cjs + '/angular2/test/**/*_spec.js').pipe(transformCJSTests()).pipe(gulp.dest(CONFIG.dest.js.cjs + '/angular2/test/'));
+});
 
 gulp.task('build/transpile.dart', transpile(gulp, gulpPlugins, {
   src: CONFIG.transpile.src.dart,
@@ -548,6 +552,9 @@ gulp.task('test.unit.dart/ci', function (done) {
   karma.start({configFile: __dirname + '/karma-dart.conf.js',
       singleRun: true, reporters: ['dots'], browsers: getBrowsersFromCLI()}, done);
 });
+gulp.task('test.unit.cjs', function (done) {
+  return gulp.src(CONFIG.dest.js.cjs + '/angular2/test/core/compiler/**/*_spec.js').pipe(jasmine({verbose: true, includeStackTrace: true}));
+});
 
 // ------------------
 // server tests
@@ -616,6 +623,7 @@ gulp.task('build.js.cjs', function(done) {
   runSequence(
     ['build/transpile.js.cjs', 'build/copy.js.cjs', 'build/multicopy.js.cjs'],
     ['build/linknodemodules.js.cjs'],
+    'build/transformCJSTests',
     done
   );
 });
 
@@ -184,7 +184,9 @@ export class ElementBinderBuilder extends CompileStep {
       } else {
         property = this._resolvePropertyName(property);
         //TODO(pk): special casing innerHtml, see: https://github.com/angular/angular/issues/789
-        if (DOM.hasProperty(compileElement.element, property) || StringWrapper.equals(property, 'innerHtml')) {
+        if (StringWrapper.equals(property, 'innerHTML')) {
+          setterFn = (element, value) => DOM.setInnerHTML(element, value);
+        } else if (DOM.hasProperty(compileElement.element, property) || StringWrapper.equals(property, 'innerHtml')) {
           setterFn = reflector.setter(property);
         }
       }
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,9 @@ export class ElementBinderBuilder extends CompileStep {`
`184`	`184`	`} else {`
`185`	`185`	`property = this._resolvePropertyName(property);`
`186`	`186`	`//TODO(pk): special casing innerHtml, see: https://github.com/angular/angular/issues/789`
`187`		`- if (DOM.hasProperty(compileElement.element, property) \|\| StringWrapper.equals(property, 'innerHtml')) {`
	`187`	`+ if (StringWrapper.equals(property, 'innerHTML')) {`
	`188`	`+ setterFn = (element, value) => DOM.setInnerHTML(element, value);`
	`189`	`+ } else if (DOM.hasProperty(compileElement.element, property) \|\| StringWrapper.equals(property, 'innerHtml')) {`
`188`	`190`	`setterFn = reflector.setter(property);`
`189`	`191`	`}`
`190`	`192`	`}`