Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

rm dead fw test code

  • Loading branch information...
commit 62d396c47e50d6231f4777b9c4b4412c08b7da86 1 parent 28c2563
@isao isao authored
Showing with 3 additions and 25 deletions.
  1. +3 −25 lib/app/commands/test.js
View
28 lib/app/commands/test.js
@@ -17,7 +17,6 @@ var libpath = require('path'),
targetMojitoPath = BASE,
mojitoTmp = '/tmp/mojitotmp',
mojitoInstrumentedDir = '/tmp/mojito-lib-inst',
- fwTestsRoot = BASE + 'lib/tests',
resultsDir = 'artifacts/test',
resultsFile = 'artifacts/test/result.xml',
coverageDir = 'artifacts/test/coverage',
@@ -49,7 +48,6 @@ var libpath = require('path'),
usage,
inputOptions,
- runTests,
Y = require('yui').YUI({useSync: true}).use('json-parse', 'json-stringify');
@@ -548,22 +546,7 @@ function instrumentDirectory(from, verbose, testType, callback) {
if (verbose) {
utils.log('Copy other files for testing');
}
-
- if (testType === 'fw') {
- if (verbose) {
- utils.log('copying non-js files to instrumented' +
- ' coverage directory');
- }
- // copy remaining non-js files into instrumented directory
- copyExclude(nodeModulesFrom, nodeModulesTo, [/\.svn/]);
- copyExclude(testsFrom, testsTo, [/\.svn/]);
- copyFile(packageFrom, packageTo);
- copyFile(cfgFrom, cfgTo);
- copyFile(dimFrom, dimTo);
- callback();
- } else {
- callback();
- }
+ callback();
}
});
}
@@ -575,7 +558,7 @@ function runTests(opts) {
ttn,
targetTests,
testName = opts.name,
- testType = opts.type || 'fw',
+ testType = opts.type || 'app',
path = libpath.resolve(opts.path),
coverage = inputOptions.coverage,
verbose = inputOptions.verbose,
@@ -615,9 +598,7 @@ function runTests(opts) {
configureYUI(YUI, store);
- if (testType === 'fw') {
- testConfigs = store.yui.getConfigShared('server', {}, true).modules;
- } else if (testType === 'app') {
+ if (testType === 'app') {
testConfigs = merge(
store.yui.getConfigShared('server', {}, true).modules,
store.yui.getConfigAllMojits('server', {}).modules
@@ -638,9 +619,6 @@ function runTests(opts) {
for (i = 0; i < targetTests.length; i += 1) {
ttn = targetTests[i];
- if (testType === 'fw' && ttn.indexOf('mojito-') !== 0) {
- ttn = 'mojito-' + ttn;
- }
if (ttn === name || ttn + '-tests' === name) {
testModuleNames.push(name);
}
Please sign in to comment.
Something went wrong with that request. Please try again.