updated integration suite to pull rest-api-spec from elasticsearch repo

scripts/generate/js_api.js

@@ -28,7 +28,7 @@ module.exports = function (done) {
   ], done);
 
   function readSpecFiles(done) {
-    var apiDir = '../../src/rest-api-spec/api/';
+    var apiDir = '../../src/elasticsearch/rest-api-spec/api/';
     files = fs.readdirSync(apiDir).map(function (filename) {
       return require(apiDir + filename);
     });

scripts/generate/yaml_tests.js

@@ -16,7 +16,7 @@ module.exports = function (done) {
   ], done);
 
   function readYamlTests(done) {
-    var testDir = path.join(__dirname, '../../src/rest-api-spec/test/');
+    var testDir = path.join(__dirname, '../../src/elasticsearch/rest-api-spec/test/');
 
     function readDirectories(dir) {
       fs.readdirSync(dir).forEach(function (filename) {

scripts/rest_spec_updated.js

@@ -1,70 +0,0 @@
-var https = require('https');
-var request = {
-  hostname: 'api.github.com',
-  path: '/repos/elasticsearch/elasticsearch-rest-api-spec/commits/HEAD',
-  headers: {
-    'User-Agent': 'spenceralger'
-  }
-};
-var fs = require('fs');
-
-var lastRestSpecUpdateFile = __dirname + '/last_rest_spec_update.sha';
-var lastRestSpecUpdate;
-var updated;
-
-if (fs.existsSync(lastRestSpecUpdateFile)) {
-  lastRestSpecUpdate = fs.readFileSync(lastRestSpecUpdateFile, 'utf8');
-}
-
-var req = https.get(request, function (incoming) {
-  if (incoming.statusCode !== 200) {
-    req.abort();
-    console.error('request for last commit failed', incoming.statusCode, incoming.headers);
-    return;
-  }
-
-  var body = '';
-
-  incoming.on('data', onData);
-  incoming.on('end', onEnd);
-
-  function onData(chunk) {
-    body += chunk;
-  }
-
-  function onEnd() {
-    incoming.removeListener('data', onData);
-    incoming.removeListener('end', onEnd);
-    var _req = req;
-    req = null;
-
-    var resp;
-    try {
-      resp = JSON.parse(body);
-    } catch (e) {
-      console.log('unable to parse response from github');
-      _req.emit('ready');
-      return;
-    }
-
-    if (lastRestSpecUpdate === resp.sha) {
-      updated = false;
-    } else {
-      updated = true;
-      fs.writeFileSync(lastRestSpecUpdateFile, resp.sha);
-    }
-    _req.emit('ready');
-  }
-});
-
-module.exports = function (cb) {
-  function done() {
-    cb(null, updated);
-  }
-
-  if (req) {
-    req.on('ready', done);
-  } else {
-    process.nextTick(done);
-  }
-};

scripts/run_tests.js

@@ -1,144 +0,0 @@
-var async = require('async');
-var cp = require('child_process');
-var chalk = require('chalk');
-var argv = require('optimist')
-  .usage([
-    'Runner for the Elasticsearch.js unit and integration tests in both node and the browser.',
-    'To negate a flag you can use --no-{{flag}}.',
-    '',
-    'Examples:',
-    '',
-    '# Before a commit (unit tests in Node & Phantom + integration in Chrome & Firefox):',
-    'npm test --unit --integration --browsers=chrome,firefox',
-    '',
-    '# After a change in the rest-spec:',
-    'npm test --no-unit --integration --browsers=chrome,firefox --check-upstream',
-    '',
-    '# During dev (just Node unit tests):',
-    'npm test --no-browsers',
-    ''
-  ].join('\n'))
-  .options({
-    server: {
-      default: true,
-      alias: 's'
-    },
-    unit: {
-      default: false,
-      alias: 'u'
-    },
-    integration: {
-      default: false,
-      alias: 'i'
-    },
-    host: {
-      default: 'localhost',
-      description: 'hostname for elasticsearch instance used in integration tests'
-    },
-    port: {
-      default: 9200,
-      alias: 'p'
-    },
-    browsers: {
-      default: '*',
-      alias: 'b'
-    },
-    'check-upstream': {
-      default: false,
-      description: 'check for remote updates to the yaml test suite'
-    }
-  });
-
-if (process.argv.indexOf('help') + process.argv.indexOf('--help') + process.argv.indexOf('-h') !== -3) {
-  argv.showHelp();
-  process.exit(1);
-}
-
-if (process.env.npm_config_argv) {
-  // when called by NPM
-  argv = argv.parse([].concat(process.argv).concat(JSON.parse(process.env.npm_config_argv).original));
-} else {
-  // when called directly
-  argv = argv.argv;
-}
-
-var commands = [];
-var command;
-
-if (argv['check-upstream']) {
-  command = ['node', 'scripts/generate'];
-  if (argv.force) {
-    command.push('--force');
-  }
-  commands.push(command);
-}
-
-if (argv.unit) {
-  if (argv.server) {
-    commands.push(['./node_modules/.bin/mocha', 'test/unit/test_*.js', '--require should']);
-  }
-  if (argv.browsers) {
-    commands.push(['./node_modules/.bin/testling', '.']);
-  }
-}
-
-if (argv.integration) {
-  if (argv.server) {
-    commands.push([
-      './node_modules/.bin/mocha',
-      'test/integration/yaml_suite/index.js',
-      // '-b',
-      '--require', 'should',
-      '--host', argv.host,
-      '--port', argv.port
-    ].filter(Boolean));
-  }
-  if (argv.browsers) {
-    commands.push([
-      'node',
-      'scripts/run_browser_integration_suite/index.js',
-      '--browsers',
-      argv.browsers
-    ]);
-  }
-}
-
-var proc = null;
-process.on('exit', function () {
-  if (proc && proc.kill) {
-    proc.kill();
-  }
-});
-
-if (commands.length) {
-  async.forEachSeries(commands, function (args, done) {
-    var command = args.shift();
-    console.log(chalk.gray.bold('\n\n' + '# ' + command + ' ' + args.join(' ')));
-
-    proc = cp.spawn(command, args, {
-      stdio: 'inherit'
-    });
-
-    proc.on('error', function (err) {
-      proc.removeAllListeners();
-      done(err);
-    });
-
-    proc.on('exit', function (status) {
-      proc.removeAllListeners();
-      done(status ? new Error(command + ' exited with status ' + status) : void 0);
-    });
-  }, function (err) {
-    if (err) {
-      console.log(chalk.red('\n\n⚑⚑⚑︎ Error! ⚑⚑⚑'));
-      console.error(err.message);
-      process.exit(1);
-    } else {
-      console.log(chalk.green('\n\n✔︎ looks good\n\n'));
-      process.exit(0);
-    }
-  });
-} else {
-  console.log('Arguments resulted in no tests to run.');
-  console.log('Try combining test types with environments');
-}

scripts/sync_examples.js

@@ -2,7 +2,7 @@ var async = require('async');
 var fs = require('fs');
 var S = require('string');
 
-var restSpecDir = './src/rest-api-spec/api/';
+var restSpecDir = './src/elasticsearch/rest-api-spec/api/';
 
 function fileExists(path, done) {
   fs.stat(path, function (err, stats) {