From e010ca3f7f4dc42997650be07bbd39fc590ccef5 Mon Sep 17 00:00:00 2001
From: Jack Toole <jack@khanacademy.org>
Date: Wed, 16 Jul 2014 13:40:50 -0700
Subject: [PATCH] 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
https://github.com/facebook/jest/issues/62

Reviewers: charlie

Reviewed By: charlie

Subscribers: jlfwong

Differential Revision: http://phabricator.khanacademy.org/D11186
---
 package.json                                  |  2 +-
 src/interactive2/Makefile                     | 11 ---------
 .../{test => __tests__}/movable-mock.js       |  0
 .../{test => __tests__}/movable-point-test.js |  4 ----
 src/interactive2/package.json                 |  9 --------
 src/interactive2/test/kmath-shim.js           | 23 -------------------
 6 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 src/interactive2/Makefile
 rename src/interactive2/{test => __tests__}/movable-mock.js (100%)
 rename src/interactive2/{test => __tests__}/movable-point-test.js (97%)
 delete mode 100644 src/interactive2/package.json
 delete mode 100644 src/interactive2/test/kmath-shim.js

diff --git a/package.json b/package.json
index d814e1e81c..01b5cf62c0 100644
--- 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
deleted file mode 100644
index 42acc8655d..0000000000
--- a/src/interactive2/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-.PHONY: test install
-
-mkfile_path = $(abspath $(lastword $(MAKEFILE_LIST)))
-current_dir = $(dir $(mkfile_path))
-MOCHA="$(current_dir)node_modules/.bin/mocha"
-
-test: install
-	cd test && $(MOCHA) --reporter spec *-test.js
-
-install:
-	npm install
diff --git a/src/interactive2/test/movable-mock.js b/src/interactive2/__tests__/movable-mock.js
similarity index 100%
rename from src/interactive2/test/movable-mock.js
rename to src/interactive2/__tests__/movable-mock.js
diff --git a/src/interactive2/test/movable-point-test.js b/src/interactive2/__tests__/movable-point-test.js
similarity index 97%
rename from src/interactive2/test/movable-point-test.js
rename to src/interactive2/__tests__/movable-point-test.js
index 697279aedd..7e57e0b331 100644
--- a/src/interactive2/test/movable-point-test.js
+++ b/src/interactive2/__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
deleted file mode 100644
index e8e89dc3f5..0000000000
--- a/src/interactive2/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Interactive2",
-  "version": "0.0.1",
-  "devDependencies": {
-    "underscore": "1.4.4",
-    "requirejs": "2.1.11",
-    "mocha": "~1.17"
-  }
-}
diff --git a/src/interactive2/test/kmath-shim.js b/src/interactive2/test/kmath-shim.js
deleted file mode 100644
index 2ba5d98e8f..0000000000
--- a/src/interactive2/test/kmath-shim.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var requirejs = require('requirejs');
-
-requirejs.config({
-    //Use node's special variable __dirname to
-    //get the directory containing this file.
-    //Useful if building a library that will
-    //be used in node but does not require the
-    //use of node outside
-    baseUrl: __dirname,
-
-    //Pass the top-level main.js/index.js require
-    //function to requirejs so that node modules
-    //are loaded relative to the top-level JS file.
-    nodeRequire: require
-});
-
-global.KhanUtil = {};
-global._ = require("underscore");
-requirejs("./../../../ke/utils/knumber.js");
-requirejs("./../../../ke/utils/kvector.js");
-requirejs("./../../../ke/utils/kpoint.js");
-
-module.exports = global.KhanUtil;