Update end to end tests following recent development

globaleaks · May 27, 2019 · 3226c96 · 3226c96
1 parent 3341c8c
commit 3226c96
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/client/app/css/main.css b/client/app/css/main.css
@@ -101,11 +101,11 @@ table {
   margin-bottom: 0.8em;
 }
 
-.span-as-link {
+.language-link {
   color: #FFF;
 }
 
-.span-as-link-selected {
+.language-link-selected {
   color: #000;
 }
 

diff --git a/client/app/views/partials/user.html b/client/app/views/partials/user.html
@@ -2,7 +2,7 @@
   <div id="LanguagePickerBox" class="languagePick row" data-ng-if="node.languages_enabled.length > 1">
     <div class="pull-right">
       <span data-ng-if="!mobile && languages_enabled_selector.length < 4" data-ng-repeat="item in languages_enabled_selector">
-        <span class="span-as-link" data-ng-class="{'span-as-link-selected': GLTranslate.state.language === item.code}" data-uib-popover="{{item.native}} ({{item.name}})" data-popover-placement="bottom" data-ng-click="GLTranslate.state.language = item.code">{{item.native}}</span>
+        <a class="language-link" data-ng-class="{'language-link-selected': GLTranslate.state.language === item.code}" data-uib-popover="{{item.native}} ({{item.name}})" data-popover-placement="bottom" data-ng-click="GLTranslate.state.language = item.code">{{item.native}}</a>
         <span data-ng-if="!$last">|</div>
       </span>
       <select data-ng-if="mobile || languages_enabled_selector.length > 3" class="form-control" data-ng-if="false" data-ng-model="GLTranslate.state.language" data-ng-options="item.code as item.native for item in languages_enabled_selector"></select>

diff --git a/client/tests/test-admin-configure-advanced.js b/client/tests/test-admin-configure-advanced.js
@@ -5,18 +5,19 @@ describe("admin configure advanced settings", function() {
 
     // enable experimental features that by default are disabled
     element(by.model("admin.node.enable_experimental_features")).click();
+    element(by.model("admin.node.enable_custodian")).click();
 
     // save settings
     element.all(by.css("[data-ng-click=\"updateNode()\"]"));
   });
 
-  it("should configure short urls", function() {
+  it("should configure url redirects", function() {
     browser.setLocation("admin/advanced_settings");
-    element(by.cssContainingText("a", "URL shortener")).click();
+    element(by.cssContainingText("a", "URL redirects")).click();
 
     for (var i = 0; i < 3; i++) {
-      element(by.model("new_shorturl.shorturl")).sendKeys("shorturl-" + i.toString());
-      element(by.model("new_shorturl.longurl")).sendKeys("/longurl");
+      element(by.model("new_redirect.path1")).sendKeys("yyyyyyyy-" + i.toString());
+      element(by.model("new_redirect.path2")).sendKeys("xxxxxxxx");
       element(by.cssContainingText("button", "Add")).click();
       element.all(by.cssContainingText("button", "Delete")).first().click();
     }

diff --git a/client/tests/test-admin-configure-languages.js b/client/tests/test-admin-configure-languages.js
@@ -10,17 +10,17 @@ describe("admin configure languages", function() {
 
     element(by.cssContainingText("a", "Languages")).click();
 
-    element(by.model("GLTranslate.state.language")).element(by.xpath(".//*[text()='Deutsch']")).click();
+    element.all(by.cssContainingText("a", "Deutsch")).get(0).click();
 
     expect(browser.isElementPresent(element(by.cssContainingText("a", "Site settings")))).toBe(false);
     expect(browser.isElementPresent(element(by.cssContainingText("a", "Seiteneinstellungen")))).toBe(true);
 
-    element(by.model("GLTranslate.state.language")).element(by.xpath(".//*[text()='Italiano']")).click();
+    element.all(by.cssContainingText("a", "Italiano")).get(0).click();
 
     expect(browser.isElementPresent(element(by.cssContainingText("a", "Seiteneinstellungen")))).toBe(false);
     expect(browser.isElementPresent(element(by.cssContainingText("a", "Impostazioni sito")))).toBe(true);
 
-    element(by.model("GLTranslate.state.language")).element(by.xpath(".//*[text()='English']")).click();
+    element.all(by.cssContainingText("a", "English")).get(0).click();
 
     expect(browser.isElementPresent(element(by.cssContainingText("a", "Impostazioni sito")))).toBe(false);
     expect(browser.isElementPresent(element(by.cssContainingText("a", "Site settings")))).toBe(true);

diff --git a/client/tests/test-admin-configure-node.js b/client/tests/test-admin-configure-node.js
@@ -1,7 +1,7 @@
 describe("admin configure node", function() {
   it("should configure node en internalization", function() {
     browser.setLocation("admin/content");
-    element(by.model("GLTranslate.state.language")).element(by.xpath(".//*[text()='English']")).click();
+    element.all(by.cssContainingText("a", "English")).get(0).click();
     expect(element(by.model("admin.node.header_title_homepage")).clear().sendKeys("TEXT1_EN"));
     expect(element(by.model("admin.node.presentation")).clear().sendKeys("TEXT2_EN"));
 
@@ -10,13 +10,13 @@ describe("admin configure node", function() {
 
   it("should configure node it internalization", function() {
     browser.setLocation("admin/content");
-    element(by.model("GLTranslate.state.language")).element(by.xpath(".//*[text()='Italiano']")).click();
+    element.all(by.cssContainingText("a", "Italiano")).get(0).click();
     expect(element(by.model("admin.node.header_title_homepage")).clear().sendKeys("TEXT1_IT"));
     expect(element(by.model("admin.node.presentation")).clear().sendKeys("TEXT2_IT"));
 
     element.all(by.cssContainingText("button", "Salva")).get(0).click();
 
-    element(by.model("GLTranslate.state.language")).element(by.xpath(".//*[text()='English']")).click();
+    element.all(by.cssContainingText("a", "English")).get(0).click();
   });
 
   it("should configure node advanced settings", function() {

diff --git a/client/tests/test-admin-custom-file.js b/client/tests/test-admin-custom-file.js
@@ -6,9 +6,7 @@ describe("Admin upload custom file", function() {
 
     browser.setLocation("admin/content");
 
-    browser.gl.utils.waitUntilPresent(by.cssContainingText("a", "Files"));
-
-    element(by.cssContainingText("a", "Files")).click();
+    element(by.cssContainingText("ul li a", "Files")).click();
 
     var customFile = browser.gl.utils.makeTestFilePath("nyancat.pdf");
 

diff --git a/client/tests/test-admin-navigate-sections.js b/client/tests/test-admin-navigate-sections.js
@@ -27,7 +27,7 @@ describe("verify navigation of admin sections", function() {
 
     element(by.cssContainingText("a", "Advanced settings")).click();
     element(by.cssContainingText("ul li a", "Main configuration")).click();
-    element(by.cssContainingText("ul li a", "URL shortener")).click();
+    element(by.cssContainingText("ul li a", "URL redirects")).click();
     element(by.cssContainingText("ul li a", "Anomaly detection thresholds")).click();
   });
 });
diff --git a/client/tests/test-internationalization.js b/client/tests/test-internationalization.js
@@ -1,5 +1,5 @@
 describe("whistleblower navigate home page", function() {
-  it("should see page properly internationalize", function() {
+  it("should see page properly internationalized", function() {
     browser.get("/#/?lang=en");
     expect(browser.isElementPresent(element(by.cssContainingText("div", "TEXT1_IT")))).toBe(false);
     expect(browser.isElementPresent(element(by.cssContainingText("div", "TEXT2_IT")))).toBe(false);