From 69a54fe4e65592f17d4a929f0bf40e134190d040 Mon Sep 17 00:00:00 2001 From: Rinat Khaziev Date: Mon, 23 Dec 2024 20:00:44 -0600 Subject: [PATCH 1/4] Actually bump minimum Parse.ly version to 3.15 in parsely.yml workflow --- .github/workflows/parsely.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/parsely.yml b/.github/workflows/parsely.yml index 1d7e6cb07a..87341a860c 100644 --- a/.github/workflows/parsely.yml +++ b/.github/workflows/parsely.yml @@ -23,8 +23,8 @@ jobs: matrix: config: # Oldest version of the parsely plugin - - { wp: latest, parsely: '3.5', mode: 'filter_enabled', php: '8.1' } - - { wp: latest, parsely: '3.5', mode: 'filter_disabled', php: '8.1' } + - { wp: latest, parsely: '3.15', mode: 'filter_enabled', php: '8.1' } + - { wp: latest, parsely: '3.15', mode: 'filter_disabled', php: '8.1' } # Latest version of the parsely plugin - { wp: latest, mode: 'filter_enabled', php: '8.1' } From 828011d432c3b065b4eb62b1696277b5b22d8b59 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Tue, 24 Dec 2024 04:54:43 +0200 Subject: [PATCH 2/4] `track_authenticated_users` is `false` by default --- tests/parsely/test-mu-parsely-integration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parsely/test-mu-parsely-integration.php b/tests/parsely/test-mu-parsely-integration.php index a155065e9b..7fa0e65824 100644 --- a/tests/parsely/test-mu-parsely-integration.php +++ b/tests/parsely/test-mu-parsely-integration.php @@ -244,7 +244,7 @@ public function test_default_parsely_configs() { 'have_api_secret' => false, 'is_javascript_disabled' => false, 'is_autotracking_disabled' => false, - 'should_track_logged_in_users' => is_latest_version() ? false : true, + 'should_track_logged_in_users' => false, 'tracked_post_types' => array( array( 'name' => 'post', @@ -343,7 +343,7 @@ public function test_parsely_configs_for_managed_mode() { 'have_api_secret' => is_latest_version() ? true : false, 'is_javascript_disabled' => false, 'is_autotracking_disabled' => false, - 'should_track_logged_in_users' => is_latest_version() ? false : true, + 'should_track_logged_in_users' => false, 'tracked_post_types' => array( array( 'name' => 'post', From 847b958a31ca647c19bb925b746148a7773ed4a9 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Tue, 24 Dec 2024 05:02:07 +0200 Subject: [PATCH 3/4] fix: the order is `expected, actual` --- tests/parsely/test-mu-parsely-integration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parsely/test-mu-parsely-integration.php b/tests/parsely/test-mu-parsely-integration.php index 7fa0e65824..5a16ad8cab 100644 --- a/tests/parsely/test-mu-parsely-integration.php +++ b/tests/parsely/test-mu-parsely-integration.php @@ -337,7 +337,7 @@ public function test_parsely_configs_for_managed_mode() { $configs = Parsely_Loader_Info::get_configs(); // Assert. - $this->assertEquals( $configs, array( + $this->assertEquals( array( 'is_pinned_version' => has_filter( 'wpvip_parsely_version' ), 'site_id' => is_latest_version() ? 'site_id_value' : '', 'have_api_secret' => is_latest_version() ? true : false, @@ -358,7 +358,7 @@ public function test_parsely_configs_for_managed_mode() { 'track_type' => 'do-not-track', ), ), - ) ); + ), $configs ); } public function test_alter_option_use_repeated_metas() { From b37aba420c30c33bc32f446d3dd4e8233f53ecf7 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Tue, 24 Dec 2024 05:10:09 +0200 Subject: [PATCH 4/4] fix: tests --- tests/parsely/test-mu-parsely-integration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parsely/test-mu-parsely-integration.php b/tests/parsely/test-mu-parsely-integration.php index 5a16ad8cab..5c2e808c58 100644 --- a/tests/parsely/test-mu-parsely-integration.php +++ b/tests/parsely/test-mu-parsely-integration.php @@ -339,8 +339,8 @@ public function test_parsely_configs_for_managed_mode() { // Assert. $this->assertEquals( array( 'is_pinned_version' => has_filter( 'wpvip_parsely_version' ), - 'site_id' => is_latest_version() ? 'site_id_value' : '', - 'have_api_secret' => is_latest_version() ? true : false, + 'site_id' => 'site_id_value', + 'have_api_secret' => true, 'is_javascript_disabled' => false, 'is_autotracking_disabled' => false, 'should_track_logged_in_users' => false,