Sync Develop branch with master branch

.github/ci/main.sh

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+set -ex
+
+######################################################
+######################## VARS ########################
+SITE_NAME='login-with-google.com'
+SITE_ROOT="/var/www/$SITE_NAME/htdocs"
+SITE_URL="http://$SITE_NAME/"
+function ee() { wo "$@"; }
+#####################################################
+
+# Start required services for site creation
+function start_services() {
+
+    echo "Starting services"
+    git config --global user.email "[email protected]"
+    git config --global user.name "nobody"
+    rm /etc/nginx/conf.d/stub_status.conf /etc/nginx/sites-available/22222 /etc/nginx/sites-enabled/22222
+    rm -rf /var/www/22222
+    ee stack start --nginx --mysql --php74
+    ee stack status --nginx --mysql --php74
+}
+
+
+# Create, setup and populate learn.rtcamp.com base site with data
+function create_and_configure_site () {
+
+    ee site create $SITE_NAME --wp --php74 
+    cd $SITE_ROOT/wp-content/plugins/
+    mkdir login-with-google
+    rsync -azh $GITHUB_WORKSPACE/ $SITE_ROOT/wp-content/plugins/login-with-google
+    echo "127.0.0.1 $SITE_NAME" >> /etc/hosts
+    ls
+    wp plugin activate login-with-google --allow-root
+    wp user create automation [email protected] --role=administrator --user_pass=automation --allow-root
+    wp theme activate twentytwentyone --allow-root
+}
+
+
+# Install WPe2e dependency
+function install_playwright_package () {
+
+    cd $GITHUB_WORKSPACE/tests/e2e-playwright
+    npm install
+
+}
+
+#build packages
+function build_package(){
+    cd $GITHUB_WORKSPACE/tests/e2e-playwright
+    npm run build
+}
+
+function install_playwright(){
+     cd $GITHUB_WORKSPACE/tests/e2e-playwright
+    npx playwright install
+}
+
+# Run test for new deployed site
+function run_playwright_tests () {
+    cd $GITHUB_WORKSPACE/tests/e2e-playwright
+    npm run test-e2e:playwright -- specs/
+}
+
+function maybe_install_node_dep() {
+
+	if [[ -n "$NODE_VERSION" ]]; then
+
+		echo "Setting up $NODE_VERSION"
+		NVM_LATEST_VER=$(curl -s "https://api.github.com/repos/nvm-sh/nvm/releases/latest" |
+			grep '"tag_name":' |
+			sed -E 's/.*"([^"]+)".*/\1/') &&
+			curl -fsSL "https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_LATEST_VER/install.sh" | bash
+		export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+		[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
+		nvm install "$NODE_VERSION"
+		nvm use "$NODE_VERSION"
+
+		[[ -z "$NPM_VERSION" ]] && NPM_VERSION="latest" || echo ''
+		export npm_install=$NPM_VERSION
+		curl -fsSL https://www.npmjs.com/install.sh | bash
+	fi
+}
+
+function main() {
+    start_services
+    create_and_configure_site
+    maybe_install_node_dep
+    install_playwright_package
+    build_package
+    install_playwright
+    run_playwright_tests
+}
+
+main

.github/workflows/e2e-test.yml

@@ -0,0 +1,68 @@
+# e2e test for Login with google plugin. 
+
+name: CI for Login with google plugin test
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: 
+      - develop
+      - master
+  pull_request:
+    branches: 
+      - develop
+      - master
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  Run-wpe2e-TestCase:
+    # The type of runner that the job will run on
+    name: Run Login with google plugin test Cases
+    runs-on: ubuntu-latest
+    env: 
+      GMAIL_UNAME: ${{ secrets.GMAIL_UNAME }}
+      GMAIL_PASS: ${{ secrets.GMAIL_PASS }}
+      TESRESULT_TOKEN: ${{ secrets.TESRESULT_TOKEN }}
+      TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      SHA: ${{ github.event.pull_request.head.sha }}
+      COMMIT_SHA: ${{ github.sha }}
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      working-directory: ./tests/e2e-playwright
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      # Check node version
+      - name: Current directory and listings
+        run: |
+          pwd
+          ls -al
+        # Install config site
+      - name: Install and config site
+        uses: docker://rtcamp/base-wo:v1.0.0
+        env:
+          NODE_VERSION: 16
+          RCLONE_CONFIG: ${{ secrets.RCLONE_CONFIG }}
+
+      - name: Archive HTML Report on failure
+        if: failure()
+        uses: actions/upload-artifact@v1
+        with:
+          name: report
+          path: ./tests/e2e-playwright/uploads
+
+      - name: run PR status
+        if: ${{ always() }}
+        run: node ./tests/e2e-playwright/bin/pr-status.js
+        working-directory: ${{env.working_directory}}
+
+      - name: Cleanup
+        if: ${{ always() }}
+        uses: rtCamp/action-cleanup@master

.github/workflows/phpunit_on_pull_request.yml

@@ -1,12 +1,107 @@
 on: pull_request
 name: PHPUnit
 jobs:
-  runPHPCSInspection:
-    name: Run PHPUnit test
+  unit: #-----------------------------------------------------------------------
+    name: Unit test /  PHP ${{ matrix.php }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.3', '7.4', '8.0']
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Check out source code
+        uses: actions/checkout@v2
+
+      - name: Check existence of composer.json file
+        id: check_files
+        uses: andstor/file-existence-action@v1
+        with:
+          files: "composer.json, phpunit.xml.dist"
+
+      - name: Set up PHP environment
+        if: steps.check_files.outputs.files_exists == 'true'
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '${{ matrix.php }}'
+          coverage: xdebug
+          tools: composer,cs2pr
+
+      - name: Get Composer cache Directory
+        if: steps.check_files.outputs.files_exists == 'true'
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Use Composer cache
+        if: steps.check_files.outputs.files_exists == 'true'
+        uses: actions/cache@master
+        with:
+          path: ${{ steps['composer-cache'].outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Install dependencies
+        if: steps.check_files.outputs.files_exists == 'true'
+        run: COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist --no-progress --ignore-platform-reqs
+
+      - name: Setup problem matcher to provide annotations for PHPUnit
+        if: steps.check_files.outputs.files_exists == 'true'
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Run PHPUnit
+        if: steps.check_files.outputs.files_exists == 'true'
+        run: composer update && composer tests:unit
+
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v2
+        with:
+          name: code-coverage-report
+          path: /tmp/report/html
+
+  artifact-upload: #-----------------------------------------------------------------------
+    name: Push artifact to static site
     runs-on: ubuntu-latest
+    needs: [unit]
+
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-    - name: Run PHPUnit test
-      uses: docker://rtcamp/action-run-phpunit:v1.0.0
+      - name: Check out gh-reports repository
+        uses: actions/checkout@v2
+        with:
+          repository: rtCamp/gh-reports.rt.gw
+          token: ${{ secrets.RTBOT_TOKEN }}
+
+      - name: Download artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: code-coverage-report
+          path: /tmp/report/html
+
+      - name: Move report into correct location
+        run: |
+          repo=$(echo ${GITHUB_REPOSITORY#rtCamp/})
+          rm -rf "$repo/$GITHUB_REF"
+          mkdir -p "$repo/$GITHUB_REF"
+          rsync -avhP /tmp/report/html/ "$repo/$GITHUB_REF/"
+
+      - name: Commit files
+        run: |
+          repo=$(echo ${GITHUB_REPOSITORY#rtCamp/})
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+          git add "$repo"
+          git commit -m "artifcat report build: $GITHUB_REPOSITORY@$GITHUB_SHA"
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.RTBOT_TOKEN }}
+          branch: main
+          repository: rtCamp/gh-reports.rt.gw
+
+      - name: Comment URL on PR
+        uses: unsplash/comment-on-pr@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          msg: "Code coverage report: https://gh-reports.rt.gw/login-with-google/${{ github.ref }}/"
+          check_for_duplicate_msg: true

.github/workflows/release_plugin_on_tag.yml

@@ -11,7 +11,6 @@ jobs:
     - name: WordPress Plugin Deploy
       uses: rtCamp/action-wordpress-org-plugin-deploy@master
       env:
-        CUSTOM_COMMAND: composer install --no-dev --optimize-autoloader && composer update
         EXCLUDE_LIST: .github .gitignore .eslintignore phpunit.xml phpcs.xml tests README.md 
         SLUG: login-with-google
         ASSETS_DIR: wp-assets

.gitignore

@@ -1,4 +1,4 @@
-/vendor/
 .idea
 node_modules/
 .DS_Store
+.phpunit.result.cache