Merge remote-tracking branch 'origin/master'

# Conflicts: # js/NumberPropertyTests.js
phetsims · Dec 11, 2017 · bf8abe8 · bf8abe8
2 parents 45070c6 + 37eb5d6
commit bf8abe8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/js/NumberPropertyTests.js b/js/NumberPropertyTests.js
@@ -112,10 +112,6 @@ define( function( require ) {
         validValues: [ 0, 1, 2 ]
       }, 'should throw Assertion failed: validValues, isValidValue and range are mutually-exclusive options' );
     } );
-
-    // if ( !window.assert ) {
-    //   assert.expect( 5 ); // TODO: this is a hack to suppress the "expected 0 tests but 5 were run" error.
-    // }
   } );
 
 } );