diff --git a/package.json b/package.json index 7230f008c..967fd0171 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "release": "npm run release-mac && npm run release-win && npm run release-lin", "test": "yarn test-node && yarn test-electron", "test-electron": "yarn grunt test", - "test-node": "mocha --recursive test/app test/modules ts/test-unit", - "test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test-unit", + "test-node": "mocha --recursive test/app test/modules ts/test", + "test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test", "eslint": "eslint .", "jscs": "yarn grunt jscs", "jshint": "yarn grunt jshint", diff --git a/preload.js b/preload.js index 9146f6216..aca6cbabc 100644 --- a/preload.js +++ b/preload.js @@ -114,7 +114,7 @@ window.ProxyAgent = require('proxy-agent'); // two locations: // // 1) test/styleguide/legacy_bridge.js -// 2) ts/test/StyleGuideUtil.js +// 2) ts/styleguide/StyleGuideUtil.js window.React = require('react'); window.ReactDOM = require('react-dom'); diff --git a/styleguide.config.js b/styleguide.config.js index c832513de..69a8b8612 100644 --- a/styleguide.config.js +++ b/styleguide.config.js @@ -20,12 +20,12 @@ module.exports = { { name: 'Test', description: 'Components only used for testing', - components: 'ts/test/**/*.tsx', + components: 'ts/styleguide/**/*.tsx', }, ], context: { // Exposes necessary utilities in the global scope for all readme code snippets - util: 'ts/test/StyleGuideUtil', + util: 'ts/styleguide/StyleGuideUtil', }, // We don't want one long, single page pagePerSection: true, diff --git a/ts/test/ConversationContext.md b/ts/styleguide/ConversationContext.md similarity index 100% rename from ts/test/ConversationContext.md rename to ts/styleguide/ConversationContext.md diff --git a/ts/test/ConversationContext.tsx b/ts/styleguide/ConversationContext.tsx similarity index 100% rename from ts/test/ConversationContext.tsx rename to ts/styleguide/ConversationContext.tsx diff --git a/ts/test/StyleGuideUtil.ts b/ts/styleguide/StyleGuideUtil.ts similarity index 100% rename from ts/test/StyleGuideUtil.ts rename to ts/styleguide/StyleGuideUtil.ts diff --git a/ts/test-unit/html/index_test.ts b/ts/test/html/index_test.ts similarity index 100% rename from ts/test-unit/html/index_test.ts rename to ts/test/html/index_test.ts