mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 05:05:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9674 from nextcloud/fixUploadingFailingScreenshots

Browse source 
Fix failing username/password upon uploading failing screenshots
This commit is contained in:
Álvaro Brey 2022-01-10 11:30:26 +01:00 committed by GitHub
commit c9246210de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/screenShotTest.yml vendored
View file

@ -35,11 +35,8 @@ jobs:
script: ./gradlew gplayDebugExecuteScreenshotTests -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest -Pandroid.testInstrumentationRunnerArguments.COLOR=${{ matrix.color }} -Pandroid.testInstrumentationRunnerArguments.DARKMODE=${{ matrix.scheme }}
- name: upload failing results
if: ${{ failure() }}
env:
LOG_USERNAME: ${{ secrets.LOG_USERNAME }}
LOG_PASSWORD: ${{ secrets.LOG_PASSWORD }}
run:
scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}
scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}
- name: Archive Espresso results
uses: actions/upload-artifact@v2
if: ${{ always() }}

4
scripts/uploadReport.sh
View file

@ -80,10 +80,10 @@ else
-X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments \
-d "{ \"body\" : \"$BRANCH_TYPE test failed, but no output was generated. Maybe a preliminary stage failed. \" }"
if [ -e build/reports/androidTests/connected/flavors/gplayDebugAndroidTest ] ; then
if [ -e build/reports/androidTests/connected/flavors/gplay ] ; then
TYPE="IT"
BRANCH_TYPE=$BRANCH-$TYPE
upload "build/reports/androidTests/connected/flavors/gplayDebugAndroidTest"
upload "build/reports/androidTests/connected/flavors/gplay"
fi
if [ -e build/reports/tests/testGplayDebugUnitTest ] ; then

15
src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java
View file

@ -177,7 +177,8 @@ public class DialogFragmentIT extends AbstractIT {
@Test
@ScreenshotTest
public void testAccountChooserDialog() throws AccountUtils.AccountNotFoundException {
UserAccountManager userAccountManager = activityRule.getActivity().getUserAccountManager();
FileDisplayActivity activity = activityRule.launchActivity(null);
UserAccountManager userAccountManager = activity.getUserAccountManager();
AccountManager accountManager = AccountManager.get(targetContext);
for (Account account : accountManager.getAccountsByType(MainApp.getAccountType(targetContext))) {
accountManager.removeAccountExplicitly(account);
@ -210,7 +211,7 @@ public class DialogFragmentIT extends AbstractIT {
new OwnCloudAccount(newAccount, targetContext),
new Server(URI.create(SERVER_URL),
OwnCloudVersion.nextcloud_20)));
FileDisplayActivity activity = showDialog(sut);
activity = showDialog(sut);
activity.runOnUiThread(() -> sut.setStatus(new Status(StatusType.DND,
"Busy fixing 🐛…",
@ -248,6 +249,7 @@ public class DialogFragmentIT extends AbstractIT {
@Test
@ScreenshotTest
public void testAccountChooserDialogWithStatusDisabled() throws AccountUtils.AccountNotFoundException {
FileDisplayActivity activity = activityRule.launchActivity(null);
AccountManager accountManager = AccountManager.get(targetContext);
for (Account account : accountManager.getAccounts()) {
accountManager.removeAccountExplicitly(account);
@ -259,7 +261,7 @@ public class DialogFragmentIT extends AbstractIT {
accountManager.setUserData(newAccount, AccountUtils.Constants.KEY_USER_ID, "test");
accountManager.setAuthToken(newAccount, AccountTypeUtils.getAuthTokenTypePass(newAccount.type), "password");
UserAccountManager userAccountManager = activityRule.getActivity().getUserAccountManager();
UserAccountManager userAccountManager = activity.getUserAccountManager();
User newUser = userAccountManager.getUser(newAccount.name).get();
FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(newUser,
targetContext.getContentResolver());
@ -429,7 +431,12 @@ public class DialogFragmentIT extends AbstractIT {
private FileDisplayActivity showDialog(DialogFragment dialog) {
Intent intent = new Intent(targetContext, FileDisplayActivity.class);
FileDisplayActivity sut = activityRule.launchActivity(intent);
FileDisplayActivity sut = activityRule.getActivity();
if (sut == null) {
sut = activityRule.launchActivity(intent);
}
dialog.show(sut.getSupportFragmentManager(), "");