fix(travis): npm install when fetching ui-router-core from github. us…

…e es5 in karma.conf.js
rpandey · Oct 22, 2016 · 10fb103 · 10fb103
1 parent ff6d13b
commit 10fb103
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - npm install -g karma
   - npm install -g typescript
+  - npm install -g yarn
   - ./nodeserver.sh > /dev/null &
 
 matrix:
@@ -27,7 +28,7 @@ script:
   - echo "CORE_BRANCH = x${CORE_BRANCH}x";
   - >
     if [ "x${CORE_BRANCH}x" != "xx" ] ; then 
-      git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git ui-router-core && npm install ./ui-router-core ;
+      git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git ui-router-core && pushd ui-router-core && yarn && popd && npm install ./ui-router-core ;
     fi
   - npm test
 

diff --git a/karma.conf.js b/karma.conf.js
@@ -23,15 +23,15 @@ function karmaServedFiles(ngVersion) {
     ];
   }
 
-  let angularFiles = angular(ngVersion).map(function (pattern) {
+  var angularFiles = angular(ngVersion).map(function (pattern) {
     return { watched: false, included: true, nocache: true, pattern: pattern };
   });
 
-  let srcFiles = [
+  var srcFiles = [
     { watched: true, included: false, nocache: true, pattern: 'src/**/*.ts' },
   ];
 
-  let testFiles = [
+  var testFiles = [
     { watched: true, included: false, nocache: true, pattern: 'test/**/*.ts' },
     { watched: true, included: false, nocache: true, pattern: 'test/**/*.js' }
   ];