fix functional test

zanata · Apr 3, 2016 · d8b086e · d8b086e
1 parent 2f1f3bc
commit d8b086e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/...al-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java b/...al-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
@@ -38,8 +38,8 @@
 public class DashboardClientTab extends DashboardBasePage {
 
     private By generateApiKeyButton = By.id("generateKeyButton");
-    private By apiKeyLabel = By.id("apiKey");
-    private By configurationTextArea = By.id("config");
+    private By apiKeyLabel = By.id("client_settings_apiKey");
+    private By configurationTextArea = By.id("client_settings_config");
 
     public DashboardClientTab(WebDriver driver) {
         super(driver);

diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
@@ -114,8 +114,8 @@ public void changeProjectName() throws Exception {
                 .enterProjectName(replacementText)
                 .updateProject()
                 .gotoExplore()
-                .enterSearch("replacementText")
-                .clickProjectEntry("replacementText");
+                .enterSearch(replacementText)
+                .clickProjectEntry(replacementText);
 
         assertThat(projectVersionsPage.getProjectName())
                 .isEqualTo(replacementText)

diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
@@ -69,7 +69,7 @@ public void createABasicGroup() throws Exception {
             .saveGroup();
 
         assertThat(versionGroupPage.getGroupName().trim())
-            .isEqualTo("groupName")
+            .isEqualTo(groupName)
             .as("The group name is correct");
     }
 
@@ -140,7 +140,7 @@ public void groupDescriptionFieldSize() throws Exception {
             .saveGroup();
 
         assertThat(versionGroupPage.getGroupName().trim())
-            .isEqualTo("groupName")
+            .isEqualTo(groupName)
             .as("A group description of 100 chars is valid");
     }
 

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
@@ -57,13 +57,8 @@
       data-api-root="/rest"
       data-user="#{authenticatedAccountHome.getUser()}"
       data-permission="#{authenticatedAccountHome.getUserPermission().getJSON()}"
-      data-build-info="#{applicationConfigurationAction.buildInfo.getJSON()}"
-      data-links='{"helpUrl": "#{applicationConfigurationAction.helpUrl}",
-                   "loginUrl": "#{applicationConfigurationAction.getLoginUrl(request)}",
-                   "logoutUrl": "/account/logout.seam",
-                   "termsUrl": "#{applicationConfigurationAction.termOfUseUrl}",
-                   "registerUrl": "#{applicationConfigurationAction.registerUrl}"
-                  }'>
+      data-links='{"loginUrl": "#{applicationConfigurationAction.getLoginUrl(request)}",
+                   "registerUrl": "#{applicationConfigurationAction.registerUrl}"}'>
     </div>
     <script type="application/javascript">
       var zanataSessionId = '#{request.session.id}';

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
@@ -274,7 +274,7 @@
             </a>.
           </p>
           <div class="form__item">
-            <label for="apiKey">
+            <label for="client_settings_apiKey">
               #{msgs['jsf.dashboard.settings.apiKey.label']}
             </label>
             <ui:fragment id="no_api_key"
@@ -284,7 +284,7 @@
             <ui:fragment id="api_key"
               rendered="#{userSettingsAction.apiKeyGenerated}">
               <p>#{msgs['jsf.YourCurrentApiKeyIs']}
-                <input id="apiKey" type="text" class="js-form__input--copyable"
+                <input id="client_settings_apiKey" type="text" class="js-form__input--copyable"
                   value="#{userSettingsAction.accountApiKey}" readonly=""
                   size="30"/>
               </p>
@@ -302,8 +302,8 @@
             #{msgs['jsf.dashboard.settings.generateNewApiKey.label']}
           </button>
           <div class="form__item l--push-top-1">
-            <label for="config">Configuration (zanata.ini)</label>
-            <textarea id="config" rows="4" readonly="" class="js-form__input--copyable">[servers]
+            <label for="client_settings_config">Configuration (zanata.ini)</label>
+            <textarea id="client_settings_config" rows="4" readonly="" class="js-form__input--copyable">[servers]
 #{userSettingsAction.urlKeyLabel}#{applicationConfiguration.serverPath}/
 #{userSettingsAction.usernameKeyLabel}#{userSettingsAction.accountUsername}
 #{userSettingsAction.apiKeyLabel}#{userSettingsAction.accountApiKey}

diff --git a/zanata-war/src/main/webapp/version-group/version_group.xhtml b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -10,9 +10,9 @@
   template="/WEB-INF/template/template.xhtml">
 
   <f:metadata>
-    <f:viewParam name="versionGroupSlug" value="#{versionGroupHomeAction.slug}"/>
-    <f:viewParam name="versionGroupSlug" value="#{versionGroupHome.slug}"/>
-    <f:viewParam name="versionGroupSlug" value="#{versionGroupJoinAction.slug}"/>
+    <f:viewParam name="slug" value="#{versionGroupHomeAction.slug}"/>
+    <f:viewParam name="slug" value="#{versionGroupHome.slug}"/>
+    <f:viewParam name="slug" value="#{versionGroupJoinAction.slug}"/>
     <f:event type="preRenderView" listener="#{versionGroupHome.validateSuppliedId}"/>
   </f:metadata>