diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2017-05-30 11:37:51 +0200 |
---|---|---|
committer | Eric Hartmann <hartmann.eric@gmail.com> | 2017-06-14 15:43:12 +0200 |
commit | 14f35ba612ceca42d7ad6eb7092bfaf83dd7b9b3 (patch) | |
tree | 9a1927660fe92f16e45efc0f80f3b25781cb0ee7 /it/it-tests/src/test | |
parent | f7e2e9c191c8da127f2d0d8504ad0fa9f816191b (diff) | |
download | sonarqube-14f35ba612ceca42d7ad6eb7092bfaf83dd7b9b3.tar.gz sonarqube-14f35ba612ceca42d7ad6eb7092bfaf83dd7b9b3.zip |
SONAR-9303 Do not display changing actions for built-in quality profiles
Diffstat (limited to 'it/it-tests/src/test')
3 files changed, 19 insertions, 10 deletions
diff --git a/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java index 08bb9d93c56..2afa6a4e07f 100644 --- a/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java @@ -25,8 +25,9 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; +import org.sonarqube.ws.client.PostRequest; +import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.permission.AddUserWsRequest; -import org.sonarqube.ws.client.permission.PermissionsService; import util.user.UserRule; import static util.ItUtils.newAdminWsClient; @@ -44,12 +45,12 @@ public class QualityProfileAdminPermissionTest { @ClassRule public static UserRule userRule = UserRule.from(orchestrator); - private static PermissionsService permissionsWsClient; + private static WsClient adminWsClient; @BeforeClass public static void init() { orchestrator.resetData(); - permissionsWsClient = newAdminWsClient(orchestrator).permissions(); + adminWsClient = newAdminWsClient(orchestrator); runProjectAnalysis(orchestrator, "shared/xoo-sample"); } @@ -62,7 +63,8 @@ public class QualityProfileAdminPermissionTest { public void permission_should_grant_access_to_profile() { userRule.createUser("not_profileadm", "userpwd"); userRule.createUser("profileadm", "papwd"); - permissionsWsClient.addUser(new AddUserWsRequest().setLogin("profileadm").setPermission("profileadmin")); + adminWsClient.permissions().addUser(new AddUserWsRequest().setLogin("profileadm").setPermission("profileadmin")); + createProfile("xoo", "foo"); runSelenese(orchestrator, // Verify normal user is not allowed to do any modification @@ -71,4 +73,11 @@ public class QualityProfileAdminPermissionTest { "/authorisation/QualityProfileAdminPermissionTest/profile-admin.html"); } + private static void createProfile(String language, String name) { + adminWsClient.wsConnector().call( + new PostRequest("api/qualityprofiles/create") + .setParam("language", language) + .setParam("name", name)); + } + } diff --git a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html index 1d1fb924396..fe6dfb509c3 100644 --- a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html +++ b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html @@ -45,18 +45,18 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>css=.quality-profiles-table-row[data-name="Basic"]</td> + <td>css=.quality-profiles-table-row[data-name="foo"]</td> <td></td> </tr> <tr> <td>click</td> - <td>css=.quality-profiles-table-row[data-name="Basic"] .quality-profiles-table-name a</td> + <td>css=.quality-profiles-table-row[data-name="foo"] .quality-profiles-table-name a</td> <td></td> </tr> <tr> <td>waitForText</td> <td>css=.quality-profile-header</td> - <td>*Basic*</td> + <td>*foo*</td> </tr> <tr> <td>assertElementNotPresent</td> diff --git a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html index 9c0efa135d0..05e6b66992e 100644 --- a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html +++ b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html @@ -45,18 +45,18 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>css=.quality-profiles-table-row[data-name="Basic"]</td> + <td>css=.quality-profiles-table-row[data-name="foo"]</td> <td></td> </tr> <tr> <td>click</td> - <td>css=.quality-profiles-table-row[data-name="Basic"] .quality-profiles-table-name a</td> + <td>css=.quality-profiles-table-row[data-name="foo"] .quality-profiles-table-name a</td> <td></td> </tr> <tr> <td>waitForText</td> <td>css=.quality-profile-header</td> - <td>*Basic*</td> + <td>*foo*</td> </tr> <tr> <td>assertElementPresent</td> |