habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated grunt-run, tests now support skip.features and match:/regex/

Browse Source
This commit is contained in:
Spencer Alger
2014-02-03 09:55:45 -07:00
parent 88b86817a4
commit f7f98572a3
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/integration/yaml_suite/yaml_doc.js
View File

@ -260,6 +260,9 @@ YamlDoc.prototype = {
* @param done
*/
do_skip: function (args, done) {
if (!args.version) {
return done();
}
rangeMatchesCurrentVersion(args.version, _.bind(function (match) {
if (match) {
if (this.description === 'setup') {
@ -416,10 +419,18 @@ YamlDoc.prototype = {
*/
do_match: function (args) {
_.forOwn(args, function (val, path) {
if (val[0] === '$') {
val = this.get(val);
var isRef = _.isString(val) && val[0] === '$';
var isRE = _.isString(val) && val[0] === '/' && path[path.length - 1] === '/';
if (isRef) {
val = this.get(val === '$body' ? '' : val);
} else if (isRE) {
val = new RegExp(val);
} else {
val = this.get(path);
}
expect(this.get(path)).to.eql(val, 'path: ' + path);
var assert = expect(val).to[isRE ? 'match' : 'eql'](val, 'path: ' + path);
}, this);
},