Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,19 @@ app.controller('ServiceDetailFeatureProposalListController', function ($controll
}, 500);
});

if (!$scope.isAnonymous()) {
UserRepo.getUser().then(function (res) {
var apiRes = angular.fromJson(res.body);
if (apiRes.meta.status === 'SUCCESS') {
$scope.user = apiRes.payload.User;
$scope.hasVoted = function (fp) {
return fp.voters.map(function(v) { return v.id; }).indexOf($scope.user.id) >= 0;
};
}
});
}
UserRepo.ready().then(function () {
if (!$scope.isAnonymous()) {
UserRepo.getUser().then(function (res) {
var apiRes = angular.fromJson(res.body);
if (apiRes.meta.status === 'SUCCESS') {
$scope.user = apiRes.payload.User;
$scope.hasVoted = function (fp) {
return fp.voters.map(function(v) { return v.id; }).indexOf($scope.user.id) >= 0;
};
}
});
}
});

$scope.isVotingOpen = function (featureProposal) {
return !$scope.isAnonymous() && featureProposal.state === FeatureProposalState.ACTIVE.value;
Expand All @@ -58,4 +60,4 @@ app.controller('ServiceDetailFeatureProposalListController', function ($controll
});
};

});
});
12 changes: 7 additions & 5 deletions app/repo/userRepo.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
app.repo("UserRepo", function UserRepo(WsApi) {

this.getUser = function () {
return WsApi.fetch(this.mapping.getUser);
};
var userRepo = this;

return this;
userRepo.getUser = function () {
return WsApi.fetch(this.mapping.getUser);
};

});
return userRepo;

});
4 changes: 4 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ module.exports = function (config) {

'app/repo/**/*.js',

'app/views/**/*.html',

'tests/core/**/*.js',

'tests/mocks/**/*.js',

'tests/unit/**/*.js'
Expand Down
112 changes: 112 additions & 0 deletions tests/core/mocks/mockAbstractCoreModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
var mockModel = function (modelName, $q, mockDataObj) {
var model = {};
var shadow = {};
var combinationOperation = "";

model.isDirty = false;
model.isValid = false;

model.mock = function (toMock) {
if (typeof toMock === "object") {
var keys = Object.keys(toMock);
for (var i in keys) {
model[keys[i]] = toMock[keys[i]];
}
} else if (toMock === undefined || toMock === null) {
model = null;
}
};

model.mockShadow = function (toMock) {
shadow = toMock;
};

model.acceptPendingUpdate = function () {
};

model.acceptPendingDelete = function () {
};

model.before = function () {
};

model.clearListens = function () {
var payload = {};
return payloadPromise($q.defer(), payload);
};

model.clearValidationResults = function () {
};

model.delete = function () {
return payloadPromise($q.defer(), true);
};

model.dirty = function (boolean) {
if (boolean !== undefined) {
model.isDirty = boolean;
}

return model.isDirty;
};

model.enableMergeCombinationOperation = function () {
combinationOperation = "merge";
};

model.enableExtendCombinationOperation = function () {
combinationOperation = "extend";
};

model.fetch = function () {
return payloadPromise($q.defer(), mockDataObj);
};

model.getCombinationOperation = function () {
return combinationOperation;
};

model.getEntityName = function () {
return modelName;
};

model.getValidations = function () {
return null;
};

model.init = function (data, apiMapping) {
};

model.listen = function () {
};

model.ready = function () {
var defer = $q.defer();
defer.resolve();
return defer.promise;
};

model.refresh = function () {
angular.extend(model, shadow);
};

model.reload = function () {
var defer = $q.defer();
defer.resolve(model);
return defer.promise;
};

model.save = function () {
return payloadPromise($q.defer(), true);
};

model._syncShadow = function () {
model.isDirty = false;
shadow = angular.copy(model);
};

model.mock(mockDataObj);
model._syncShadow();

return model;
};
Loading