added browser tests, modified ci script, removed testing for version 0.90.x

2014-01-10 11:23:08 -07:00
parent 3490479eee
commit 3223fb4a6d
20 changed files with 194 additions and 91 deletions
--- a/grunt/config/run.js
+++ b/grunt/config/run.js
@ -17,20 +17,11 @@ module.exports = {
      ]
    }
  },
-  browser_integration_tests: {
-    exec: 'node ./scripts/run_browser_integration_suite',
+  browser_test_server: {
+    exec: 'node ./test/utils/server',
    options: {
-      passArgs: [
-        'browsers'
-      ]
-    }
-  },
-  browser_unit_tests: {
-    exec: './node_modules/.bin/testling .',
-    options: {
-      passArgs: [
-        'x'
-      ]
+      wait: false,
+      ready: /listening/
    }
  }
 };