test: fix remote_config tests (#6102)

* Include RC test in test:trace:core

* Rename RC test folder + fix tests

* Switch to tap

* Remove timeout from RC client Id test

* Move integration test to correct folder

Author: CarlesDD

packages/dd-trace/test/remote_config/rc-client_id.spec.js renamed to integration-tests/remote_config.spec.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { createSandbox, FakeAgent, spawnProc } = require('../../../../integration-tests/helpers')
+const { createSandbox, FakeAgent, spawnProc } = require('./helpers')
 const path = require('path')
 const Axios = require('axios')
 const { assert } = require('chai')
@@ -14,11 +14,11 @@ describe('Remote config client id', () => {
     sandbox = await createSandbox(
       ['express'],
       false,
-      [path.join(__dirname, 'resources')]
+      [path.join(__dirname, 'remote_config')]
     )
 
     cwd = sandbox.folder
-    appFile = path.join(cwd, 'resources', 'index.js')
+    appFile = path.join(cwd, 'remote_config', 'index.js')
   })
 
   after(async function () {

packages/dd-trace/test/remote_config/resources/index.js renamed to integration-tests/remote_config/index.js

@@ -25,7 +25,7 @@
     "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'",
     "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger",
     "test:eslint-rules": "node eslint-rules/*.test.mjs",
-    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,service-naming,standalone,telemetry}/**/*.spec.js\"",
+    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
     "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails",

package.json

@@ -1,12 +1,14 @@
 'use strict'
 
+require('../setup/tap')
+
+const RuleManager = require('../../src/appsec/rule_manager')
 const RemoteConfigCapabilities = require('../../src/remote_config/capabilities')
 const { kPreUpdate } = require('../../src/remote_config/manager')
 
 let config
 let rc
 let RemoteConfigManager
-let RuleManager
 let UserTracking
 let log
 let appsec
@@ -33,10 +35,6 @@ describe('Remote Config index', () => {
 
     RemoteConfigManager = sinon.stub().returns(rc)
 
-    RuleManager = {
-      updateWafFromRC: sinon.stub()
-    }
-
     UserTracking = {
       setCollectionMode: sinon.stub()
     }
@@ -52,10 +50,8 @@ describe('Remote Config index', () => {
 
     remoteConfig = proxyquire('../src/remote_config', {
       './manager': RemoteConfigManager,
-      '../rule_manager': RuleManager,
-      '../user_tracking': UserTracking,
-      '../../log': log,
-      '..': appsec
+      '../appsec/user_tracking': UserTracking,
+      '../log': log,
     })
   })
 

packages/dd-trace/test/remote_config/index.spec.js

@@ -1,5 +1,7 @@
 'use strict'
 
+require('../setup/tap')
+
 const Capabilities = require('../../src/remote_config/capabilities')
 const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('../../src/remote_config/apply_states')
 
@@ -42,11 +44,11 @@ describe('RemoteConfigManager', () => {
     RemoteConfigManager = proxyquire('../src/remote_config/manager', {
       'crypto-randomuuid': uuid,
       './scheduler': Scheduler,
-      '../../../../../package.json': { version: '3.0.0' },
-      '../../exporters/common/request': request,
-      '../../log': log,
+      '../../../../package.json': { version: '3.0.0' },
+      '../exporters/common/request': request,
+      '../log': log,
       '../tagger': tagger,
-      '../../service-naming/extra-services': {
+      '../service-naming/extra-services': {
         getExtraServices: () => extraServices
       }
     })

packages/dd-trace/test/remote_config/manager.spec.js

@@ -1,5 +1,7 @@
 'use strict'
 
+require('../setup/tap')
+
 const Scheduler = require('../../src/remote_config/scheduler')
 
 const INTERVAL = 5e3