Merge branch 'master' into renovate/babel-eslint-8.x

jsGiven · Jan 12, 2018 · c955723 · c955723
2 parents cb7fb5b + 8c67f9c
commit c955723
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/js-given/.protractor.conf.js b/js-given/.protractor.conf.js
@@ -2,7 +2,7 @@ exports.config = {
     capabilities: {
         browserName: 'chrome',
         chromeOptions: {
-            args: ['--test-type']
+            args: ['--test-type', '--no-sandbox']
         }
     },
     specs: ['spec/**.spec.js'],

diff --git a/js-given/package.json b/js-given/package.json
@@ -86,7 +86,7 @@
     "mocha": "4.1.0",
     "nodegit": "0.20.3",
     "protractor": "5.2.2",
-    "rollup": "0.53.3",
+    "rollup": "0.54.0",
     "rollup-plugin-babel": "3.0.3",
     "rollup-plugin-uglify": "2.0.1",
     "sinon": "4.1.4",

diff --git a/js-given/yarn.lock b/js-given/yarn.lock
@@ -4682,9 +4682,9 @@ rollup-pluginutils@^1.5.0:
     estree-walker "^0.2.1"
     minimatch "^3.0.2"
 
-rollup@0.53.3:
-  version "0.53.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.53.3.tgz#e7b6777623df912bd0ca30dc24be791d6ebc8e5a"
+rollup@0.54.0:
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.54.0.tgz#0641b8154ba02706464285d2ead924c486b48ba9"
 
 run-async@^2.2.0:
   version "2.3.0"