Tests: Perform cleanup after finished Jest migration

circle.yml

@@ -39,8 +39,6 @@ test:
         files:
           - server/**/test/*.js
           - server/**/test/*.jsx
-    - MOCHA_FILE=./test-results-test.xml npm run test-test -- -R mocha-junit-reporter -t $CIRCLE_NODE_TOTAL -i $CIRCLE_NODE_INDEX:
-        parallel: true
   post:
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/ && find . -type f -regex  "./test-results.*\.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;:
         parallel: true

package.json

@@ -224,7 +224,7 @@
     "poststart": "npm run -s env -- cross-env node $NODE_ARGS build/bundle.js",
     "pretest": "npm run -s install-if-deps-outdated",
     "reformat-files": "node bin/reformat-files.js",
-    "test": "run-s -s test-client test-server test-test",
+    "test": "run-s -s test-client test-server",
     "test-client": "jest -c=test/client/jest.config.js",
     "test-client:ci": "cross-env TEST_REPORT_FILENAME=./test-results-client.xml jest -c=test/client/jest.config.ci.js -w=2",
     "test-client:watch": "npm run -s test-client -- --watch",
@@ -235,8 +235,6 @@
     "test-server:ci": "cross-env TEST_REPORT_FILENAME=./test-results-server.xml jest -c=test/server/jest.config.ci.js -w=2",
     "test-server:coverage": "npm run -s test-server -- --coverage",
     "test-server:watch": "npm run -s test-server -- --watch",
-    "test-test": "cross-env NODE_ENV=test NODE_PATH=test:client:client/extensions TEST_ROOT=test node test/runner.js",
-    "test-test:watch": "nodemon -e js,jsx --exec npm run -s test-test",
     "translate": "i18n-calypso --format pot --output-file ./calypso-strings.pot -e date \"**/*.js\" \"**/*.jsx\" \"!build/**\" \"!node_modules/**\" \"!public/**\" \"!client/extensions/**\"",
     "update-deps": "npm run -s rm -- node_modules && npm run -s rm -- npm-shrinkwrap.json && npm install && npm install && npm shrinkwrap --dev"
   },
@@ -270,9 +268,6 @@
     "jscodeshift": "0.3.30",
     "md5-file": "3.1.0",
     "mixedindentlint": "1.2.0",
-    "mocha": "3.1.0",
-    "mocha-junit-reporter": "1.12.0",
-    "mockery": "1.7.0",
     "nock": "8.0.0",
     "nodemon": "1.4.1",
     "prettier": "github:automattic/calypso-prettier#70f962b0",

test/client/jest.config.json

@@ -5,7 +5,7 @@
 	],
 	"rootDir": "./../../",
 	"testEnvironment": "node",
-	"testMatch": [ "**/client/**/test/*.js?(x)" ],
+	"testMatch": [ "<rootDir>/client/**/test/*.js?(x)" ],
 	"testURL": "https://example.com",
 	"setupTestFrameworkScriptFile": "<rootDir>/test/client/setup-test-framework.js",
 	"verbose": false

test/integration/jest.config.json

@@ -8,10 +8,10 @@
 	"rootDir": "./../../",
 	"testEnvironment": "node",
 	"testMatch": [
-		"**/bin/**/integration/*.js",
-		"**/client/**/integration/*.js",
-		"**/server/**/integration/*.js"
+		"<rootDir>/bin/**/integration/*.js",
+		"<rootDir>/client/**/integration/*.js",
+		"<rootDir>/server/**/integration/*.js",
+		"<rootDir>/test/test/helpers/**/integration/*.js"
 	],
-	"setupTestFrameworkScriptFile": "<rootDir>/test/integration/setup-test-framework.js",
 	"verbose": true
 }

test/server/jest.config.json

@@ -1,5 +1,8 @@
 {
-	"collectCoverageFrom": [ "**/server/**/*.js?(x)" ],
+	"collectCoverageFrom": [ "server/**/*.js?(x)" ],
+	"coveragePathIgnorePatterns": [
+		"<rootDir>/server/devdocs/search-index.js"
+	],
 	"modulePaths": [
 		"<rootDir>/test/",
 		"<rootDir>/server/",
@@ -8,7 +11,7 @@
 	],
 	"rootDir": "./../../",
 	"testEnvironment": "node",
-	"testMatch": [ "**/server/**/test/*.js?(x)" ],
+	"testMatch": [ "<rootDir>/server/**/test/*.js?(x)" ],
 	"timers": "fake",
 	"setupTestFrameworkScriptFile": "<rootDir>/test/server/setup-test-framework.js",
 	"verbose": true