fix test expecting TZ

HariPrasath7 · Aug 26, 2015 · a63ce7f · a63ce7f
1 parent c2f563c
commit a63ce7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...pts/modules/serverGroups/configure/gce/serverGroupLoadBalancersSelector.directive.spec.js b/...pts/modules/serverGroups/configure/gce/serverGroupLoadBalancersSelector.directive.spec.js
@@ -27,8 +27,8 @@ describe('Directive: GCE Load Balancers Selector', function() {
     _infrastructureCaches_.loadBalancers = {
       getStats: function() {return {ageMax: t}}
     };
-    var m = _momentService_(t);
-    expectedTime = m.format('YYYY-MM-DD HH:mm:ss');
+    var m = _momentService_.tz(t, 'America/Los_Angeles');
+    expectedTime = m.format('YYYY-MM-DD HH:mm:ss z');
 
     selector = angular.element('<gce-server-group-load-balancers-selector command="command" />');
   }));

diff --git a/karma.conf.js b/karma.conf.js
@@ -57,6 +57,10 @@ module.exports = function(config) {
             test: /\.html$/,
             loader: 'ngtemplate?relativeTo=' + __dirname + '/!html'
           },
+          {
+            test: /\.json$/,
+            loader: 'json-loader'
+          },
         ],
         postLoaders: [
           {