From 76f1852141ccc8eff2ca73d935e0dc45709a74fb Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 22 Jan 2018 10:29:32 +0000
Subject: [PATCH] SSDM-6037: disable project samples for js-test. Removing and
fixing tests with project authorization.
SVN: 39126
---
.../html/test/test-create.js | 27 -------------------
.../html/test/test-search.js | 2 +-
.../openBIS-server/etc/service.properties | 1 -
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
index 3609f8ae1ea..8d8d7ef3073 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
@@ -589,33 +589,6 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
testCreate(c, fCreate, c.findRoleAssignment, fCheck);
});
- QUnit.test("createRoleAssignments() for project authorization group", function(assert) {
- var c = new common(assert, openbis);
- var authorizationGroupId;
-
- var fCreate = function(facade) {
- return c.createProject(facade).then(function(projectId) {
- return c.createAuthorizationGroup(facade).then(function(groupId){
- authorizationGroupId = groupId;
- var creation = new c.RoleAssignmentCreation();
- creation.setRole(c.Role.ADMIN);
- creation.setAuthorizationGroupId(groupId);
- creation.setProjectId(projectId);
- return facade.createRoleAssignments([creation]);
- });
- });
- }
-
- var fCheck = function(roleAssignment) {
- c.assertEqual(roleAssignment.getAuthorizationGroup().getPermId().toString(), authorizationGroupId, "Authorization group");
- c.assertEqual(roleAssignment.getRole(), c.Role.ADMIN, "Role");
- c.assertEqual(roleAssignment.getRoleLevel(), c.RoleLevel.PROJECT, "Role level");
- c.assertEqual(roleAssignment.getRegistrator().getUserId(), "openbis_test_js", "Registrator");
- }
-
- testCreate(c, fCreate, c.findRoleAssignment, fCheck);
- });
-
QUnit.test("createPersons()", function(assert) {
var c = new common(assert, openbis);
var userId = c.generateId("user");
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
index a170c221d5e..90f0da698c2 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
@@ -1360,7 +1360,7 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
}
}
c.assertEqual(numberOfTestSpaceAssignments, 1, "Number of TEST space assignments");
- c.assertEqual(numberOfProjectAssignments, 1, "Number of project assignments");
+ c.assertEqual(numberOfProjectAssignments, 0, "Number of project assignments");
}
testSearch(c, fSearch, fCheck);
diff --git a/js-test/servers/common/openBIS-server/etc/service.properties b/js-test/servers/common/openBIS-server/etc/service.properties
index 3acb0eee248..1bc87e05cfe 100644
--- a/js-test/servers/common/openBIS-server/etc/service.properties
+++ b/js-test/servers/common/openBIS-server/etc/service.properties
@@ -9,7 +9,6 @@ core-plugins-folder=../core-plugins
# ---------------------------------------------------------------------------
# The database instance local unique identifier. Used when the new database is created.
database-instance = DEFAULT
-project-samples-enabled = true
# The host and optionally port. Default is 'localhost'.
# database.url-host-part =
--
GitLab