diff --git a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js index 1b3a505b23b9660bc6922d762b889222bc807c91..970db1e3b375b64ca7925fa01e0dd0b8060f1704 100644 --- a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js +++ b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js @@ -8,10 +8,10 @@ var logger = require('../../logger'); var assert = require('assert'); -function createMapsAdminPanel(configuration) { +function createMapsAdminPanel() { return new MapsAdminPanel({ element: testDiv, - configuration: configuration, + configuration: helper.getConfiguration(), serverConnector: ServerConnector }); } @@ -19,11 +19,8 @@ function createMapsAdminPanel(configuration) { describe('MapsAdminPanel', function () { it('refresh', function () { - var mapTab; - return ServerConnector.getConfiguration().then(function (configuration) { - mapTab = createMapsAdminPanel(configuration); - return mapTab.init(); - }).then(function () { + var mapTab = createMapsAdminPanel(); + return mapTab.init().then(function () { return mapTab.onRefreshClicked(); }).then(function () { assert.equal(0, logger.getWarnings().length); @@ -31,11 +28,8 @@ describe('MapsAdminPanel', function () { }); }); it('showLogs', function () { - var mapTab; - return ServerConnector.getConfiguration().then(function (configuration) { - mapTab = createMapsAdminPanel(configuration); - return mapTab.init(); - }).then(function () { + var mapTab = createMapsAdminPanel(); + return mapTab.init().then(function () { return mapTab.showLogs("sample", 'error'); }).then(function () { assert.equal(0, logger.getWarnings().length); @@ -45,11 +39,8 @@ describe('MapsAdminPanel', function () { it('getDialog', function () { helper.loginAsAdmin(); - var mapTab; - return ServerConnector.getConfiguration().then(function (configuration) { - mapTab = createMapsAdminPanel(configuration); - return mapTab.init(); - }).then(function () { + var mapTab = createMapsAdminPanel(); + return mapTab.init().then(function () { return ServerConnector.getProject(); }).then(function (project) { return mapTab.getDialog(project); @@ -62,22 +53,16 @@ describe('MapsAdminPanel', function () { describe('onAddClicked', function () { it('default', function () { - var mapTab; - return ServerConnector.getConfiguration().then(function (configuration) { - mapTab = createMapsAdminPanel(configuration); - return mapTab.init(); - }).then(function () { + var mapTab = createMapsAdminPanel(); + return mapTab.init().then(function () { return mapTab.onAddClicked(); }).then(function () { return mapTab.destroy(); }); }); it('close and reopen', function () { - var mapTab; - return ServerConnector.getConfiguration().then(function (configuration) { - mapTab = createMapsAdminPanel(configuration); - return mapTab.init(); - }).then(function () { + var mapTab = createMapsAdminPanel(); + return mapTab.init().then(function () { return mapTab.onAddClicked(); }).then(function () { mapTab._addDialog.close();