aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2010-10-02 11:03:05 +0000
committersimonbrandhof <simon.brandhof@gmail.com>2010-10-02 11:03:05 +0000
commit3cf4bf1b3c8c2a10f5c0d8c2d894de34469264b5 (patch)
tree8ab50b13bc021fcc6b77c5b19d1daedd2a0fd8cf
parenta6efdd8dab3a975c860e3341a2feacc9d9c63899 (diff)
downloadsonarqube-3cf4bf1b3c8c2a10f5c0d8c2d894de34469264b5.tar.gz
sonarqube-3cf4bf1b3c8c2a10f5c0d8c2d894de34469264b5.zip
fix IT
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb4
-rw-r--r--tests/integration/tests/src/it/selenium/rules/copy_and_edit_rule_template.html6
2 files changed, 5 insertions, 5 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index 83b8e4460cf..8ac42606ba8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -44,10 +44,10 @@
</table>
<% if is_admin %>
<% if rule.template? %>
- <%= button_to "Copy rule", :action => 'new', :id => profile.id, :rule_id => rule.id %>
+ <%= button_to "Copy rule", {:action => 'new', :id => profile.id, :rule_id => rule.id}, :id => "copy-#{u rule.key}" %>
<% end %>
<% if rule.editable? %>
- <%= button_to "Edit rule", :action => 'edit', :id => profile.id, :rule_id => rule.id -%>
+ <%= button_to "Edit rule", :action => 'edit', :id => profile.id, :rule_id => rule.id %>
<% end %>
<% end %>
</div>
diff --git a/tests/integration/tests/src/it/selenium/rules/copy_and_edit_rule_template.html b/tests/integration/tests/src/it/selenium/rules/copy_and_edit_rule_template.html
index ce6123432fd..20a64f9716c 100644
--- a/tests/integration/tests/src/it/selenium/rules/copy_and_edit_rule_template.html
+++ b/tests/integration/tests/src/it/selenium/rules/copy_and_edit_rule_template.html
@@ -3,7 +3,7 @@
<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="" />
+<link rel="selenium.base" href="http://localhost:9000/" />
<title>copy_and_edit_rule_template</title>
</head>
<body>
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>link=Copy rule</td>
+ <td>copy-pmd%3AXPathRule</td>
<td></td>
</tr>
<tr>
@@ -138,7 +138,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>link=Edit rule</td>
+ <td>//input[@value='Edit rule']</td>
<td></td>
</tr>
<tr>