Updated NPM and dependencies

vfarcic · May 19, 2017 · 5c9e646 · 5c9e646
1 parent d8097a9
commit 5c9e646
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile.test b/Dockerfile.test
@@ -9,7 +9,7 @@ RUN apt-get update
 RUN apt-get -y install curl
 
 # Dependencies
-RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
 RUN echo "deb http://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
 RUN curl -sL https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list

diff --git a/client/bower.json b/client/bower.json
@@ -13,6 +13,7 @@
     "test-fixture": "PolymerElements/test-fixture#^1.0.0"
   },
   "resolutions": {
+    "test-fixture": "^3.0.0",
     "polymer": "^1.0.0",
     "webcomponentsjs": "^0.7.15",
     "iron-ajax": "^1.0.0",
@@ -70,4 +71,4 @@
     "paper-toggle-button": "^1.0.0",
     "platinum-sw": "~1.0.0"
   }
-}
+}