Merge branch 'owncloud:master' into master

owncloud · May 18, 2021 · f035c10 · f035c10
2 parents 1b64039 + 540f83a
commit f035c10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/.drone.star b/.drone.star
@@ -1602,16 +1602,9 @@ def buildGlauth():
         "image": "owncloudci/golang:1.16",
         "pull": "always",
         "commands": [
-            # using ocis-glauth repo because latest glauth doesn't supports the bridge setup
-            "mkdir -p /srv/app/src",
-            "cd /srv/app/src",
-            "mkdir -p github.com/owncloud/",
-            "cd github.com/owncloud/",
-            "git clone http://github.com/owncloud/ocis-glauth",
-            "cd ocis-glauth",
-            "git checkout 44e252306af2dedd72ad00567bbfe9c03322ab20",
+            "cd /srv/app/src/github.com/owncloud/ocis/glauth",
             "make build",
-            "cp bin/ocis-glauth /var/www/owncloud",
+            "cp bin/glauth /var/www/owncloud",
         ],
         "volumes": [{
             "name": "gopath",
@@ -1634,7 +1627,7 @@ def glauthService():
         },
         "commands": [
             "cd /var/www/owncloud",
-            "./ocis-glauth --log-level debug server --backend-server http://owncloud/",
+            "./glauth --log-level debug server --backend-server http://owncloud/",
         ],
         "volumes": [{
             "name": "gopath",

diff --git a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
@@ -160,27 +160,27 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     deleteButtonInAccordion: {
-      selector: '//button[@aria-label="Delete"]',
+      selector: '//button[normalize-space()="Delete"]',
       locateStrategy: 'xpath'
     },
     downloadButtonInAccordion: {
-      selector: '//button[@aria-label="Download"]',
+      selector: '//button[normalize-space()="Download"]',
       locateStrategy: 'xpath'
     },
     favoriteButtonInAccordion: {
-      selector: '//button[@aria-label="Mark as favorite"]',
+      selector: '//button[normalize-space()="Mark as favorite"]',
       locateStrategy: 'xpath'
     },
     unmarkFavoriteButtonInAccordion: {
-      selector: '//button[@aria-label="Unmark as favorite"]',
+      selector: '//button[normalize-space()="Unmark as favorite"]',
       locateStrategy: 'xpath'
     },
     restoreButtonInAccordion: {
-      selector: '//button[@aria-label="Restore"]',
+      selector: '//button[normalize-space()="Restore"]',
       locateStrategy: 'xpath'
     },
     renameButtonInAccordion: {
-      selector: '//button[@aria-label="Rename"]',
+      selector: '//button[normalize-space()="Rename"]',
       locateStrategy: 'xpath'
     },
     // TODO: Merge with selectors in personalPage
@@ -194,19 +194,19 @@ module.exports = {
       selector: '.oc-modal-body-input > input'
     },
     moveButtonInAccordion: {
-      selector: '//button[@aria-label="Move"]',
+      selector: '//button[normalize-space()="Move"]',
       locateStrategy: 'xpath'
     },
     copyButtonInAccordion: {
-      selector: '//button[@aria-label="Copy"]',
+      selector: '//button[normalize-space()="Copy"]',
       locateStrategy: 'xpath'
     },
     mediaViewerButtonInAccordion: {
-      selector: '//button[@aria-label="Open in Mediaviewer"]',
+      selector: '//button[normalize-space()="Open in Mediaviewer"]',
       locateStrategy: 'xpath'
     },
     markdownEditorButtonInAccordion: {
-      selector: '//button[@aria-label="Open in MarkdownEditor"]',
+      selector: '//button[normalize-space()="Open in MarkdownEditor"]',
       locateStrategy: 'xpath'
     }
   }