Add some IDs to HTML elements in order to help Selenium tests

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
index ca851346123cc200db09e432e465881588a24639..0e2aaad99bbceb2008b97a670950aecb9029dbbe 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
@@ -59,7 +59,7 @@ class Server
 
   def sonar_info
     sonar_info=[]
-    add_property(sonar_info, 'Server Key') {sonar_property(ServerIdConfigurationController::PROPERTY_SERVER_ID)}
+    add_property(sonar_info, 'Server ID') {sonar_property(ServerIdConfigurationController::PROPERTY_SERVER_ID)}
     add_property(sonar_info, 'Version') {org.sonar.server.platform.Platform.getServer().getVersion()}
     add_property(sonar_info, 'Started at') {org.sonar.server.platform.Platform.getServer().getStartedAt()}
     add_property(sonar_info, 'Database') {"#{jdbc_metadata. getDatabaseProductName()} #{jdbc_metadata. getDatabaseProductVersion()}"}

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb
index b5c39c8ac28cac4d0c132fa1b35356f51e105632..541f6d71ed6fef251ef361d555201e4f797396e3 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb
@@ -2,7 +2,7 @@
 
 <% if @server_id %>
   <p>
-    <big><b><span class="<%= @bad_id ? 'error' : 'notice' -%>"><%= @server_id -%></span></b></big>
+    <big><b><span class="<%= @bad_id ? 'error' : 'notice' -%>" id="server_id"><%= @server_id -%></span></b></big>
     <% if @bad_id %>
       <span class="error"><%= message('server_id_configuration.bad_id') -%></span>
     <% end %>
@@ -24,7 +24,7 @@
     <tfoot>
     <tr>
       <td colspan="3">
-        <%= submit_tag message('server_id_configuration.generate_button'), :disable_with => message('server_id_configuration.generating_button') %>
+        <%= submit_tag message('server_id_configuration.generate_button'), :disable_with => message('server_id_configuration.generating_button'), :id => 'generate-button' -%>
       </td>
     </tr>
     </tfoot>
@@ -47,7 +47,7 @@
         <p class="marginbottom10"><%= message('server_id_configuration.ip.desc') -%></p>
         <ul class="marginbottom10 bullet">
           <% @valid_addresses.each_with_index do |ip_address, index| %>
-            <li><span class="address_<%= index -%>"><%= ip_address.getHostAddress() -%></span></li>
+            <li><span id="address_<%= index -%>"><%= ip_address.getHostAddress() -%></span></li>
           <% end %>
         </ul>
         <p>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb
index 24b253c72dec07d47c0ba977eb12b2dc6b7f36af..9b926826500334d48d392bd3f4d74a4fa423525e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb
@@ -1 +1 @@
-<iframe src="<%= url -%>" width="100%" height="600" frameborder="0" scrolling="no"></iframe>
\ No newline at end of file
+<iframe src="<%= url -%>" width="100%" height="600" frameborder="0" scrolling="no" name="settings_iframe"></iframe>
\ No newline at end of file