Fix tests - enterWith is not happening now in tested methods

Author: uurien

packages/dd-trace/src/appsec/rasp/fs-plugin.js

@@ -14,7 +14,7 @@ const enabledFor = {
 
 let fsPlugin
 
-function storeToStart (fsProps, store = storage('legacy').getStore()) {
+function getStoreToStart (fsProps, store = storage('legacy').getStore()) {
   if (store && !store.fs?.opExcluded) {
     return {
       ...store,
@@ -46,12 +46,12 @@ class AppsecFsPlugin extends Plugin {
   _onFsOperationStart () {
     const store = storage('legacy').getStore()
     if (store) {
-      return storeToStart({ root: store.fs?.root === undefined }, store)
+      return getStoreToStart({ root: store.fs?.root === undefined }, store)
     }
   }
 
   _onResponseRenderStart () {
-    return storeToStart({ opExcluded: true })
+    return getStoreToStart({ opExcluded: true })
   }
 
   _onFsOperationFinishOrRenderEnd () {

packages/dd-trace/test/appsec/rasp/fs-plugin.spec.js

@@ -27,7 +27,7 @@ describe('AppsecFsPlugin', () => {
     beforeEach(() => {
       configure = sinon.stub()
       class PluginClass {
-        addSub (channelName, handler) {}
+        addBind (channelName, handler) {}
 
         configure (config) {
           configure(config)
@@ -93,20 +93,18 @@ describe('AppsecFsPlugin', () => {
   })
 
   describe('_onFsOperationStart', () => {
-    it('should mark fs root', () => {
+    it('should return fs root', () => {
       const origStore = {}
       storage('legacy').enterWith(origStore)
 
-      appsecFsPlugin._onFsOperationStart()
+      let store = appsecFsPlugin._onFsOperationStart()
 
-      let store = storage('legacy').getStore()
       assert.property(store, 'fs')
       assert.propertyVal(store.fs, 'parentStore', origStore)
       assert.propertyVal(store.fs, 'root', true)
 
-      appsecFsPlugin._onFsOperationFinishOrRenderEnd()
+      store = appsecFsPlugin._onFsOperationFinishOrRenderEnd()
 
-      store = storage('legacy').getStore()
       assert.equal(store, origStore)
       assert.notProperty(store, 'fs')
     })
@@ -115,28 +113,30 @@ describe('AppsecFsPlugin', () => {
       const origStore = { orig: true }
       storage('legacy').enterWith(origStore)
 
-      appsecFsPlugin._onFsOperationStart()
+      const rootStore = appsecFsPlugin._onFsOperationStart()
 
-      const rootStore = storage('legacy').getStore()
       assert.property(rootStore, 'fs')
       assert.propertyVal(rootStore.fs, 'parentStore', origStore)
       assert.propertyVal(rootStore.fs, 'root', true)
 
-      appsecFsPlugin._onFsOperationStart()
+      storage('legacy').enterWith(rootStore)
+
+      let store = appsecFsPlugin._onFsOperationStart()
 
-      let store = storage('legacy').getStore()
       assert.property(store, 'fs')
       assert.propertyVal(store.fs, 'parentStore', rootStore)
       assert.propertyVal(store.fs, 'root', false)
       assert.propertyVal(store, 'orig', true)
 
-      appsecFsPlugin._onFsOperationFinishOrRenderEnd()
+      storage('legacy').enterWith(store)
+
+      store = appsecFsPlugin._onFsOperationFinishOrRenderEnd()
 
-      store = storage('legacy').getStore()
       assert.equal(store, rootStore)
 
-      appsecFsPlugin._onFsOperationFinishOrRenderEnd()
-      store = storage('legacy').getStore()
+      storage('legacy').enterWith(store)
+
+      store = appsecFsPlugin._onFsOperationFinishOrRenderEnd()
       assert.equal(store, origStore)
     })
   })
@@ -148,16 +148,16 @@ describe('AppsecFsPlugin', () => {
       const origStore = {}
       storage('legacy').enterWith(origStore)
 
-      appsecFsPlugin._onResponseRenderStart()
+      let store = appsecFsPlugin._onResponseRenderStart()
 
-      let store = storage('legacy').getStore()
       assert.property(store, 'fs')
       assert.propertyVal(store.fs, 'parentStore', origStore)
       assert.propertyVal(store.fs, 'opExcluded', true)
 
-      appsecFsPlugin._onFsOperationFinishOrRenderEnd()
+      storage('legacy').enterWith(store)
+
+      store = appsecFsPlugin._onFsOperationFinishOrRenderEnd()
 
-      store = storage('legacy').getStore()
       assert.equal(store, origStore)
       assert.notProperty(store, 'fs')
     })