Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version Update v2.6.21 [ Master ] #2077

Merged
merged 70 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
c4e8148
integrated playwright test for the buddypress settings
imranhasanraaz Jul 4, 2024
81ff9e8
Display settings migration
imranhasanraaz Jul 11, 2024
726d5ce
completed other settings
imranhasanraaz Jul 12, 2024
ec5a18b
added test cases for privacy policy
imranhasanraaz Jul 15, 2024
460e01c
Redesign test case to compitable with parallel execution
imranhasanraaz Jul 16, 2024
a3e6376
Clean code
imranhasanraaz Jul 29, 2024
1b84a44
rename upload to test data
imranhasanraaz Jul 29, 2024
5992a1a
added test data for media size
imranhasanraaz Jul 29, 2024
7525592
Remove duplicate code and Added test cases for photo size
imranhasanraaz Jul 29, 2024
62588b7
remove thirdparty theme dependency
imranhasanraaz Jul 30, 2024
4d8f10e
Added test cases for custom css and video size
imranhasanraaz Jul 31, 2024
4d70ae8
Added test cases of the media type and clean code
imranhasanraaz Aug 1, 2024
e8e268c
added workflows
imranhasanraaz Aug 1, 2024
fc384b9
rename workflow
imranhasanraaz Aug 1, 2024
8ec99cd
added branch to the workflow
imranhasanraaz Aug 1, 2024
410406d
update workflows
imranhasanraaz Aug 6, 2024
3d3b617
add html report
imranhasanraaz Aug 6, 2024
1d3a25f
remove playwright report
imranhasanraaz Aug 6, 2024
6c5b9c0
enable dircet upload
imranhasanraaz Aug 6, 2024
6c22170
added test for enable direct upload
imranhasanraaz Aug 6, 2024
19b37cd
update enable direct
imranhasanraaz Aug 6, 2024
aa3a3f1
update selector
imranhasanraaz Aug 6, 2024
fc85bf7
update locator
imranhasanraaz Aug 6, 2024
cd8f109
rename test
imranhasanraaz Aug 6, 2024
124f629
update locator
imranhasanraaz Aug 6, 2024
adb622e
Merge branch 'wp-e2e-playwright' of https://github.com/rtCamp/rtMedia…
imranhasanraaz Aug 6, 2024
03de4f7
update locator
imranhasanraaz Aug 6, 2024
4b824ea
rearrange test
imranhasanraaz Aug 6, 2024
0d658f3
rename test folder
imranhasanraaz Aug 6, 2024
5fdc551
rename test folder
imranhasanraaz Aug 6, 2024
50c8f46
rename test folder
imranhasanraaz Aug 6, 2024
df26164
Separate save button activity
imranhasanraaz Aug 6, 2024
b6fc809
separate save
imranhasanraaz Aug 6, 2024
8c0e93f
update footerlink
imranhasanraaz Aug 6, 2024
9a534ca
update selector
imranhasanraaz Aug 6, 2024
57726b1
update selector
imranhasanraaz Aug 6, 2024
3ac324d
update selector
imranhasanraaz Aug 6, 2024
5c38753
update timeout
imranhasanraaz Aug 6, 2024
8de3d01
update timeout
imranhasanraaz Aug 6, 2024
66145fc
delete captcha file
imranhasanraaz Aug 7, 2024
1e42b14
Checking report
imranhasanraaz Aug 7, 2024
6c39269
update test data
imranhasanraaz Aug 8, 2024
2b193ac
update test data
imranhasanraaz Aug 8, 2024
9040ae5
Delete playwright-report
imranhasanraaz Aug 8, 2024
853d0d5
Merge pull request #2057 from rtCamp/wp-e2e-playwright
pooja-muchandikar Aug 8, 2024
45e3cda
Add playsinline attr to video tags where required
krishana7911 Aug 22, 2024
3a75da1
Merge pull request #2062 from rtCamp/sync/prerelease-with-master-22-0…
krishana7911 Aug 22, 2024
56d1177
Merge pull request #2063 from rtCamp/fix/mobile-fullscreening
krishana7911 Aug 22, 2024
d0b2e1a
fix: rtMedia Uploader widget was not showing on homepage.
Sep 2, 2024
6ee7ace
Merge pull request #2064 from rtCamp/fix/issue-1312
the-hercules Sep 3, 2024
dad9d05
fix: Missing dependency script warning
Sep 5, 2024
925d4ac
fix: phpcs errors
Sep 5, 2024
b64b0fd
Fix sorting for size and title for media.
kartikmehta8 Sep 6, 2024
975da7a
Merge pull request #2065 from rtCamp/fix/rtm-pro-issue-1446
the-hercules Sep 6, 2024
11406b5
Merge pull request #2066 from rtCamp/fix/sorting-not-working
kartikmehta8 Sep 6, 2024
04f3371
fix: Refactor RTMediaAdmin.php to handle JSON decoding error
the-hercules Sep 9, 2024
d6e3a1c
Fix: sorting not working for size and title
kartikmehta8 Sep 10, 2024
bf570ff
Fix: Privacy Message's close button not working
kartikmehta8 Sep 10, 2024
9d7991c
Merge pull request #2067 from rtCamp/fix/import-json-error
the-hercules Sep 10, 2024
65d2790
Merge pull request #2070 from rtCamp/fix/privacy-message-close-not-wo…
kartikmehta8 Sep 10, 2024
09a88d6
Fix: Reload page after deleting media in rtMedia.js to update count
the-hercules Sep 10, 2024
2db114a
Merge pull request #2072 from rtCamp/fix/media-total-count-error
the-hercules Sep 11, 2024
447369f
Merge pull request #2069 from rtCamp/fix/sortting-not-working-pre-rel…
kartikmehta8 Sep 16, 2024
77f6d2b
fix: Docs Media Count when uploading docs
the-hercules Sep 17, 2024
2b72ee0
fix: Handle missing media_id and media_type in RTMediaTemplate
the-hercules Sep 17, 2024
a891170
fix: handles the case when array access null
the-hercules Sep 18, 2024
ba898a2
Merge pull request #2074 from rtCamp/fix/issue-2073
the-hercules Sep 19, 2024
5bfff9a
Merge pull request #2075 from rtCamp/pre-release
krishana7911 Sep 23, 2024
49394da
Version Update v4.6.21
krishana7911 Sep 23, 2024
a4eddd0
Merge pull request #2076 from rtCamp/version-update/v4.6.21
krishana7911 Sep 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 92 additions & 0 deletions .github/ci/main.sh
Original file line number Diff line number Diff line change
@@ -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
54 changes: 54 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/admin/RTMediaAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
Loading
Loading