Skip to content

Commit 7948a6c

Browse files
committed
Fix build tests.
1 parent 5553e20 commit 7948a6c

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module.exports = function (grunt) {
6262
// Delete files created by the "testBuild" target.
6363
testBuild: [
6464
"tests/functional/jqueryApp/{bower_components,node_modules,build,tmp}",
65-
"tests/jquery.js" // work around grunt-amd-build bug where it puts files outside of tmp/ dir
65+
"tests/functional/cssApp/{bower_components,node_modules,build,tmp}"
6666
]
6767
}
6868
});

tests/functional/cssApp/Gruntfile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ module.exports = function (grunt) {
99

1010
var outprop = "amdoutput";
1111
var outdir = "./build/";
12-
var tmpdir = "./tmp/";
12+
// use a depth of 4 directory to keep tmpdir/../../.. inside a tmp directory
13+
var tmpdir = "./tmp/tmp/tmp/tmp";
1314

1415
grunt.initConfig({
1516
amdloader: {
@@ -77,7 +78,7 @@ module.exports = function (grunt) {
7778
var name = this.name, layers = grunt.config(name).layers;
7879
layers.forEach(function (layer) {
7980
grunt.task.run("amddepsscan:" + layer.name + ":" + name + ":" + amdloader);
80-
grunt.task.run("amdserialize:" + layer.name + ":" + name + ":" + outprop);
81+
grunt.task.run("amdserialize:" + layer.name + ":" + name + ":" + amdloader + ":" + outprop);
8182
grunt.task.run("concat");
8283
grunt.task.run("copy:plugins");
8384
});

tests/functional/cssApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Test application using css! plugin",
55
"devDependencies": {
66
"clean-css": "3.2.2",
7-
"grunt-amd-build": "0.8.x",
7+
"grunt-amd-build": "0.10.0-alpha",
88
"grunt-contrib-clean": "0.6.x",
99
"grunt-contrib-concat": "0.5.x",
1010
"grunt-contrib-copy": "0.5.x"

tests/functional/jqueryApp/Gruntfile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ module.exports = function (grunt) {
99

1010
var outprop = "amdoutput";
1111
var outdir = "./build/";
12-
var tmpdir = "./tmp/";
12+
// use a depth of 4 directory to keep tmpdir/../../.. inside a tmp directory
13+
var tmpdir = "./tmp/tmp/tmp/tmp";
1314

1415
grunt.initConfig({
1516
amdloader: {
@@ -77,7 +78,7 @@ module.exports = function (grunt) {
7778
var name = this.name, layers = grunt.config(name).layers;
7879
layers.forEach(function (layer) {
7980
grunt.task.run("amddepsscan:" + layer.name + ":" + name + ":" + amdloader);
80-
grunt.task.run("amdserialize:" + layer.name + ":" + name + ":" + outprop);
81+
grunt.task.run("amdserialize:" + layer.name + ":" + name + ":" + amdloader + ":" + outprop);
8182
grunt.task.run("concat");
8283
grunt.task.run("copy:plugins");
8384
});

tests/functional/jqueryApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"description": "Test application using jquery! plugin",
55
"devDependencies": {
6-
"grunt-amd-build": "0.8.x",
6+
"grunt-amd-build": "0.10.0-alpha",
77
"grunt-contrib-clean": "0.6.x",
88
"grunt-contrib-concat": "0.5.x",
99
"grunt-contrib-copy": "0.5.x"

0 commit comments

Comments
 (0)