Repository: climate Updated Branches: refs/heads/master 1373563d2 -> 08c565df0
CLIMATE-944 Grunt Errors and Karma Errors Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/48057f6f Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/48057f6f Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/48057f6f Branch: refs/heads/master Commit: 48057f6fc52970e14e03e6a3ddd1a662f6734737 Parents: 4cf79f3 Author: Michael Anderson <michaelanderson@Michaels-iMac.local> Authored: Sat Jan 6 13:58:02 2018 -0500 Committer: Michael Anderson <michaelanderson@Michaels-iMac.local> Committed: Sat Jan 6 13:58:02 2018 -0500 ---------------------------------------------------------------------- ocw-ui/frontend/.jshintrc | 4 +++- ocw-ui/frontend/package.json | 20 +++++++++++--------- .../spec/services/selecteddatasetinformation.js | 12 ++++++++---- 3 files changed, 22 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/48057f6f/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 } } http://git-wip-us.apache.org/repos/asf/climate/blob/48057f6f/ocw-ui/frontend/package.json ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/package.json b/ocw-ui/frontend/package.json index 8024f17..7672978 100644 --- a/ocw-ui/frontend/package.json +++ b/ocw-ui/frontend/package.json @@ -2,12 +2,12 @@ "name": "ocwui", "version": "1.2.0", "description": "A tool for the evaluation and analysis of climate models.", - "repository": { - "type" : "git", - "url" : "https://git-wip-us.apache.org/repos/asf/climate.git"; + "repository": { + "type": "git", + "url": "https://git-wip-us.apache.org/repos/asf/climate.git"; }, "license": "Apache-2.0", - "readme":"README.md", + "readme": "README.md", "dependencies": {}, "devDependencies": { "bower": "^1.3.9", @@ -20,25 +20,27 @@ "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": "^0.7.0", - "grunt-contrib-jshint": "^0.10.0", + "grunt-contrib-imagemin": "^2.0.1", + "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", "grunt-usemin": "^2.1.1", "grunt-wiredep": "^1.8.0", "jshint-stylish": "^0.2.0", - "karma": "^0.12.17", + "karma": "^1.6.0", "karma-jasmine": "^0.1.5", - "karma-phantomjs-launcher": "^0.1.4", + "karma-phantomjs-launcher": "^1.0.4", + "karma-chrome-launcher": "^2.2.0", "load-grunt-tasks": "^0.4.0", "time-grunt": "^0.3.1", "yo": "^1.2.1" http://git-wip-us.apache.org/repos/asf/climate/blob/48057f6f/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 @@ describe('Service: selectedDatasetInformation', function () { 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); }); });
