Add some HTML ids for integration tests

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
index eb7351c7bd9a21634574e3e52a9c4d2df4d6ab67..b3236d737b67c9c61332d697284070ff20456a41 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
@@ -2,10 +2,10 @@
 <p class="spacer-bottom">Secret key is required to be able to encrypt properties. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
 <div id="secret_content">
   <%=  button_to_remote 'Generate secret key',
-                          :url => {:action => 'generate_secret'},
+                          {:url => {:action => 'generate_secret'},
                           :update => {:success => 'secret_content', :failure => 'secret_error'},
                           :failure => "$('secret_error').show()",
-                          :method => 'POST',
-                          :id => 'submit_generate_secret' -%>
+                          :method => 'POST'},
+                          {:id => 'submit_generate_secret'} -%>
   <span id="secret_error" class="error" style="display:none"></span>
 </div>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
index ba7aae6d40ae99758c3bf579d433d25b223a88a3..ff021a225ac432931f7b21a95d010215a5ef2459 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
@@ -13,7 +13,7 @@
 <div id="encrypted_section" style="display:none"></div>
 <span id="encryption_error" class="error" style="display:none"></span>
 
-<p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action' %>
+<p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %>
   but all the encrypted properties will have to be updated. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
 <script>
   $('clear_text').focus();