Commit 7a27e6ad authored by Piotr Gawron's avatar Piotr Gawron
Browse files

merge issues

parent d01a31fd
......@@ -25,7 +25,7 @@ AbstractGuiElement.prototype = Object.create(ObjectWithListeners.prototype);
AbstractGuiElement.prototype.constructor = AbstractGuiElement;
AbstractGuiElement.prototype.setMap = function(map) {
if (map === undefined || map === null) {
if (map === undefined) {
throw new Error("map must be defined");
}
this._map = map;
......@@ -54,7 +54,6 @@ AbstractGuiElement.prototype.getConfiguration = function() {
return this._configuration;
};
AbstractGuiElement.prototype.setProject = function(project) {
this._project = project;
};
......
......@@ -68,10 +68,9 @@ describe('ServerConnector', function() {
it('getElements with empty list of ids', function() {
return ServerConnector.getAliases({}).then(function(result) {
assert.equal(result.length, 30);
var reaction = result[0];
assert.ok(reaction instanceof Alias);
assert.equal(reaction.getId(), 329160);
assert.equal(reaction.getModelId(), 15781);
var alias = result[0];
assert.ok(alias instanceof Alias);
assert.equal(alias.getModelId(), 15781);
});
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment