#338 - Fix test for angular 1.5.x and officially support angular 1.5.x

Author: jtblin

bower.json

@@ -39,13 +39,13 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "1.4.x",
+    "angular": "1.x",
     "Chart.js": "~1.1.1"
   },
   "devDependencies": {
     "Chart.StackedBar.js": "~1.0.1",
     "angular-bootstrap": "~0.11.0",
-    "angular-mocks": "1.4.x",
+    "angular-mocks": "~1.x",
     "font-awesome": "~4.1.0",
     "rainbow": "~1.1.9",
     "requirejs": "~2.1.20"

examples/charts.html

@@ -78,8 +78,8 @@ <h3>Dependencies</h3>
         This repository contains a set of <strong>native AngularJS directives</strong> for Chart.js. The <strong>only required dependencies</strong> are:
       </p>
       <ul>
-        <li><a href="http://angularjs.org" target="_blank">AngularJS</a> (tested with 1.2.x, 1.3.x and 1.4.x although it probably works with older versions)</li>
-        <li><a href="http://chartjs.org" target="_blank">Chart.js</a> (requires Chart.js 1.0, tested with version 1.0.1 and 1.0.2).</li>
+        <li><a href="http://angularjs.org" target="_blank">AngularJS</a> (tested with 1.2.x, 1.3.x, 1.4.x and 1.5.x although it probably works with older versions)</li>
+        <li><a href="http://chartjs.org" target="_blank">Chart.js</a> (requires Chart.js 1.x, tested with version 1.0.1, 1.0.2 and 1.1.1).</li>
       </ul>
       <h3>Files to download</h3>
       <p>

examples/charts.template.html

@@ -78,8 +78,8 @@ <h3>Dependencies</h3>
         This repository contains a set of <strong>native AngularJS directives</strong> for Chart.js. The <strong>only required dependencies</strong> are:
       </p>
       <ul>
-        <li><a href="http://angularjs.org" target="_blank">AngularJS</a> (tested with 1.2.x, 1.3.x and 1.4.x although it probably works with older versions)</li>
-        <li><a href="http://chartjs.org" target="_blank">Chart.js</a> (requires Chart.js 1.0, tested with version 1.0.1 and 1.0.2).</li>
+        <li><a href="http://angularjs.org" target="_blank">AngularJS</a> (tested with 1.2.x, 1.3.x, 1.4.x and 1.5.x although it probably works with older versions)</li>
+        <li><a href="http://chartjs.org" target="_blank">Chart.js</a> (requires Chart.js 1.x, tested with version 1.0.1, 1.0.2 and 1.1.1).</li>
       </ul>
       <h3>Files to download</h3>
       <p>

package.json

@@ -55,7 +55,7 @@
     "webshot": "^0.18.0"
   },
   "dependencies": {
-    "angular": "^1.4.5",
+    "angular": "1.x",
     "chart.js": "^1.1.1"
   }
 }

test/test.unit.js

@@ -124,16 +124,14 @@ describe('Unit testing', function () {
         [28, 48, 40, 19, 86, 27, 90]
       ];
 
-      var mock = sandbox.mock(scope);
+      var spy = sandbox.spy(scope, '$watch');
+      $compile(markup)(scope);
+
       // cannot get a hold of the child scope as it isn't created yet
       // so cannot be more precise on expectations
       /* whummer: due to new attribute names (chart-*), only the attributes
          which are actually present in the markup will be updated via $watch (3) */
-      mock.expects('$watch').atLeast(3);
-
-      $compile(markup)(scope);
-
-      mock.verify();
+      expect(spy.calledThrice).to.be.true;
     });
 
     it('creates the chart only once', function () {