adding unit testing

totorean · totorean · commit 8d3d3582db8f · 2017-03-12T15:48:03.000+02:00
diff --git a/app.js b/app.js
@@ -4,8 +4,8 @@
 var darkskyForecast = angular.module('darkskyForecast', [
   'ngRoute',
   'Components',
-  'service.forecastProvider',
-  'service.coordProvider',
+  'service.forecastService',
+  'service.coordService',
   'darkskyForecast.main',
   'darkskyForecast.forecast',
 ])
diff --git a/app/forecast/forecast.css b/app/forecast/forecast.css
@@ -7,7 +7,6 @@
 }
 
 .forecast-view p {
-    color: #222222;
     text-align: center;
     font-weight: bold;
     display: inline-block;
diff --git a/app/main/locations.json b/app/main/locations.json
@@ -0,0 +1,30 @@
+{
+    "locations": [{
+            "tooltip": "Timisoara",
+            "label": "Timisoara",
+            "icon": "timisoara",
+            "id": "timisoara"
+		}, {
+            "tooltip": "Cluj-Napoca",
+            "label": "Cluj-Napoca",
+            "icon": "cluj-napoca",
+            "id": "cluj"
+		}, {
+            "tooltip": "Iasi",
+            "label": "Iasi",
+            "icon": "iasi",
+            "id": "iasi"
+		}, {
+            "tooltip": "Bucuresti",
+            "label": "Bucuresti",
+            "icon": "bucuresti",
+            "id": "bucuresti"
+		}, {
+            "tooltip": "Constanta",
+            "label": "Constanta",
+            "icon": "constanta",
+            "id": "constanta"
+		}
+
+	]
+}
diff --git a/app/main/locationsService.js b/app/main/locationsService.js
@@ -0,0 +1,18 @@
+'use strict';
+
+angular.module('darkskyForecast.main')
+    .service('locationsService', function ($q, $http) {
+        this.getLocations = function () {
+            var deferred = $q.defer();
+
+            $http.get('app/main/locations.json')
+                .then(function (data) {
+                    deferred.resolve(data.data.locations);
+                })
+                .catch(function (data) {
+                    deferred.reject(data);
+                });
+
+            return deferred.promise;
+        }
+    });
diff --git a/app/main/main.js b/app/main/main.js
@@ -9,60 +9,31 @@ angular.module('darkskyForecast.main', ['ngRoute'])
     });
 }])
 
-.controller('MainCtrl', ['$scope', '$location', 'coordProvider', 'forecastProvider',
-    function Main($scope, $location, coordProvider, forecastProvider) {
-        $scope.icon = "rain";
-        $scope.locations = [
-            {
-                tooltip: 'Timisoara',
-                label: 'Timisoara',
-                icon: 'timisoara',
-                id: 'timisoara'
-            },
-            {
-                tooltip: 'Cluj-Napoca',
-                label: 'Cluj-Napoca',
-                icon: 'cluj-napoca',
-                id: 'cluj'
-            },
-            {
-                tooltip: 'Iasi',
-                label: 'Iasi',
-                icon: 'iasi',
-                id: 'iasi'
-            },
-            {
-                tooltip: 'Bucuresti',
-                label: 'Bucuresti',
-                icon: 'bucuresti',
-                id: 'bucuresti'
-            },
-            {
-                tooltip: 'Constanta',
-                label: 'Constanta',
-                icon: 'constanta',
-                id: 'constanta'
-            }
-
-        ];
+.controller('MainCtrl', ['$scope', '$location', 'coordService', 'forecastService', 'locationsService',
+    function Main($scope, $location, coordProvider, forecastProvider, locationsProvider) {
+        $scope.locations = [];
+        locationsProvider.getLocations()
+            .then(function (locations) {
+                $scope.locations = locations;
+            })
 
         $scope.displayWeather = function (index) {
             var locationDetails = $scope.locations[index];
             var location = locationDetails.id;
             var savedLoc = localStorage.getItem(location);
+
             if (!savedLoc) { //non existent location in storage
                 coordProvider.getCoords(location)
                     .then(function (coords) {
                         localStorage.setItem(location, JSON.stringify({
-                            label: locationDetails.label,
                             coords: coords
                         }));
                         return forecastProvider.getWeather(coords);
                     })
                     .then(function (weather) {
                         var loc = JSON.parse(localStorage.getItem(location));
                         localStorage.setItem(location, JSON.stringify({
-                            label: loc.label,
+                            label: locationDetails.label,
                             coords: loc.coords,
                             timestamp: Date.now(),
                             temperature: weather.temperature,
@@ -72,11 +43,9 @@ angular.module('darkskyForecast.main', ['ngRoute'])
                     });
             } else {
                 var loc = JSON.parse(savedLoc);
-                if (loc.timestamp && Math.abs(Date.now() - loc.timestamp) / 60000 < 60) {
-                    //all data available
+                if (loc.timestamp && Math.abs(Date.now() - loc.timestamp) / 60000 < 60) { //all data available
                     $location.path('/forecast/' + location);
-                } else {
-                    //refresh weather data
+                } else { //refresh only weather data
                     forecastProvider.getWeather(loc.coords)
                         .then(function (weather) {
                             localStorage.setItem(location, JSON.stringify({
diff --git a/app/services/coordinatesService.js b/app/services/coordinatesService.js
@@ -1,31 +1,31 @@
 'use strict';
-angular.module('service.coordProvider', [])
-    .factory('coordProvider', function ($q, $http, GOOGLE_API) {
-        return {
-            getCoords: function (location) {
-                var deferred = $q.defer();
 
-                $http({
+angular.module('service.coordService', [])
+    .service('coordService', function ($q, $http, GOOGLE_API) {
+        this.getCoords = function (location) {
+            var deferred = $q.defer();
+
+            $http({
                     method: 'GET',
                     timeout: 300000,
                     url: GOOGLE_API.URL,
                     params: {
                         'address': location,
                         'key': GOOGLE_API.KEY
                     }
-                }).then(function successCallback(data) {
+                })
+                .then(function (data) {
                     if (parseInt(data.status) === 200) {
                         deferred.resolve(data.data.results[0].geometry.location);
                     } else {
                         deferred.reject(data.status);
                     }
 
-                }, function errorCallback(data) {
+                })
+                .catch(function (data) {
                     deferred.reject(data.error_message);
                 });
 
-                //return a promise that needs to be resolved before data can be used
-                return deferred.promise;
-            }
+            return deferred.promise;
         }
     });
diff --git a/app/services/forecastProvider.js b/app/services/forecastProvider.js
diff --git a/app/services/forecastService.js b/app/services/forecastService.js
@@ -0,0 +1,50 @@
+'use strict';
+
+angular.module('service.forecastService', [])
+    .service('forecastService', function ($q, $http, $sce, DARKSKY_API) {
+
+        this.getWeather = function (coords) {
+            var deferred = $q.defer();
+
+            var url = [DARKSKY_API.URL, DARKSKY_API.KEY, '/', coords.lat, ',', coords.lng, '?exclude=hourly,daily,flags'].join('');
+            /*$http({
+                    method: 'GET',
+                    timeout: 300000,
+                    url: url
+                })
+                .then(function (data) {
+                    // check response code
+                    if (parseInt(data.status) === 200) {
+                        deferred.resolve(data.data.currently);
+                    } else {
+                        deferred.reject(data.status);
+                    }
+                })
+                .catch(function (data) {
+                    deferred.reject(data.message);
+                });*/
+
+            setTimeout(function () {
+                deferred.resolve({
+                    apparentTemperature: 41.42,
+                    cloudCover: 0.3,
+                    dewPoint: 34.35,
+                    humidity: 0.68,
+                    icon: "partly-cloudy-night",
+                    ozone: 390.56,
+                    precipIntensity: 0,
+                    precipProbability: 0,
+                    pressure: 1016.39,
+                    summary: "Partly Cloudy",
+                    temperature: 44.18,
+                    time: 1489252719,
+                    visibility: 6.21,
+                    windBearing: 325,
+                    windSpeed: 4.95
+                });
+            }, 700);
+
+            //return a promise that needs to be resolved before data can be used
+            return deferred.promise;
+        }
+    });
diff --git a/index.html b/index.html
@@ -19,26 +19,26 @@
     <script src="node_modules/angular/angular.js"></script>
     <script src="node_modules/angular-route/angular-route.js"></script>
     <script src="node_modules/skycons/skycons.js"></script>
+</head>
+
+<body>
+    <div ng-view></div>
 
     <!--    Components     -->
     <script src="app/components/Components.js"></script>
     <script src="app/components/location/locationDirective.js"></script>
     <script src="app/components/skycon/skyconDirective.js"></script>
 
     <!--    Services     -->
-    <script src="app/services/Services.js"></script>
-    <script src="app/services/coordinatesProvider.js"></script>
-    <script src="app/services/forecastProvider.js"></script>
+    <script src="app/services/coordinatesService.js"></script>
+    <script src="app/services/forecastService.js"></script>
 
     <script src="app.js"></script>
     <script src="app/main/main.js"></script>
+    <script src="app/main/locationsService.js"></script>
     <script src="app/forecast/forecast.js"></script>
+</body>
 
 
-</head>
-
-<body>
-    <div ng-view></div>
-</body>
 
 </html>
diff --git a/karma.conf.js b/karma.conf.js
diff --git a/package.json b/package.json
diff --git a/test/main/locationsService.spec.js b/test/main/locationsService.spec.js

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`.forecast-view p {`
`10`		`- color: #222222;`
`11`	`10`	`text-align: center;`
`12`	`11`	`font-weight: bold;`
`13`	`12`	`display: inline-block;`