clearly separate unit tests and integration tests for meteor packages

parallelsio · Jul 6, 2015 · cbe7040 · cbe7040
1 parent 65da535
commit cbe7040
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/meteor-app/packages/infinite-undo/package.js b/meteor-app/packages/infinite-undo/package.js
@@ -29,6 +29,6 @@ Package.onUse(function(api) {
 Package.onTest(function(api) {
   api.use(["tinytest", "underscore"]);
   api.use("angelcabo:infinite-undo");
-  api.addFiles("lib/entity-repository_tests.js", "server");
-  api.addFiles("lib/rollback-replay-stack_tests.js", "server");
+  api.addFiles("test/integration/entity-repository_tests.js", "server");
+  api.addFiles("test/integration/rollback-replay-stack_tests.js", "server");
 });
diff --git a/...inite-undo/lib/entity-repository_tests.js → ...st/integration/entity-repository_tests.js b/...inite-undo/lib/entity-repository_tests.js → ...st/integration/entity-repository_tests.js
diff --git a/...e-undo/lib/rollback-replay-stack_tests.js → ...ntegration/rollback-replay-stack_tests.js b/...e-undo/lib/rollback-replay-stack_tests.js → ...ntegration/rollback-replay-stack_tests.js
diff --git a/...finite-undo/test/commandRegistry-specs.js → ...e-undo/test/unit/commandRegistry-specs.js b/...finite-undo/test/commandRegistry-specs.js → ...e-undo/test/unit/commandRegistry-specs.js
@@ -9,7 +9,7 @@ describe('CommandRegistry', function() {
 
     beforeEach(function () {
       this.Stub = function () {};
-      this.context = loadFile(path.resolve(__dirname, '../lib/command-registry.js'), { InfiniteUndo: {} });
+      this.context = loadFile(path.resolve(__dirname, '../../lib/command-registry.js'), { InfiniteUndo: {} });
     });
 
     it('should accept a command definition object with an "execute" function which will be invoked when the command\'s name is called on the prototype object', function (done) {

diff --git a/...p/packages/infinite-undo/test/loadFile.js → ...kages/infinite-undo/test/unit/loadFile.js b/...p/packages/infinite-undo/test/loadFile.js → ...kages/infinite-undo/test/unit/loadFile.js
diff --git a/meteor-app/packages/parallels-canvas-manager/package.js b/meteor-app/packages/parallels-canvas-manager/package.js
@@ -38,5 +38,5 @@ Package.onTest(function(api) {
   ]);
 
   // All test files
-  api.addFiles("lib/canvas-commands/createBitCommand_tests.js", "server");
+  api.addFiles("test/integration/canvas-commands/createBitCommand_tests.js", "server");
 });
diff --git a/...canvas-commands/createBitCommand_tests.js → ...canvas-commands/createBitCommand_tests.js b/...canvas-commands/createBitCommand_tests.js → ...canvas-commands/createBitCommand_tests.js
diff --git a/test-scripts/bin/run_meteor_package_units.sh b/test-scripts/bin/run_meteor_package_units.sh
@@ -18,9 +18,9 @@ fi
 TESTS_FAILED=0
 PACKAGES_FAILED=""
 for pkg in ${PACKAGES}; do
-  if [ -d "meteor-app/packages/${pkg}/test" ]; then
+  if [ -d "meteor-app/packages/${pkg}/test/unit" ]; then
     echo ">>> Testing package '${pkg}'..."
-    mocha meteor-app/packages/${pkg}/test || {
+    mocha meteor-app/packages/${pkg}/test/unit || {
       echo "ERROR: Tests for package '${pkg}' failed."
       TESTS_FAILED=1
       PACKAGES_FAILED="${PACKAGES_FAILED} ${pkg}"