fix: remove ff constant

Automattic · Nov 25, 2024 · c09ba1b · c09ba1b
1 parent 5488146
commit c09ba1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/includes/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions.php b/includes/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions.php
@@ -13,11 +13,6 @@
  * Main class.
  */
 class WooCommerce_Subscriptions {
-	/**
-	 * Feature flag for the Newspack Subscriptions Expiration feature.
-	 */
-	const NEWSPACK_SUBSCRIPTIONS_EXPIRATION_FEATURE_FLAG = 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION';
-
 	/**
 	 * Initialize hooks and filters.
 	 */
@@ -46,7 +41,7 @@ public static function is_active() {
 	 * @return bool
 	 */
 	public static function is_enabled() {
-		return Reader_Activation::is_enabled() && defined( self::NEWSPACK_SUBSCRIPTIONS_EXPIRATION_FEATURE_FLAG );
+		return Reader_Activation::is_enabled() && defined( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION' ) && NEWSPACK_SUBSCRIPTIONS_EXPIRATION;
 	}
 }
 WooCommerce_Subscriptions::init();
diff --git a/tests/unit-tests/plugins/woocommerce-subscriptions/class-subscriptions-meta.php b/tests/unit-tests/plugins/woocommerce-subscriptions/class-subscriptions-meta.php
@@ -16,7 +16,7 @@ class Newspack_Test_Subscriptions_Meta extends WP_UnitTestCase {
 	 * Setup for the tests.
 	 */
 	public function set_up() {
-		define( WooCommerce_Subscriptions::NEWSPACK_SUBSCRIPTIONS_EXPIRATION_FEATURE_FLAG, true );
+		define( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION', true );
 		WooCommerce_Subscriptions::init();
 	}
 

diff --git a/tests/unit-tests/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions.php b/tests/unit-tests/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions.php
@@ -22,11 +22,14 @@ public function test_is_active() {
 
 	/**
 	 * Test WooCommerce_Subscriptions::is_enabled.
+	 *
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function test_is_enabled() {
 		$is_active = WooCommerce_Subscriptions::is_enabled();
 		$this->assertFalse( $is_active, 'WooCommerce Subscriptions integration should be disabled when Feature Flag is not present.' );
-		define( WooCommerce_Subscriptions::NEWSPACK_SUBSCRIPTIONS_EXPIRATION_FEATURE_FLAG, true );
+		define( 'NEWSPACK_SUBSCRIPTIONS_EXPIRATION', true );
 		$is_active = WooCommerce_Subscriptions::is_enabled();
 		$this->assertTrue( $is_active, 'WooCommerce Subscriptions integration should be enabled when Feature Flag is present.' );
 	}