Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix the option to specify a ruby executeable from the outside in instead of leaning on rspec.bat to do its job (#9315)

This commit is contained in:
Wilfried Goesgens 2019-06-24 20:39:30 +02:00 committed by Jan
parent a714290796
commit f947954f6c
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/client/modules/@arangodb/test-utils.js
View File

@ -36,6 +36,7 @@ const time = require('internal').time;
const sleep = require('internal').sleep; const sleep = require('internal').sleep;
const download = require('internal').download; const download = require('internal').download;
const pathForTesting = require('internal').pathForTesting; const pathForTesting = require('internal').pathForTesting;
const platform = require('internal').platform;
/* Constants: */ /* Constants: */
// const BLUE = require('internal').COLORS.COLOR_BLUE; // const BLUE = require('internal').COLORS.COLOR_BLUE;
@ -850,6 +851,19 @@ function runInRSpec (options, instanceInfo, file, addArgs) {
'end\n'; 'end\n';
fs.write(tmpname, rspecConfig); fs.write(tmpname, rspecConfig);
if (options.hasOwnProperty('ruby')) {
let rx = new RegExp('ruby.exe$');
rspec = options.ruby.replace(rx, 'rspec');
command = options.ruby;
} else {
if (platform.substr(0, 3) !== 'win') {
command = 'rspec';
} else {
// Windows process utilties would apply `.exe` to rspec.
// However the file is called .bat and .exe cannot be found.
command = 'rspec.bat';
}
}
if (options.extremeVerbosity === true) { if (options.extremeVerbosity === true) {
print('rspecConfig: \n' + rspecConfig); print('rspecConfig: \n' + rspecConfig);
@ -859,14 +873,6 @@ function runInRSpec (options, instanceInfo, file, addArgs) {
fs.makeDirectory(pu.LOGS_DIR); fs.makeDirectory(pu.LOGS_DIR);
} catch (err) {} } catch (err) {}
if (options.ruby === '') {
command = options.rspec;
rspec = undefined;
} else {
command = options.ruby;
rspec = options.rspec;
}
args = ['--color', args = ['--color',
'-I', fs.join('tests', 'arangodbRspecLib'), '-I', fs.join('tests', 'arangodbRspecLib'),
'--format', 'd', '--format', 'd',

8
js/client/modules/@arangodb/testsuites/rspec.js
View File

@ -142,14 +142,6 @@ exports.setup = function (testFns, defaultFns, opts, fnDocs, optionsDoc, allTest
defaultFns.push('ssl_server'); defaultFns.push('ssl_server');
opts['skipSsl'] = false; opts['skipSsl'] = false;
if (platform.substr(0, 3) !== 'win') {
opts['rspec'] = 'rspec';
} else {
// Windows process utilties would apply `.exe` to rspec.
// However the file is called .bat and .exe cannot be found.
opts['rspec'] = 'rspec.bat';
}
opts['ruby'] = '';
for (var attrname in functionsDocumentation) { fnDocs[attrname] = functionsDocumentation[attrname]; } for (var attrname in functionsDocumentation) { fnDocs[attrname] = functionsDocumentation[attrname]; }
for (var i = 0; i < optionsDocumentation.length; i++) { optionsDoc.push(optionsDocumentation[i]); } for (var i = 0; i < optionsDocumentation.length; i++) { optionsDoc.push(optionsDocumentation[i]); }