fix(benchpress): update benchpress dependencies and config

Closes ReactiveX#348
jeffbcross · Oct 3, 2015 · 9b4cecc · 9b4cecc
1 parent 954a873
commit 9b4cecc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "babel": "^5.8.23",
     "babelify": "^6.1.2",
     "benchmark": "^1.0.0",
-    "benchpress": "^2.0.0-alpha.25",
+    "benchpress": "2.0.0-alpha.37.2",
     "browserify": "^11.0.0",
     "colors": "^1.1.2",
     "esdoc": "^0.2.5",
@@ -71,7 +71,7 @@
     "lodash": "^3.5.0",
     "platform": "^1.3.0",
     "promise": "^7.0.3",
-    "protractor": "^1.7.0",
+    "protractor": "2.2.0",
     "rx": "^3.0.0",
     "typescript": "^1.7.0-dev.20150901",
     "uglifyjs": "^2.4.10"

diff --git a/protractor.conf.js b/protractor.conf.js
@@ -9,11 +9,12 @@ exports.config = {
       //Important for benchpress to get timeline data from the browser
       'args': ['--js-flags=--expose-gc'],
       'perfLoggingPrefs': {
-        'traceCategories': 'blink.console,disabled-by-default-devtools.timeline'
+        'traceCategories': 'v8,blink.console,disabled-by-default-devtools.timeline'
       }
     },
     loggingPrefs: {
-      performance: 'ALL'
+      performance: 'ALL',
+      browser: 'ALL'
     }
   },