Finishing up the lose end issues with this improvement

Fixing Tests,
Creating service for fetching instances

Author: Nathan219

client/controllers/abstractLayouts/controllerInstanceLayout.js

@@ -6,8 +6,8 @@ require('app')
 function ControllerInstanceLayout(
   configLogoutURL,
   fetchUser,
+  fetchInstances,
   $stateParams,
-  QueryAssist,
   errs,
   $rootScope,
   keypather,
@@ -27,49 +27,40 @@ function ControllerInstanceLayout(
       return errs.handler(err);
     }
     thisUser = user;
-    fetchInstances(
+    resolveInstanceFetch(
       $stateParams.userName
     );
   });
 
-  function fetchInstances(account, cb) {
-    if (!account) { return; }
-    async.series([
+  function resolveInstanceFetch(username) {
+    if (!username) { return; }
+    async.waterfall([
       function (cb) {
         $rootScope.dataApp.state.loadingInstances = true;
         $rootScope.dataApp.data.instances = null;
         $rootScope.safeApply(cb);
       },
       function (cb) {
-        new QueryAssist(thisUser, cb)
-          .wrapFunc('fetchInstances', cb)
-          .query({
-            githubUsername: account
-          })
-          .cacheFetch(function (instances, cached, cb) {
-            if (account === keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()')) {
-              if ($rootScope.dataApp.data.instances !== instances) {
-                $rootScope.dataApp.data.instances = instances;
-              }
-              $rootScope.dataApp.state.loadingInstances = false;
-              $rootScope.safeApply(cb);
-            } else {
-              cb();
-            }
-          })
-          .resolve(function (err, projects, cb) {
-            cb(err);
-          })
-          .go();
+        fetchInstances(username, true, cb);
       },
-      cb
+      function (instances, queriedUsername, cb) {
+        if (username === keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()')) {
+          if ($rootScope.dataApp.data.instances !== instances) {
+            $rootScope.dataApp.data.instances = instances;
+          }
+          $rootScope.dataApp.state.loadingInstances = false;
+          $rootScope.safeApply(cb);
+        } else {
+          cb();
+        }
+      }
     ], function (err) {
-      if (err) { throw err; }
+      if (err) { return errs.handler(err); }
     });
   }
 
   var instanceListUnwatcher = $scope.$on('INSTANCE_LIST_FETCH', function(event, username) {
-    fetchInstances(username);
+    resolveInstanceFetch(username);
   });
 
   $scope.$on('$destroy', function () {

client/controllers/instance/controllerInstanceHome.js

@@ -8,6 +8,7 @@ function ControllerInstanceHome(
   $stateParams,
   $state,
   $scope,
+  fetchInstances,
   $localStorage,
   $rootScope,
   keypather
@@ -16,15 +17,12 @@ function ControllerInstanceHome(
   var instanceName = keypather.get($localStorage, 'lastInstancePerUser.' + userName);
   if (!instanceName) {
     $scope.loading = true;
-    var unwatch = $rootScope.$watch('dataApp.data.instances', function(n) {
-      if (n) {
-        unwatch();
-        if (userName === $rootScope.dataApp.data.activeAccount.oauthName()) {
-          $scope.loading = false;
-          var models = $filter('orderBy')(n.models, 'attrs.name');
-          var name = keypather.get(n, 'models[0].attrs.name');
-          goToInstance(userName, name);
-        }
+    fetchInstances(userName, false, function(err, instances, account) {
+      if (account === $rootScope.dataApp.data.activeAccount.oauthName()) {
+        $scope.loading = false;
+        var models = $filter('orderBy')(instances.models, 'attrs.name');
+        var name = keypather.get(models, '[0].attrs.name');
+        goToInstance(userName, name);
       }
     });
   } else {

client/services/serviceFetchInstances.js

@@ -0,0 +1,23 @@
+require('app')
+  .factory('fetchInstances', fetchInstances);
+
+function fetchInstances(
+  fetchUser
+) {
+  var currentInstances;
+  var currentAccountName;
+  return function (activeAccountName, forceQuery, cb) {
+    if (activeAccountName === currentAccountName && !forceQuery) {
+      return cb(null, currentInstances, activeAccountName);
+    } else {
+      currentAccountName = activeAccountName;
+      fetchUser(function (err, user) {
+        currentInstances = user.fetchInstances({
+          githubUsername: currentAccountName
+        }, function (err) {
+          cb(err, currentInstances, activeAccountName);
+        });
+      });
+    }
+  };
+}

client/services/serviceHelperInstanceActionsModal.js

@@ -186,7 +186,7 @@ function HelperInstanceActionsModal(
           // Only change the location if we're still on the page
           // If the user switched to a different instance in between, we shouldn't move
           if ($stateParams.instanceName === deletedInstanceName) {
-            $state.go('instance.new', {
+            $state.go('instance.home', {
               userName: $stateParams.userName
             });
           }

test/unit/directives/directiveAccountsSelect.unit.js

@@ -108,8 +108,7 @@ describe('directiveAccountsSelect'.bold.underline.blue, function() {
       initState();
       ctx.stateMock.go = sinon.spy(function (location, state) {
         expect(state).to.deep.equal({
-          userName: ctx.fakeOrg1.oauthName(),
-          instanceName: ''
+          userName: ctx.fakeOrg1.oauthName()
         });
         done();
       });

test/unit/directives/directiveEditRepoCommit.unit.js

@@ -211,7 +211,7 @@ describe('directiveEditRepoCommit'.bold.underline.blue, function() {
     var $el = ctx.element[0]
       .querySelector('.commit.load > time.commit-time');
     expect($el).to.be.ok;
-    expect($el.innerText).to.equal('2 months ago');
+    expect($el.innerText).to.equal('3 months ago');
   });
 
 });

test/unit/services/serviceHelperInstanceActionsModal.unit.js

@@ -307,7 +307,7 @@ describe('serviceHelperInstanceActionsModal'.bold.underline.blue, function() {
 
           sinon.assert.called(fakeGo);
           sinon.assert.called($scope.instance.destroy);
-          sinon.assert.calledWith(fakeGo,'instance.new', {
+          sinon.assert.calledWith(fakeGo,'instance.home', {
             userName: 'username'
           });
           done();
@@ -324,9 +324,8 @@ describe('serviceHelperInstanceActionsModal'.bold.underline.blue, function() {
 
             sinon.assert.called(fakeGo);
             sinon.assert.called($scope.instance.destroy);
-            sinon.assert.calledWith(fakeGo,'instance.instance', {
-              userName: 'username',
-              instanceName: 'other'
+            sinon.assert.calledWith(fakeGo,'instance.home', {
+              userName: 'username'
             });
             done();
           });
@@ -359,9 +358,8 @@ describe('serviceHelperInstanceActionsModal'.bold.underline.blue, function() {
             setTimeout(function() {
               sinon.assert.notCalled(fakeGo);
               sinon.assert.called($scope.instance.destroy);
-              sinon.assert.neverCalledWith(fakeGo,'instance.instance', {
-                userName: 'username',
-                instanceName: 'other'
+              sinon.assert.neverCalledWith(fakeGo,'instance.home', {
+                userName: 'username'
               });
               done();
             }, 50);