Merge pull request #2740 from NoelDeMartin/MOBILE-3738

MOBILE-3738: Migrate Behat tests to ionic 5

.github/workflows/e2e.yml

@@ -0,0 +1,28 @@
+name: E2E
+
+on: [push, pull_request]
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+    env:
+      MOODLE_DOCKER_DB: pgsql
+      MOODLE_DOCKER_BROWSER: chrome
+      MOODLE_DOCKER_PHP_VERSION: 7.3
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+    - run: npm ci
+    - run: git clone --branch master --depth 1 git://github.com/moodle/moodle $GITHUB_WORKSPACE/moodle
+    - run: git clone --branch ionic5 --depth 1 git://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
+    - run: git clone --branch MOBILE-3738 --depth 1 git://github.com/NoelDeMartin/moodle-docker $GITHUB_WORKSPACE/moodle-docker
+    - run: cp $GITHUB_WORKSPACE/moodle-docker/config.docker-template.php $GITHUB_WORKSPACE/moodle/config.php
+    - run: MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle MOODLE_DOCKER_APP_PATH=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose pull
+    - run: MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle MOODLE_DOCKER_APP_PATH=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose up -d
+    - run: MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle MOODLE_DOCKER_APP_PATH=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-wait-for-db
+    - run: MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle MOODLE_DOCKER_APP_PATH=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-wait-for-app
+    - run: MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle MOODLE_DOCKER_APP_PATH=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
+    - run: MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle MOODLE_DOCKER_APP_PATH=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags="@app" --auto-rerun"

src/core/classes/page-items-list-manager.ts

@@ -154,12 +154,10 @@ export abstract class CorePageItemsListManager<Item> {
 
         // Navigate to item.
         const params = this.getItemQueryParams(item);
+        const reset = this.resetNavigation();
         const pathPrefix = selectedItemPath ? selectedItemPath.split('/').fill('../').join('') : '';
 
-        await CoreNavigator.navigate(pathPrefix + itemPath, {
-            params,
-            reset: CoreScreen.isTablet,
-        });
+        await CoreNavigator.navigate(pathPrefix + itemPath, { params, reset });
     }
 
     /**
@@ -200,6 +198,19 @@ export abstract class CorePageItemsListManager<Item> {
             : null;
     }
 
+    /**
+     * Check whether to reset navigation when selecting an item.
+     *
+     * @returns boolean Whether navigation should be reset.
+     */
+    protected resetNavigation(): boolean {
+        if (!CoreScreen.isTablet) {
+            return false;
+        }
+
+        return !this.splitView?.isNested;
+    }
+
     /**
      * Get the item that should be selected by default.
      */

src/core/features/courses/components/course-progress/core-courses-course-progress.html

@@ -11,7 +11,8 @@
             [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)"
             [class.core-course-with-spinner]="(downloadCourseEnabled && prefetchCourseData.icon == 'spinner') || showSpinner">
             <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)"
-                class="core-course-additional-info" aria-hidden="true">
+                class="core-course-additional-info">
+                <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
                 <span *ngIf="course.categoryname" class="core-course-category">
                     <core-format-text [text]="course.categoryname"></core-format-text>
                 </span>

src/core/features/courses/lang.json

@@ -1,6 +1,7 @@
 {
     "addtofavourites": "Star this course",
     "allowguests": "This course allows guest users to enter",
+    "aria:coursecategory": "Course category",
     "aria:coursename": "Course name",
     "aria:courseprogress": "Course progress:",
     "aria:favourite": "Course is starred",