Skip to content

Commit f278a62

Browse files
committed
Housekeeping node tests, renamed to unit-tests
1 parent 9ad297f commit f278a62

21 files changed

+101
-467
lines changed

gruntfile.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ module.exports = function(grunt) {
109109

110110
var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
111111
nodeTestEnv.NODE_PATH = localCfg.outTnsCoreModules;
112-
localCfg.nodeTestsDir = path.join(localCfg.outDir, 'node-tests');
112+
localCfg.nodeTestsDir = path.join(localCfg.outDir, 'unit-tests');
113113
localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
114114
localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
115115
localCfg.commitSHA = getCommitSha();
@@ -202,7 +202,7 @@ module.exports = function(grunt) {
202202
src: [
203203
"**/*.d.ts",
204204
//Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
205-
"!node-tests/**",
205+
"!unit-tests/**",
206206
"!org.nativescript.widgets.d.ts",
207207
"!android17.d.ts",
208208
"!**/*.android.d.ts",
@@ -255,7 +255,7 @@ module.exports = function(grunt) {
255255
'**/*',
256256
'!*.md',
257257
'!node_modules/**/*',
258-
'!node-tests/**/*',
258+
'!unit-tests/**/*',
259259
],
260260
cwd: localCfg.outDir,
261261
dest: "<%= grunt.option('path') %>/node_modules/tns-core-modules/",
@@ -279,7 +279,7 @@ module.exports = function(grunt) {
279279
},
280280
compileAll: "npm run compile-all",
281281
setupLinks: "npm run setup",
282-
compileNodeTests: "npm run compile-node-tests",
282+
runUnitTests: "npm run unit-test",
283283
tslint: "npm run tslint",
284284
},
285285
simplemocha: {
@@ -368,7 +368,7 @@ module.exports = function(grunt) {
368368
//aliasing pack-modules for backwards compatibility
369369
grunt.registerTask("pack-modules", [
370370
"compile-modules",
371-
"node-tests",
371+
"run-unit-test",
372372
"copy:modulesPackageDef",
373373
"exec:packModules"
374374
]);
@@ -384,13 +384,9 @@ module.exports = function(grunt) {
384384
"copy:jsLibs",
385385
]);
386386

387-
grunt.registerTask("node-tests", [
387+
grunt.registerTask("run-unit-test", [
388388
"clean:nodeTests",
389-
"shell:compileNodeTests",
390-
"copy:childPackageFiles",
391-
"copy:jsLibs",
392-
"env:nodeTests",
393-
"exec:mochaNode", //spawn a new process to use the new NODE_PATH
389+
"shell:runUnitTests"
394390
]);
395391

396392
grunt.registerTask("apiref", [

node-tests/definitions/chai.d.ts

Lines changed: 0 additions & 285 deletions
This file was deleted.

0 commit comments

Comments
 (0)