Test updates to verify that this works..

twobit · Dec 4, 2012 · 6aa4871 · 6aa4871
1 parent 5191a09
commit 6aa4871
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ CVS/
 *~
 .com.apple.timemachine.supported
 tests/assets/yql/build/*/*
+tests/assets-global
 coverage
diff --git a/.shifter.json b/.shifter.json
@@ -1,4 +1,5 @@
 {
     "silent": false,
-    "istanbul": true
+    "istanbul": true,
+    "build-dir": "./tests/assets-global/"
 }
diff --git a/tests/assets/yql/src/uploader/build.json b/tests/assets/yql/src/uploader/build.json
@@ -7,7 +7,7 @@
     "builds": {
         "uploader": {
             "copy": [
-                [ "swf/flashuploader.swf", "../../build/uploader/assets/flashuploader.swf" ]
+                [ "swf/flashuploader.swf", "../../../../assets-global/uploader/assets/flashuploader.swf" ]
             ],
             "jsfiles": [
                 "uploader.js"

diff --git a/tests/assets/yql/src/yql/build.json b/tests/assets/yql/src/yql/build.json
@@ -6,7 +6,7 @@
     "builds": {
         "yql": {
             "exec": [
-                "shifter --config test.json",
+                "shifter --config test.json --no-global-config",
                 "echo 'Foobar'"
             ],
             "postexec": [

diff --git a/tests/assets/yql/src/yql2/build.json b/tests/assets/yql/src/yql2/build.json
@@ -3,7 +3,7 @@
     "builds": {
         "yql2": {
             "exec": [
-                "shifter --config test.json",
+                "shifter --config test.json --no-global-config",
                 "echo 'Foobar'"
             ],
             "postexec": [

diff --git a/tests/builder-uglify-uploader.js b/tests/builder-uglify-uploader.js
@@ -7,7 +7,7 @@ var vows = require('vows'),
     shifter = require('../lib'),
     base = path.join(__dirname, 'assets/yql/'),
     crypto = require('crypto'),
-    buildBase = path.join(base, 'build'),
+    buildBase = path.join(__dirname, 'assets-global'),
     buildXBase = path.join(base, 'build-uglify'),
     srcBase = path.join(base, 'src/uploader'),
     rimraf = require('rimraf');
@@ -16,12 +16,12 @@ var vows = require('vows'),
 var tests = {
     'clean build': {
         topic: function() {
-            rimraf(path.join(buildBase, 'uploader'), this.callback);
+            rimraf(path.join(buildBase), this.callback);
         },
         'should not have build dir and': {
             topic: function() {
                 var self = this;
-                fs.stat(path.join(buildBase, 'uploader'), function(err) {
+                fs.stat(path.join(buildBase), function(err) {
                     self.callback(null, err);
                 });
             },