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

2014-01-02 11:33:59 -07:00
parent 6c2330fd8a
commit 71a0b8f58e
13 changed files with 391 additions and 425 deletions
--- a/grunt/config/run.js
+++ b/grunt/config/run.js
@ -1,24 +1,23 @@
 module.exports = {
-  generate: {
-    exec: 'node scripts/generate'
+  options: {
+    cwd: './scripts'
  },
-  browser_unit_tests: {
-    exec: 'node scripts/run_tests --unit --no-server',
+  generate: {
+    exec: 'node generate'
+  },
+  browser_integration_tests: {
+    exec: 'node run_browser_integration_suite',
    options: {
-      cwd: '.',
      passArgs: [
-        'port',
-        'host'
+        'browsers'
      ]
    }
  },
-  browser_integration_tests: {
-    exec: 'node scripts/run_tests --integration --no-server',
+  browser_unit_tests: {
+    exec: './node_modules/.bin/testling .',
    options: {
-      cwd: '.',
      passArgs: [
-        'port',
-        'host'
+        'x'
      ]
    }
  }