Skip to content

fix(wcs): remove subscriptions expiration feature flag #3618

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.

Sign up for GitHub

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

Merged
chickenn00dle merged 1 commit into from
Dec 12, 2024
Merged

fix(wcs): remove subscriptions expiration feature flag #3618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions includes/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,10 @@ public static function is_active() {
* True if:
* - WooCommerce Subscriptions is active and,
* - Reader Activation is enabled and,
* - The NEWSPACK_SUBSCRIPTIONS_EXPIRATION feature flag is defined and true.
*
* @return bool
*/
public static function is_enabled() {
if ( ! defined( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION' ) || ! NEWSPACK_SUBSCRIPTIONS_EXPIRATION ) {
return false;
}
$is_enabled = self::is_active() && Reader_Activation::is_enabled();
/**
* Filters whether subscriptions expiration is enabled.
Expand Down
9 changes: 0 additions & 9 deletions tests/unit-tests/plugins/woocommerce-subscriptions/class-subscriptions-meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
* @group WooCommerce_Subscriptions_Integration
*/
class Newspack_Test_Subscriptions_Meta extends WP_UnitTestCase {
/**
* Setup for the tests.
*/
public static function set_up_before_class() {
if ( ! defined( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION' ) ) {
define( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION', true );
}
}

/**
* Test Subscriptions_Meta::maybe_record_cancelled_subscription_meta.
*/
Expand Down
11 changes: 1 addition & 10 deletions tests/unit-tests/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
* @group WooCommerce_Subscriptions_Integration
*/
class Newspack_Test_WooCommerce_Subscriptions extends WP_UnitTestCase {
/**
* Setup for the tests.
*/
public static function set_up_before_class() {
if ( ! defined( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION' ) ) {
define( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION', true );
}
}

/**
* Test WooCommerce_Subscriptions::is_active.
*/
Expand All @@ -36,6 +27,6 @@ public function test_is_active() {
*/
public function test_is_enabled() {
$is_enabled = WooCommerce_Subscriptions::is_enabled();
$this->assertTrue( $is_enabled, 'WooCommerce Subscriptions integration should be enabled when Feature Flag is present.' );
$this->assertTrue( $is_enabled, 'WooCommerce Subscriptions integration should be enabled when RAS is enabled.' );
}
}
Loading