test: integ tests for entitlement validations and deactivation on expired

Author: abose

src/services/login-service.js

@@ -502,6 +502,7 @@ define(function (require, exports, module) {
     async function getEffectiveEntitlements(forceRefresh = false) {
         // Get raw server entitlements
         const serverEntitlements = await getEntitlements(forceRefresh);
+        _validateAndFilterEntitlements(serverEntitlements); // will prune invalid entitlements
 
         // Get trial days remaining
         const trialDaysRemaining = await LoginService.getProTrialDaysRemaining();
@@ -514,7 +515,6 @@ define(function (require, exports, module) {
         // User has active trial
         if (serverEntitlements && serverEntitlements.plan) {
             // Logged-in user with trial
-            _validateAndFilterEntitlements(serverEntitlements); // will prune invalid entitlements
             if (serverEntitlements.plan.paidSubscriber) {
                 // Already a paid subscriber, return as-is
                 return serverEntitlements;

test/spec/login-browser-integ-test.js

@@ -126,7 +126,7 @@ define(function (require, exports, module) {
             // Note: We can't easily reset login state, so tests should handle this
         });
 
-        function setupProUserMock(hasActiveSubscription = true) {
+        function setupProUserMock(hasActiveSubscription = true, expiredEntitlements = false) {
             let userSignedOut = false;
 
             // Set fetch mock on both browser and service exports
@@ -174,15 +174,19 @@ define(function (require, exports, module) {
                         };
 
                         if (hasActiveSubscription) {
+                            const validTill = expiredEntitlements ?
+                                Date.now() - 86400000 : // expired yesterday
+                                Date.now() + 30 * 24 * 60 * 60 * 1000; // valid for 30 days
+
                             entitlementsResponse.plan = {
                                 paidSubscriber: true,
                                 name: "Phoenix Pro",
-                                validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                                validTill: validTill
                             };
                             entitlementsResponse.entitlements = {
                                 liveEdit: {
                                     activated: true,
-                                    validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                                    validTill: validTill
                                 }
                             };
                         } else {

test/spec/login-desktop-integ-test.js

@@ -136,7 +136,7 @@ define(function (require, exports, module) {
             // Note: We can't easily reset login state, so tests should handle this
         });
 
-        function setupProUserMock(hasActiveSubscription = true) {
+        function setupProUserMock(hasActiveSubscription = true, expiredEntitlements = false) {
             let userSignedOut = false;
 
             // Set fetch mock on desktop exports
@@ -196,15 +196,19 @@ define(function (require, exports, module) {
                         };
 
                         if (hasActiveSubscription) {
+                            const validTill = expiredEntitlements ?
+                                Date.now() - 86400000 : // expired yesterday
+                                Date.now() + 30 * 24 * 60 * 60 * 1000; // valid for 30 days
+
                             entitlementsResponse.plan = {
                                 paidSubscriber: true,
                                 name: "Phoenix Pro",
-                                validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                                validTill: validTill
                             };
                             entitlementsResponse.entitlements = {
                                 liveEdit: {
                                     activated: true,
-                                    validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                                    validTill: validTill
                                 }
                             };
                         } else {

test/spec/login-shared.js

@@ -432,6 +432,90 @@ define(function (require, exports, module) {
             // Close popup
             $profileButton.trigger('click');
         });
+
+        it("should show free user popup when entitlements are expired (no trial)", async function () {
+            console.log("llgT: Starting expired entitlements without trial test");
+
+            // Setup: Expired pro subscription + no trial
+            setupProUserMock(true, true);
+            await cleanupTrialState(); // Ensure no trial is active
+
+            // Verify initial state (no pro branding due to expired entitlements)
+            await verifyProBranding(false, "no pro branding initially due to expired entitlements");
+
+            // Perform login
+            await performFullLoginFlow();
+
+            // Verify pro branding remains false after login (expired entitlements filtered to free)
+            await verifyProBranding(false, "no pro branding after login with expired entitlements");
+
+            // Check profile popup shows free plan status
+            const $profileButton = testWindow.$("#user-profile-button");
+            $profileButton.trigger('click');
+            await popupToAppear(PROFILE_POPUP);
+            await verifyProfilePopupContent(VIEW_PHOENIX_FREE,
+                "free plan user profile popup for user with expired entitlements");
+
+            // Close popup
+            $profileButton.trigger('click');
+
+            // Perform logout
+            await performFullLogoutFlow();
+
+            // Verify pro branding remains false after logout
+            await verifyProBranding(false, "no pro branding after logout with expired entitlements");
+
+            // Check profile popup (signed out state)
+            $profileButton.trigger('click');
+            await popupToAppear(SIGNIN_POPUP);
+            // Not logged in user with no trial - no special branding expected
+            expect(testWindow.$(`.profile-popup .trial-plan-info`).length).toBe(0);
+
+            // Close popup
+            $profileButton.trigger('click');
+        });
+
+        it("should show trial user popup when entitlements are expired (active trial)", async function () {
+            console.log("llgT: Starting expired entitlements with active trial test");
+
+            // Setup: Expired pro subscription + active trial (10 days)
+            setupProUserMock(true, true);
+            await setupTrialState(10);
+
+            // Verify initial state shows pro branding due to trial (overrides expired entitlements)
+            await verifyProBranding(true, "pro branding initially due to active trial");
+
+            // Perform login
+            await performFullLoginFlow();
+
+            // Verify pro branding remains after login (trial overrides expired server entitlements)
+            await verifyProBranding(true, "pro branding after login - trial overrides expired entitlements");
+
+            // Check profile popup shows trial status (not expired server entitlements)
+            const $profileButton = testWindow.$("#user-profile-button");
+            $profileButton.trigger('click');
+            await popupToAppear(PROFILE_POPUP);
+            await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                "trial user profile popup - trial overrides expired server entitlements");
+
+            // Close popup
+            $profileButton.trigger('click');
+
+            // Perform logout
+            await performFullLogoutFlow();
+
+            // Verify pro branding remains after logout (trial continues)
+            await verifyProBranding(true, "pro branding after logout - trial still active");
+
+            // Check profile popup still shows trial status
+            $profileButton.trigger('click');
+            await popupToAppear(SIGNIN_POPUP);
+            await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                "trial user profile popup for logged out user");
+
+            // Close popup
+            $profileButton.trigger('click');
+        });
     }
 
     exports.setup = setup;