make interactive2 tests run as part of make test

Summary: We previously had interactive2 test inside the interactive2 folder. This commit adds those to the test infrastructure already in the top-level perseus Makefile. yay tests! Test Plan: make test make jest Note: make jest is currently [still] failing due to jestjs/jest#62 Reviewers: charlie Reviewed By: charlie Subscribers: jlfwong Differential Revision: http://phabricator.khanacademy.org/D11186
Khan · Jul 16, 2014 · e010ca3 · e010ca3
1 parent d6e959d
commit e010ca3
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 48 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "devDependencies": {
     "beefy": "~0.6.0",
     "browserify": "~3.4.1",
-    "jest-cli": "~0.1.15",
+    "jest-cli": "~0.1.17",
     "jsdom": "^0.10.5",
     "mocha": "^1.19.0",
     "node-jsx": "^0.10.0",

diff --git a/src/interactive2/Makefile b/src/interactive2/Makefile
diff --git a/src/interactive2/test/movable-mock.js → src/interactive2/__tests__/movable-mock.js b/src/interactive2/test/movable-mock.js → src/interactive2/__tests__/movable-mock.js
diff --git a/src/interactive2/test/movable-point-test.js → ...eractive2/__tests__/movable-point-test.js b/src/interactive2/test/movable-point-test.js → ...eractive2/__tests__/movable-point-test.js
@@ -1,10 +1,6 @@
 // System requires
 var assert = require("assert");
 
-// Interactive2 global dependencies
-global._ = require("underscore");
-global.KhanUtil = require("./kmath-shim.js");
-
 // Interactive2 requires
 var _createMockMovable = require("./movable-mock.js");
 var MovablePoint = require("../movable-point.js");

diff --git a/src/interactive2/package.json b/src/interactive2/package.json
diff --git a/src/interactive2/test/kmath-shim.js b/src/interactive2/test/kmath-shim.js