diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2017-05-30 15:53:43 +0200 |
|---|---|---|
| committer | Eric Hartmann <hartmann.eric@gmail.com> | 2017-06-14 15:43:12 +0200 |
| commit | 702b6393c7b9e77886908bfd4565694b13ccdef8 (patch) | |
| tree | 87f273551d23235577bafd6eab31e50e5ecdb9e6 /it | |
| parent | 90c44d08cd1203c578b4c0f66126e3c22187c4ed (diff) | |
| download | sonarqube-702b6393c7b9e77886908bfd4565694b13ccdef8.tar.gz sonarqube-702b6393c7b9e77886908bfd4565694b13ccdef8.zip | |
SONAR-9303 WS api/qualityprofiles/restore_built_in returns http 410 when called
Diffstat (limited to 'it')
5 files changed, 3 insertions, 198 deletions
diff --git a/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java b/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java index 0b96a811bd3..d2038ab073c 100644 --- a/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java +++ b/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java @@ -207,9 +207,8 @@ public class IssuesModeTest { // SONAR-8518 @Test - public void shoud_support_sonar_profile_prop() throws IOException { + public void should_support_sonar_profile_prop() throws IOException { restoreProfile("one-issue-per-line.xml"); - restoreProfile("empty.xml"); orchestrator.getServer().provisionProject("sample", "xoo-sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "empty"); diff --git a/it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesPageTest.java b/it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesPageTest.java index eeeab7003b0..b5a8501810b 100644 --- a/it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesPageTest.java +++ b/it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesPageTest.java @@ -152,9 +152,7 @@ public class OrganizationQualityProfilesPageTest { public void testRestoration() throws Exception { deleteProfile("xoo", "empty"); - runSelenese(orchestrator, - "/organization/OrganizationQualityProfilesPageTest/should_restore.html", - "/organization/OrganizationQualityProfilesPageTest/should_restore_built_in.html"); + runSelenese(orchestrator, "/organization/OrganizationQualityProfilesPageTest/should_restore.html"); } private static void createProfile(String language, String name) { diff --git a/it/it-tests/src/test/java/it/qualityProfile/QualityProfilesPageTest.java b/it/it-tests/src/test/java/it/qualityProfile/QualityProfilesPageTest.java index 73e9902e4b5..6c29b8e9b1e 100644 --- a/it/it-tests/src/test/java/it/qualityProfile/QualityProfilesPageTest.java +++ b/it/it-tests/src/test/java/it/qualityProfile/QualityProfilesPageTest.java @@ -134,9 +134,7 @@ public class QualityProfilesPageTest { public void testRestoration() throws Exception { deleteProfile("xoo", "empty"); - runSelenese(orchestrator, - "/qualityProfile/QualityProfilesPageTest/should_restore.html", - "/qualityProfile/QualityProfilesPageTest/should_restore_built_in.html"); + runSelenese(orchestrator, "/qualityProfile/QualityProfilesPageTest/should_restore.html"); } private static void createProfile(String language, String name) { diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesPageTest/should_restore_built_in.html b/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesPageTest/should_restore_built_in.html deleted file mode 100644 index 82005c7102e..00000000000 --- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesPageTest/should_restore_built_in.html +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href="http://localhost:49506"/> - <title>should_create</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr> -<td rowspan="1" colspan="3">should_create</td> -</tr> -</thead> -<tbody> -<tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>id=password</td> - <td>admin</td> -</tr> -<tr> - <td>type</td> - <td>id=login</td> - <td>admin</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>name=commit</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=.js-user-authenticated</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/organizations/test-org/quality_profiles</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=.quality-profiles-table-row[data-name="sample"]</td> - <td></td> -</tr> -<tr> - <td>assertElementNotPresent</td> - <td>css=.quality-profiles-table-row[data-name="empty"]</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=.js-more-admin-actions</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=#quality-profiles-restore-built-in</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=#restore-built-in-profiles-submit</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=#restore-built-in-profiles-form .alert-success</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=.js-modal-close</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=.quality-profiles-table-row[data-name="empty"]</td> - <td></td> -</tr> -</tbody> -</table> -</body> -</html> diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_restore_built_in.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_restore_built_in.html deleted file mode 100644 index 261b1f140cb..00000000000 --- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_restore_built_in.html +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href="http://localhost:49506"/> - <title>should_create</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr> -<td rowspan="1" colspan="3">should_create</td> -</tr> -</thead> -<tbody> -<tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>id=password</td> - <td>admin</td> -</tr> -<tr> - <td>type</td> - <td>id=login</td> - <td>admin</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>name=commit</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=.js-user-authenticated</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/profiles</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=.quality-profiles-table-row[data-name="sample"]</td> - <td></td> -</tr> -<tr> - <td>assertElementNotPresent</td> - <td>css=.quality-profiles-table-row[data-name="empty"]</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=.js-more-admin-actions</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=#quality-profiles-restore-built-in</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=#restore-built-in-profiles-submit</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=#restore-built-in-profiles-form .alert-success</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>css=.js-modal-close</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>css=.quality-profiles-table-row[data-name="empty"]</td> - <td></td> -</tr> -</tbody> -</table> -</body> -</html> |