krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

authCtrl tests now working, replaced window for $window

Browse Source
This commit is contained in:
Dušan Juretić
2013-10-01 23:20:10 -03:00
parent 43be09a5d5
commit 89b4d2ece0
5 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
karma.conf.js
View File

@@ -7,15 +7,18 @@ module.exports = function(config) {
basePath: '',
// testing framework to use (jasmine/mocha/qunit/...)
frameworks: ['mocha'],
frameworks: ['mocha', 'chai', 'chai-as-promised', 'sinon-chai'],
// list of files / patterns to load in the browser
files: [
'public/bower_components/angular/angular.js',
'public/bower_components/angular-mocks/angular-mocks.js',
'public/bower_components/marked/lib/marked.js',
'public/bower_components/habitrpg-shared/dist/habitrpg-shared.js',
'public/js/*.js',
'public/js/**/*.js',
'test/mock/**/*.js',
'test/spec/*.js',
'test/spec/**/*.js'
],

1
package.json
View File

@@ -71,6 +71,7 @@
"karma-phantomjs-launcher": "~0.1.0",
"karma": "~0.10.2",
"karma-ng-html2js-preprocessor": "~0.1.0",
"karma-chai-plugins": "~0.1.0",
"mocha": "~1.12.1",
"karma-mocha": "~0.1.0"
}

18
public/js/controllers/authCtrl.js
View File

@@ -4,8 +4,8 @@
The authentication controller (login & facebook)
*/
habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', 'API_URL',
function($scope, $rootScope, User, $http, $location, API_URL) {
habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','API_URL',
function($scope, $rootScope, User, $http, $location, $window, API_URL) {
var runAuth;
var showedFacebookMessage;
@@ -25,7 +25,7 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$loca
runAuth = function(id, token) {
User.authenticate(id, token, function(err) {
window.location.href = '/';
$window.location.href = '/';
//$rootScope.modals.login = false;
});
};
@@ -41,22 +41,22 @@ habitrpg.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$loca
runAuth(data.id, data.apiToken);
}).error(function(data, status, headers, config) {
if (status === 0) {
alert("Server not currently reachable, try again later");
$window.alert("Server not currently reachable, try again later");
} else if (!!data && !!data.err) {
alert(data.err);
$window.alert(data.err);
} else {
alert("ERROR: " + status);
$window.alert("ERROR: " + status);
}
});
};
function errorAlert(data, status, headers, config) {
if (status === 0) {
alert("Server not currently reachable, try again later");
$window.alert("Server not currently reachable, try again later");
} else if (!!data && !!data.err) {
alert(data.err);
$window.alert(data.err);
} else {
alert("ERROR: " + status);
$window.alert("ERROR: " + status);
}
}

16
public/js/services/userServices.js
View File

@@ -5,8 +5,8 @@
*/
angular.module('userServices', []).
factory('User', ['$rootScope', '$http', '$location', 'API_URL', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID',
function($rootScope, $http, $location, API_URL, STORAGE_USER_ID, STORAGE_SETTINGS_ID) {
factory('User', ['$rootScope', '$http', '$location', '$window', 'API_URL', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID',
function($rootScope, $http, $location, $window, API_URL, STORAGE_USER_ID, STORAGE_SETTINGS_ID) {
var authenticated = false,
defaultSettings = {
auth: { apiId: '', apiToken: ''},
@@ -150,7 +150,7 @@ angular.module('userServices', []).
*/
set: function(k, v) {
var log = { op: 'set', data: {} };
window.habitrpgShared.helpers.dotSet(k, v, this.user);
$window.habitrpgShared.helpers.dotSet(k, v, this.user);
log.data[k] = v;
userServices.log(log);
},
@@ -158,7 +158,7 @@ angular.module('userServices', []).
setMultiple: function(obj){
var log = { op: 'set', data: {} };
_.each(obj, function(v,k){
window.habitrpgShared.helpers.dotSet(k, v, userServices.user);
$window.habitrpgShared.helpers.dotSet(k, v, userServices.user);
log.data[k] = v;
});
userServices.log(log);
@@ -186,16 +186,16 @@ angular.module('userServices', []).
//If user does not have ApiID that forward him to settings.
if (!settings.auth.apiId || !settings.auth.apiToken) {
//var search = $location.search(); // FIXME this should be working, but it's returning an empty object when at a root url /?_id=...
var search = $location.search(window.location.search.substring(1)).$$search; // so we use this fugly hack instead
var search = $location.search($window.location.search.substring(1)).$$search; // so we use this fugly hack instead
if (search.err) return alert(search.err);
if (search._id && search.apiToken) {
userServices.authenticate(search._id, search.apiToken, function(){
window.location.href='/';
$window.location.href='/';
});
} else {
if (window.location.pathname.indexOf('/static') !== 0){
if ($window.location.pathname.indexOf('/static') !== 0){
localStorage.clear();
window.location.href = '/logout';
$window.location.href = '/logout';
}
}
} else {

44
test/spec/authCtrlSpec.js
View File

@@ -2,38 +2,36 @@
describe('Auth Controller', function() {
// do we need this, or has it since been added to Karma proper?
/*beforeEach(function(){
this.addMatchers({
toEqualData: function(expected) {
return angular.equals(this.actual, expected);
}
});
});*/
//beforeEach(module('phonecatServices'));
beforeEach(module('habitrpg'));
describe('AuthCtrl', function(){
var scope, ctrl, $httpBackend;
var scope, ctrl, user, $httpBackend, $window;
beforeEach(inject(function(_$httpBackend_, $rootScope, $controller) {
$httpBackend = _$httpBackend_;
$httpBackend.expectGET('api/v1/users/auth/local').
respond({id: 'abc', apiToken: 'abc'});
scope = $rootScope.$new();
ctrl = $controller(AuthCtrl, {$scope: scope});
scope.loginUsername = 'user'
scope.loginPassword = 'pass'
$window = { location: { href: ""}, alert: sinon.spy() };
user = { user: {}, authenticate: sinon.spy() };
ctrl = $controller('AuthCtrl', {$scope: scope, $window: $window, User: user});
}));
it('should log in users with correct uname / pass', function() {
// expect(scope.phones).toEqual([]);
// $httpBackend.flush();
//
// expect(scope.phones).toEqualData(
// [{name: 'Nexus S'}, {name: 'Motorola DROID'}]);
$httpBackend.expectPOST('/api/v1/user/auth/local').respond({id: 'abc', token: 'abc'});
scope.auth();
$httpBackend.flush();
expect(user.authenticate).to.have.been.calledOnce;
expect($window.alert).to.not.have.been.called;
});
it('should not log in users with incorrect uname / pass', function() {
$httpBackend.expectPOST('/api/v1/user/auth/local').respond(404, '');
scope.auth();
$httpBackend.flush();
expect(user.authenticate).to.not.have.been.called;
expect($window.alert).to.have.been.calledOnce;
});
});