diff --git a/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js b/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js index 8d829334512c2ff23debd5bcfc8ef08e7718f260..460ba24bb315c619f1c01eb38a0e1f2f03f86f10 100644 --- a/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/EditUserDialog-test.js @@ -10,7 +10,6 @@ var ServerConnector = require('../../ServerConnector-mock'); var logger = require('../../logger'); -var Promise = require('bluebird'); var chai = require('chai'); var assert = chai.assert; var expect = chai.expect; @@ -33,13 +32,10 @@ describe('EditUserDialog', function () { describe('init', function () { it('empty user', function () { - var dialog; - var project; var user = new User({}); - return ServerConnector.getProject().then(function (result) { - dialog = createEditUserDialog(user); - return dialog.init(); - }).then(function () { + var dialog = createEditUserDialog(user); + + return dialog.init().then(function () { assert.equal(0, logger.getWarnings().length); assert.ok(testDiv.innerHTML.indexOf("DEFAULT PRIVILEGE FOR NEW PROJECT") >= 0); assert.equal(testDiv.innerHTML.indexOf("DEFAULT PRIVILEGE FOR NEW PROJECT"), testDiv.innerHTML.lastIndexOf("DEFAULT PRIVILEGE FOR NEW PROJECT")); @@ -50,12 +46,10 @@ describe('EditUserDialog', function () { describe('checkValidity', function () { it('empty user', function () { - var dialog; var user = new User({}); - return ServerConnector.getProject().then(function (result) { - dialog = createEditUserDialog(user); - return dialog.init(); - }).then(function () { + var dialog = createEditUserDialog(user); + + return dialog.init().then(function () { return dialog.checkValidity().then(function () { assert.ok(null); }, function (error) { @@ -87,8 +81,6 @@ describe('EditUserDialog', function () { var user; return ServerConnector.getUser("anonymous").then(function (result) { user = result; - return ServerConnector.getProject(); - }).then(function (result) { dialog = createEditUserDialog(user); return dialog.init(); }).then(function () { @@ -108,8 +100,6 @@ describe('EditUserDialog', function () { var user; return ServerConnector.getUser("admin").then(function (result) { user = result; - return ServerConnector.getProject(); - }).then(function (result) { dialog = createEditUserDialog(user); return dialog.init(); }).then(function () { @@ -129,8 +119,6 @@ describe('EditUserDialog', function () { return ServerConnector.getUser("anonymous").then(function (result) { user = result; serializedPrivileges = user.getPrivileges().slice(); - return ServerConnector.getProject(); - }).then(function (result) { dialog = createEditUserDialog(user); return dialog.init(); }).then(function () {