From 6eacd065bfd468c6134a6b76a365bac6173f1081 Mon Sep 17 00:00:00 2001
From: Paul Jolly <paul@myitcv.org.uk>
Date: Thu, 10 Jul 2014 18:35:44 +0100
Subject: [PATCH 1/2] chore(build): make travis test against latest 1.3 branch
 too

---
 .gitignore    |  2 ++
 .travis.yml   | 19 +++++++++++++------
 karma.conf.js |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

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..29ee0e0df4 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.3.0-build.[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'

From 0be212735f0e1b7ba4e9c8241cc758fd932de295 Mon Sep 17 00:00:00 2001
From: Paul Jolly <paul@myitcv.org.uk>
Date: Thu, 10 Jul 2014 18:39:20 +0100
Subject: [PATCH 2/2] chore(build): make travis test against latest 1.3 branch
 too

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 29ee0e0df4..851918c22e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ node_js:
 
 env:
   matrix:
-    - ANGULAR='1.3.0-build.[0-9]*$'
+    - ANGULAR='1.2.[0-9]*$'
     - ANGULAR='1.3.0-beta.[0-9]*$'
 before_script:
   - export DISPLAY=:99.0