From 13725e6e897d76d5641ff603d6b47134570adc29 Mon Sep 17 00:00:00 2001 From: Henry Mollman Date: Wed, 1 Mar 2017 18:05:44 -0800 Subject: [PATCH 1/2] Change way of getting active commit and all commits --- .../branchCommitSelectorDirective.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js b/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js index f2b61fd95..12ae2a4bd 100644 --- a/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js +++ b/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js @@ -10,7 +10,9 @@ require('app') * latestCommit, */ function branchCommitSelector( + $q, errs, + fetchCommitData, promisify, github ) { @@ -30,8 +32,11 @@ function branchCommitSelector( if (branch) { $scope.fetchingCommits = true; var acv = $scope.BCSC.data.acv; - return github.branchOrPRCommits(acv) - .then($scope.BCSC.onCommitFetch) + return $q.all({branchOrPRCommits: github.branchOrPRCommits(acv), activeCommit: fetchCommitData.activeCommit(acv)}) + .then(function(commitPromises) { + $scope.BCSC.data.commit = commitPromises.activeCommit; + return $scope.BCSC.onCommitFetch(commitPromises.branchOrPRCommits); + }) .catch(errs.handler) .finally(function () { $scope.fetchingCommits = false; From 654548f325f5f1c591004da43daffc91c9000276 Mon Sep 17 00:00:00 2001 From: Henry Mollman Date: Thu, 2 Mar 2017 13:33:53 -0800 Subject: [PATCH 2/2] Fix tests --- .../branchCommitSelector/branchCommitSelectorDirective.js | 5 ++++- test/unit/directives/branchCommitSelectorDirective.unit.js | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js b/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js index 12ae2a4bd..57567a873 100644 --- a/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js +++ b/client/directives/components/lists/branchCommitSelector/branchCommitSelectorDirective.js @@ -32,7 +32,10 @@ function branchCommitSelector( if (branch) { $scope.fetchingCommits = true; var acv = $scope.BCSC.data.acv; - return $q.all({branchOrPRCommits: github.branchOrPRCommits(acv), activeCommit: fetchCommitData.activeCommit(acv)}) + return $q.all({ + branchOrPRCommits: github.branchOrPRCommits(acv), + activeCommit: fetchCommitData.activeCommit(acv) + }) .then(function(commitPromises) { $scope.BCSC.data.commit = commitPromises.activeCommit; return $scope.BCSC.onCommitFetch(commitPromises.branchOrPRCommits); diff --git a/test/unit/directives/branchCommitSelectorDirective.unit.js b/test/unit/directives/branchCommitSelectorDirective.unit.js index bb0d5ed87..4bde10db6 100644 --- a/test/unit/directives/branchCommitSelectorDirective.unit.js +++ b/test/unit/directives/branchCommitSelectorDirective.unit.js @@ -5,6 +5,7 @@ describe('branchCommitSelectorDirective'.bold.underline.blue, function () { var $scope; var $rootScope; var keypather; + var fetchCommitDataStub; var $elScope; var $controller; var $q; @@ -40,6 +41,12 @@ describe('branchCommitSelectorDirective'.bold.underline.blue, function () { link: angular.noop }; }); + $provide.factory('fetchCommitData', function ($q) { + fetchCommitDataStub = { + activeCommit: sinon.stub().returns($q.when(true)) + } + return fetchCommitDataStub; + }); $provide.factory('github', function ($q) { ctx.github = { branchOrPRCommits: sinon.stub().returns($q.when(ctx.commits))