From bc10d4507bea00c244c2bd4bc7ae1d90d5eaa475 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 7 Apr 2017 17:33:53 +0200
Subject: [PATCH] user panel refactored - old functions changed to new type of
calls
---
frontend-js/src/main/js/gui/UserPanel.js | 4 ++--
frontend-js/src/test/js/gui/UserPanel-test.js | 14 ++++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/frontend-js/src/main/js/gui/UserPanel.js b/frontend-js/src/main/js/gui/UserPanel.js
index ff1dd150d9..f1c7980831 100644
--- a/frontend-js/src/main/js/gui/UserPanel.js
+++ b/frontend-js/src/main/js/gui/UserPanel.js
@@ -28,8 +28,8 @@ function UserPanel(params) {
var loginButton = self.getControlElement(PanelControlElementType.USER_TAB_LOGIN_BUTTON);
var logoutButton = self.getControlElement(PanelControlElementType.USER_TAB_LOGOUT_BUTTON);
loginButton.onclick = function(){
- var login = self.getLoginText().value;
- var password = self.getPasswordText().value;
+ var login = self.getControlElement(PanelControlElementType.USER_TAB_LOGIN_INPUT_TEXT).value;
+ var password = self.getControlElement(PanelControlElementType.USER_TAB_PASSOWRD_INPUT_TEXT).value;
return ServerConnector.login(login, password).then(function(){
window.location.reload(false);
diff --git a/frontend-js/src/test/js/gui/UserPanel-test.js b/frontend-js/src/test/js/gui/UserPanel-test.js
index a50463e2bb..be8c7a36b4 100644
--- a/frontend-js/src/test/js/gui/UserPanel-test.js
+++ b/frontend-js/src/test/js/gui/UserPanel-test.js
@@ -5,6 +5,7 @@ var Helper = require('../helper');
require("../mocha-config.js");
var UserPanel = require('../../../main/js/gui/UserPanel');
+var PanelControlElementType = require('../../../main/js/gui/PanelControlElementType');
var chai = require('chai');
var assert = chai.assert;
@@ -55,4 +56,17 @@ describe('UserPanel', function() {
panel.showLoginPage();
});
+
+ it('login', function() {
+ var div = helper.createUserTab();
+
+ var map = helper.createCustomMap();
+
+ var panel = new UserPanel({
+ element : div,
+ customMap : map
+ });
+
+ return panel.getControlElement(PanelControlElementType.USER_TAB_LOGIN_BUTTON).onclick();
+ });
});
--
GitLab