Switch to occ for app password

Signed-off-by: Benjamin Brahmer <[email protected]>
nextcloud · Oct 24, 2022 · b121e9c · b121e9c
1 parent 6a27143
commit b121e9c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/tests/api/feeds.bats b/tests/api/feeds.bats
@@ -7,8 +7,7 @@ setup_file(){
     load "helpers/settings-override"
   fi
 
-  export APP_PASSWORD=$(http --ignore-stdin -b -a ${user}:${user} GET ${NC_HOST}/ocs/v2.php/core/getapppassword OCS-APIRequest:true | grep -Po '<apppassword>\K([A-Z|0-9|a-z]+)[^<\/apppassword>]')
-  sleep 2
+  export APP_PASSWORD=$(NC_PASS=${user} ./occ user:add-app-password ${user} --password-from-env | grep -Po '([A-Z|a-z|0-9]{72})')
 }
 
 teardown_file(){
@@ -38,7 +37,7 @@ teardown() {
 
 @test "[$TESTSUITE] Read empty" {
   run http --ignore-stdin -b -a ${user}:${APP_PASSWORD} GET ${BASE_URLv1}/feeds
-  
+
   assert_output --partial "\"feeds\":[]"
   assert_output --partial "\"starredCount\":0"
 }

diff --git a/tests/api/folders.bats b/tests/api/folders.bats
@@ -7,8 +7,7 @@ setup_file(){
     load "helpers/settings-override"
   fi
 
-  export APP_PASSWORD=$(http --ignore-stdin -b -a ${user}:${user} GET ${NC_HOST}/ocs/v2.php/core/getapppassword OCS-APIRequest:true | grep -Po '<apppassword>\K([A-Z|0-9|a-z]+)[^<\/apppassword>]')
-  sleep 2
+  export APP_PASSWORD=$(NC_PASS=${user} ./occ user:add-app-password ${user} --password-from-env | grep -Po '([A-Z|a-z|0-9]{72})')
 }
 
 teardown_file(){

diff --git a/tests/api/items.bats b/tests/api/items.bats
@@ -7,8 +7,7 @@ setup_file(){
     load "helpers/settings-override"
   fi
 
-  export APP_PASSWORD=$(http --ignore-stdin -b -a ${user}:${user} GET ${NC_HOST}/ocs/v2.php/core/getapppassword OCS-APIRequest:true | grep -Po '<apppassword>\K([A-Z|0-9|a-z]+)[^<\/apppassword>]')
-  sleep 2
+  export APP_PASSWORD=$(NC_PASS=${user} ./occ user:add-app-password ${user} --password-from-env | grep -Po '([A-Z|a-z|0-9]{72})')
 }
 
 teardown_file(){