Merge branch '255-project_id-should-contain-only-alphanumeric-characters' into 'master'

validator to projectId added

Closes #255

See merge request piotr.gawron/minerva!157

frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js

@@ -4,6 +4,8 @@ require("../../mocha-config");
 
 var AddProjectDialog = require('../../../../main/js/gui/admin/AddProjectDialog');
 var ServerConnector = require('../../ServerConnector-mock');
+var ValidationError = require('../../../../main/js/ValidationError');
+
 
 var logger = require('../../logger');
 
@@ -155,4 +157,45 @@ describe('AddProjectDialog', function () {
     });
   });
 
+  describe('checkValidity', function () {
+    it('invalid project name', function () {
+      var dialog = new AddProjectDialog({
+        element: testDiv,
+        customMap: null
+      });
+
+      var file = new Blob(["<node></node>"]);
+      file.name = "test.xml";
+      return dialog.init().then(function () {
+        return dialog.callListeners("onFileUpload", file);
+      }).then(function () {
+        dialog.setProjectId("(invalid id)");
+        return dialog.checkValidity().then(function () {
+          assert.notOk("Expected validity to reject");
+        }).catch(function(error){
+          assert.ok(error instanceof ValidationError);
+        });
+      }).then().finally(function () {
+        return dialog.destroy();
+      });
+    });
+    it('valid project name', function () {
+      var dialog = new AddProjectDialog({
+        element: testDiv,
+        customMap: null
+      });
+
+      var file = new Blob(["<node></node>"]);
+      file.name = "test.xml";
+      return dialog.init().then(function () {
+        return dialog.callListeners("onFileUpload", file);
+      }).then(function () {
+        dialog.setProjectId("-valid_id");
+        return dialog.checkValidity();
+      }).then().finally(function () {
+        return dialog.destroy();
+      });
+    });
+  });
+
 });