Merge pull request #2077 from rtCamp/develop

Version Update v2.6.21 [ Master ]

.github/ci/main.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+set -ex
+######################################################
+######################## VARS ########################
+SITE_NAME='rtmedia.local'
+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 rtMedia Pro plugin with data
+function create_and_configure_site () {
+
+    ee site create $SITE_NAME --wp --php74 
+    cd $SITE_ROOT/wp-content/plugins/
+    mkdir rtMedia
+    rsync -azh $GITHUB_WORKSPACE/ $SITE_ROOT/wp-content/plugins/rtmedia
+    echo "127.0.0.1 $SITE_NAME" >> /etc/hosts
+    cd rtmedia
+    ls
+    wp plugin activate rtmedia --allow-root
+    wp user create test [email protected] --role=administrator --user_pass=1234 --allow-root
+    wp user create test1 [email protected] --role=administrator --user_pass=1234 --allow-root
+    wp theme install twentytwentyone --allow-root
+    wp theme activate twentytwentyone --allow-root
+    wp plugin install buddypress --allow-root
+    wp plugin activate buddypress --allow-root
+}
+
+# Install WPe2e dependency
+function install_playwright_package () {
+
+    cd $GITHUB_WORKSPACE/tests/wp-e2e-playwright
+    git clone --depth=1 https://github.com/rtCamp/rtmedia-test-data.git test-data
+    npm install
+
+}
+
+function install_playwright(){
+     cd $GITHUB_WORKSPACE/tests/wp-e2e-playwright
+    npx playwright install
+}
+
+# Run test for new deployed site
+function run_playwright_tests () {
+    cd $GITHUB_WORKSPACE/tests/wp-e2e-playwright
+    npm run test-e2e:playwright -- prerequisite.spec.js
+    npm run test-e2e:playwright -- specs/buddypress
+    npm run test-e2e:playwright -- specs/display
+    npm run test-e2e:playwright -- specs/other_settings
+    npm run test-e2e:playwright -- media_size.spec.js
+    npm run test-e2e:playwright -- types.spec.js
+}
+
+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
+    install_playwright
+    run_playwright_tests
+}
+
+main

.github/workflows/playwright.yml

@@ -0,0 +1,54 @@
+# e2e test for rtMedia pro plugin. 
+
+name: CI for rtMedia plugin
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on pull request events
+  pull_request:
+    branches:
+      - wp-e2e-playwright
+      - 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 rtMedia Features Test Cases
+    runs-on: ubuntu-latest
+    env: 
+      TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      working-directory: ./tests/wp-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: 17
+          RCLONE_CONFIG: ${{ secrets.RCLONE_CONFIG }}
+
+      - name: Archive HTML Report on failure
+        if: failure()
+        uses: actions/upload-artifact@v1
+        with:
+          name: report
+          path: ./tests/wp-e2e-playwright/playwright-report
+
+      - name: Cleanup
+        if: ${{ always() }}
+        uses: rtCamp/action-cleanup@master

README.md

@@ -152,6 +152,15 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
+### 4.6.21 [Septemeber 23, 2024] ###
+
+* Fixed
+
+	* Resolved the issue with the privacy message's close button not functioning.
+	* Addressed the problem with JSON import not working.
+	* Fixed errors encountered while editing document uploads.
+	* Fixed issue related to videos automatically opened in full screen, hiding the activity feed in ios devices.
+
 ### 4.6.20 [August 02, 2024] ###
 
 * Fixed

app/admin/RTMediaAdmin.php

@@ -1444,7 +1444,7 @@ public function import_settings( $file_path ) {
 				wp_send_json( $response );
 			}
 
-			$settings_data = json_decode( $settings_data_json, true );
+			$settings_data = $settings_data_json;
 			if ( ! is_array( $settings_data ) || empty( $settings_data['rtm_key'] ) ) {
 				$response['rtm_response']     = 'error';
 				$response['rtm_response_msg'] = esc_html__( 'Invalid JSON Supplied!', 'buddypress-media' );