Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
CLIMATE-944 Grunt Errors and Karma Errors
  • Loading branch information
Michael Anderson authored and Michael Anderson committed Jan 6, 2018
1 parent 4cf79f3 commit 48057f6fc52970e14e03e6a3ddd1a662f6734737
Showing 3 changed files with 22 additions and 14 deletions.
@@ -18,7 +18,9 @@
"strict": true,
"trailing": true,
"smarttabs": true,
"varstmt": true,
"globals": {
"angular": false
"angular": false,
"$": false
}
}
@@ -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"
@@ -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);
});
});

0 comments on commit 48057f6

Please sign in to comment.