commit d4d2eab5d200f7ae2a71f808b0d6fde3f6759698
author Lewis John McGibbney <lewis.mcgibbney@gmail.com> Tue Jan 16 19:05:07 2018 -0800
committer Lewis John McGibbney <lewis.mcgibbney@gmail.com> Tue Jan 16 19:05:07 2018 -0800
tree 570f8bff40d232ca9d474decf8ec2353467a3730
parent 08c565df0a708a4fdb17bb9db4238f7fce6408bc
parent 50b9d984f1e5264fa3fb98a7366f2a0ff37a6560

Merge branch 'CLIMATE-943' of https://github.com/MichaelArthurAnderson/climate

ocw-ui/frontend/.jshintrc

diff --git a/ocw-ui/frontend/.jshintrc b/ocw-ui/frontend/.jshintrc
index 40377ba..ea35f00 100644
--- a/ocw-ui/frontend/.jshintrc
+++ b/ocw-ui/frontend/.jshintrc
@@ -18,7 +18,9 @@
   "strict": true,
   "trailing": true,
   "smarttabs": true,
+  "varstmt": true,
   "globals": {
-    "angular": false
+    "angular": false,
+    "$": false
   }
 }

ocw-ui/frontend/package.json

diff --git a/ocw-ui/frontend/package.json b/ocw-ui/frontend/package.json
index b0133c8..d158a20 100644
--- a/ocw-ui/frontend/package.json
+++ b/ocw-ui/frontend/package.json
@@ -20,16 +20,17 @@
     "grunt-contrib-clean": "^0.5.0",
     "grunt-contrib-concat": "^0.4.0",
     "grunt-contrib-connect": "^0.7.1",
+    "serve-static": "^1.13.1",
     "grunt-contrib-copy": "^0.5.0",
     "grunt-contrib-cssmin": "^0.9.0",
     "grunt-contrib-htmlmin": "^0.3.0",
     "grunt-contrib-imagemin": "^2.0.1",
-    "grunt-contrib-jshint": "^0.10.0",
+    "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^0.4.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-filerev": "^0.2.1",
     "grunt-google-cdn": "^0.4.0",
-    "grunt-karma": "^0.8.3",
+    "grunt-karma": "^0.12.2",
     "grunt-newer": "^0.7.0",
     "grunt-ng-annotate": "^0.1.0",
     "grunt-svgmin": "^0.4.0",

ocw-ui/frontend/test/spec/services/selecteddatasetinformation.js

diff --git a/ocw-ui/frontend/test/spec/services/selecteddatasetinformation.js b/ocw-ui/frontend/test/spec/services/selecteddatasetinformation.js
index 60c1ac2..7dd4a05 100644
--- a/ocw-ui/frontend/test/spec/services/selecteddatasetinformation.js
+++ b/ocw-ui/frontend/test/spec/services/selecteddatasetinformation.js
@@ -71,12 +71,16 @@
 
   it('should provide the removeDataset function', function() {
     inject(function(selectedDatasetInformation) {
-      selectedDatasetInformation.addDataset(1);
-      selectedDatasetInformation.addDataset(2);
 
-      expect(selectedDatasetInformation.getDatasets()[0]).toEqual(1);
+      var dataset_1 = {name: 'dataset_1', shouldDisplay: false, regrid: false};
+      var dataset_2 = {name: 'dataset_2', shouldDisplay: false, regrid: false};
+
+      selectedDatasetInformation.addDataset(dataset_1);
+      selectedDatasetInformation.addDataset(dataset_2);
+
+      expect(selectedDatasetInformation.getDatasets()[0]).toEqual(dataset_1);
       selectedDatasetInformation.removeDataset(0);
-      expect(selectedDatasetInformation.getDatasets()[0]).toEqual(2);
+      expect(selectedDatasetInformation.getDatasets()[0]).toEqual(dataset_2);
     });
   });