Merge pull request #13815 from code-dot-org/test

code-dot-org · Mar 15, 2017 · 41056ec · 41056ec
2 parents a0a65b4 + 86b7d1d
commit 41056ec
Show file tree

Hide file tree

Showing 180 changed files with 2,644 additions and 5,735 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -47,6 +47,8 @@ Style/WordArray:
 # BEGIN BLACKLIST: Below are rules we don't plan to enable in the forseeable
 # future. Rules we plan to fix (but are currently failing) belong in
 # .rubocop_todo.yml.
+Metrics/BlockLength:
+  Enabled: false
 
 Metrics/AbcSize:
   Enabled: false

diff --git a/apps/Gruntfile.js b/apps/Gruntfile.js
@@ -246,12 +246,6 @@ testsContext.keys().forEach(testsContext);
           src: ['*.js'],
           dest: 'build/package/js/fileupload/',
         },
-        {
-          expand: true,
-          cwd: 'lib/jsinterpreter',
-          src: ['*.js'],
-          dest: 'build/package/js/jsinterpreter/'
-        }
       ]
     }
   };
@@ -562,8 +556,6 @@ testsContext.keys().forEach(testsContext);
   config.uglify = {
     lib: {
       files: _.fromPairs([
-        'jsinterpreter/interpreter.js',
-        'jsinterpreter/acorn.js',
         'p5play/p5.play.js',
         'p5play/p5.js'
       ].map(function (src) {

diff --git a/apps/lib/jsinterpreter/acorn.js b/apps/lib/jsinterpreter/acorn.js