The recent fix for
FACES-1295 (eventScopeNotRestoredRedirectTest) fixed <redirect/> test case, but the non-redirect test case (eventScopeNotRestoredModeChangedTest) is failing.
The fix for this will require some refactoring of the BridgeRequestScope interface, and making the BridgeRequestScopeImpl.restore(FacesContext) method be a little smarter as to what parts of the scope should be restored, and which parts should not. For example, when an EventNavigationResult causes a navigation-rule to fire in the EVENT_PHASE of the portlet lifecycle, then the ViewRoot needs to be restored in the subsequent RENDER_PHASE. However, the non-excluded request attributes must not be restored in the subsequent RENDER_PHASE.