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

final sweep, moved everything to _v4

Browse Source
This commit is contained in:
spalger
2016-05-19 14:23:33 -07:00
parent 4a77556866
commit ec06c51c5d
78 changed files with 542 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/utils/expect_sub_object.js
View File

@ -1,7 +1,7 @@
var _ = require('lodash-migrate');
// var _ = require('lodash');
var expect = require('expect.js');
module.exports = function expectSubObject(obj, subObj) {
_.forOwn(subObj, function (val, prop) {
_v4.forOwn(subObj, function (val, prop) {
if (typeof obj[prop] === 'object') {
// non-strict equals
expect(obj[prop]).to.eql(val, 'Expected property' + prop + ' of object to equal ' + val);

12
test/utils/jenkins-reporter.js
View File

@ -7,7 +7,7 @@
module.exports = JenkinsReporter;
var Base = require('mocha/lib/reporters/base');
var _ = require('lodash-migrate');
// var _ = require('lodash');
var chalk = require('chalk');
var makeJUnitXml = require('./make_j_unit_xml');
var fs = require('fs');
@ -15,7 +15,7 @@ var path = require('path');
var inspect = require('util').inspect;
var log = (function () {
var locked = _.bind(process.stdout.write, process.stdout);
var locked = _v4.bind(process.stdout.write, process.stdout);
return function (str) {
if (typeof str !== 'string') {
str = inspect(str);
@ -126,7 +126,7 @@ function JenkinsReporter(runner) {
errMsg += '\n(' + test.err.sourceURL + ':' + test.err.line + ')';
}
console.error(_.map(errMsg.split('\n'), function (line) {
console.error(_v4.map(errMsg.split('\n'), function (line) {
return indt() + ' ' + line;
}).join('\n'));
}
@ -146,7 +146,7 @@ function JenkinsReporter(runner) {
runner.on('hook end', function (hook) {
if (hook.title.indexOf('"after each"') > -1 && stack[0] && stack[0].results.length) {
var result = _.last(stack[0].results);
var result = _v4.last(stack[0].results);
result.stdout += stack[0].stdout;
result.stderr += stack[0].stderr;
stack[0].stdout = stack[0].stderr = '';
@ -157,7 +157,7 @@ function JenkinsReporter(runner) {
restoreStdio();
var xml = makeJUnitXml('node ' + process.version, {
stats: stats,
suites: _.map(rootSuite.suites, function removeElements(suite) {
suites: _v4.map(rootSuite.suites, function removeElements(suite) {
var s = {
name: suite.name,
start: suite.start,
@ -168,7 +168,7 @@ function JenkinsReporter(runner) {
};
if (suite.suites) {
s.suites = _.map(suite.suites, removeElements);
s.suites = _v4.map(suite.suites, removeElements);
}
return s;
})

4
test/utils/make_j_unit_xml.js
View File

@ -28,7 +28,7 @@ var testXml = require('xmlbuilder');
var suites = testXml.create('testsuites');
var suiteCount = 0;
var moment = require('moment');
var _ = require('lodash-migrate');
// var _ = require('lodash');
var chalk = require('chalk');
function makeJUnitXml(runnerName, testDetails) {
@ -41,7 +41,7 @@ function makeJUnitXml(runnerName, testDetails) {
timestamp: moment(suiteInfo.start).toJSON(),
hostname: 'localhost',
tests: (suiteInfo.results && suiteInfo.results.length) || 0,
failures: _.where(suiteInfo.results, { pass: false }).length,
failures: _v4.filter(suiteInfo.results, { pass: false }).length,
errors: 0,
time: suiteInfo.time / 1000
});

4
test/utils/server.js
View File

@ -2,7 +2,7 @@
var express = require('express');
var http = require('http');
var fs = require('fs');
var _ = require('lodash-migrate');
// var _ = require('lodash');
var async = require('async');
var root = require('path').join(__dirname, '../..');
var browserify = require('browserify');
@ -12,7 +12,7 @@ var browserBuildsDir = root + '/test/unit/browser_builds';
var testFiles = {};
testFiles.unit = _(fs.readdirSync(unitSpecDir))
testFiles.unit = _v4(fs.readdirSync(unitSpecDir))
.difference([
'file_logger.js',
'http_connector.js',