Merge branch 'hotfix/update-deps'

gazal-k · Feb 27, 2015 · ca211e4 · ca211e4
2 parents b61dc54 + 20fbb28
commit ca211e4
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 96 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "grunt-contrib-concat": "~0.5.0",
     "grunt-contrib-connect": "~0.9.0",
     "grunt-contrib-copy": "~0.7.0",
-    "grunt-contrib-jasmine": "~0.8.1",
+    "grunt-contrib-jasmine": "~0.8.2",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-uglify": "~0.7.0",
     "grunt-contrib-watch": "~0.6.1",

diff --git a/spec/bar-chart-spec.js b/spec/bar-chart-spec.js
@@ -958,7 +958,9 @@ describe('dc.barChart', function() {
 
             it("should not round the brush", function () {
                 jasmine.clock().tick(100);
-                expect(chart.filter()).toEqual([makeDate(2012, 6, 1), makeDate(2012, 7, 15)]);
+                var filter = chart.filter();
+                delete filter.isFiltered;
+                expect(filter).toEqual([makeDate(2012, 6, 1), makeDate(2012, 7, 15)]);
             });
         });
 

diff --git a/spec/coordinate-grid-chart-spec.js b/spec/coordinate-grid-chart-spec.js
@@ -711,7 +711,9 @@ describe('dc.coordinateGridChart', function() {
                 });
 
                 it("should update chart filter to match new x domain", function () {
-                    expect(chart.filter()).toEqual(chart.x().domain());
+                    var filter = chart.filter();
+                    delete filter.isFiltered;
+                    expect(filter).toEqual(chart.x().domain());
                 });
 
                 it("should be rescaled", function () {
@@ -822,7 +824,10 @@ describe('dc.coordinateGridChart', function() {
             rangeChart.brush().extent(selectedRange);
             rangeChart.brush().event(rangeChart.g());
             jasmine.clock().tick(100);
-            expect(chart.focus).toHaveBeenCalledWith(selectedRange);
+            // expect(chart.focus).toHaveBeenCalledWith(selectedRange);
+            var focus = chart.focus.calls.argsFor(0)[0];
+            delete focus.isFiltered;
+            expect(focus).toEqual(selectedRange);
         });
 
         it("should zoom the focus chart back out when range chart is un-brushed", function () {
@@ -839,7 +844,10 @@ describe('dc.coordinateGridChart', function() {
         it("should update the range chart brush to match zoomed domain of focus chart", function () {
             spyOn(rangeChart, "replaceFilter");
             chart.focus(selectedRange);
-            expect(rangeChart.replaceFilter).toHaveBeenCalledWith(selectedRange);
+            // expect(rangeChart.replaceFilter).toHaveBeenCalledWith(selectedRange);
+            var replaceFilter = rangeChart.replaceFilter.calls.argsFor(0)[0];
+            delete replaceFilter.isFiltered;
+            expect(replaceFilter).toEqual(selectedRange);
         });
     });