diff --git a/.gitignore b/.gitignore index d106a75394..562529c429 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ node_modules npm-debug.log template/**/*.js + +bower_components diff --git a/.travis.yml b/.travis.yml index 1f6c981aca..851918c22e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,18 @@ - language: node_js - node_js: - - "0.10" +language: node_js +node_js: + - "0.10" - before_script: +env: + matrix: + - ANGULAR='1.2.[0-9]*$' + - ANGULAR='1.3.0-beta.[0-9]*$' +before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - - npm install --quiet -g grunt-cli karma + - npm install --quiet -g grunt-cli karma bower - npm install + - export ANGULAR_VER=`bower info angular | grep "^ - $ANGULAR" | awk '{print $2}' | head -n 1` + - echo "Angular version $ANGULAR_VER" + - bower install angular#$ANGULAR_VER angular-mocks#$ANGULAR_VER - script: grunt \ No newline at end of file +script: grunt diff --git a/karma.conf.js b/karma.conf.js index ed3d462618..56c25251fe 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -7,8 +7,8 @@ files = [ JASMINE, JASMINE_ADAPTER, 'misc/test-lib/jquery-1.8.2.min.js', - 'misc/test-lib/angular.js', - 'misc/test-lib/angular-mocks.js', + 'bower_components/angular/angular.js', + 'bower_components/angular-mocks/angular-mocks.js', 'misc/test-lib/helpers.js', 'src/**/*.js', 'template/**/*.js'