stopped using an empty suffix for test/branch stuff, so that things are less confusing down the road when versions change

This commit is contained in:
Spencer Alger
2014-02-05 09:46:53 -07:00
parent 4680930487
commit 70b51dfa6d
13 changed files with 15 additions and 19 deletions

View File

@ -1 +0,0 @@
require('./run')('0.90');

View File

@ -1 +0,0 @@
require('./run')('0.90');

View File

@ -1 +0,0 @@
require('./run')('1.0');

View File

@ -1 +0,0 @@
require('./run')('1.x');

View File

@ -1 +0,0 @@
require('./run')('master');

View File

@ -10,7 +10,6 @@ module.exports = function (branch) {
var es = rootReq('src/elasticsearch');
var clientManager = require('./client_manager');
var argv = require('./argv');
var branchSuffix = utils.branchSuffix(branch);
describe('integration', function () {
this.timeout(30000);
@ -30,7 +29,7 @@ module.exports = function (branch) {
}, done);
});
var files = _.map(require('./yaml_tests' + branchSuffix + '.json'), function (docs, filename) {
var files = _.map(require('./yaml_tests_' + _.snakeCase(branch) + '.json'), function (docs, filename) {
return new YamlFile(filename, docs);
});