Merge branch 'master' into app-info

adobe · Apr 24, 2021 · f504078 · f504078
2 parents 5fbe47c + 024eb59
commit f504078
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "jest": "^24.8.0",
+    "jest": "^26.6.3",
     "jest-plugin-fs": "^2.9.0",
     "stdout-stderr": "^0.1.9"
   },

diff --git a/test/__mocks__/@adobe/aio-lib-runtime.js b/test/__mocks__/@adobe/aio-lib-runtime.js
@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-const originalRuntimeLib = require.requireActual('@adobe/aio-lib-runtime')
+const originalRuntimeLib = jest.requireActual('@adobe/aio-lib-runtime')
 
 const cleanRtLibInstance = {
   actions: {},

diff --git a/test/commands/app/build.test.js b/test/commands/app/build.test.js
@@ -184,7 +184,7 @@ describe('run', () => {
     command.appConfig.ow.defaultApihost = global.defaultOwApihost
     command.appConfig.app.defaultHostname = global.defaultAppHostName
     const mockUtils = mockRuntimeLib.utils
-    mockRuntimeLib.utils = require.requireActual('@adobe/aio-lib-runtime').utils
+    mockRuntimeLib.utils = jest.requireActual('@adobe/aio-lib-runtime').utils
     await command.run()
     mockRuntimeLib.utils = mockUtils
     expect(command.error).toHaveBeenCalledTimes(0)

diff --git a/test/commands/app/run.test.js b/test/commands/app/run.test.js
@@ -19,7 +19,7 @@ const mockRunDev = require('../../../src/lib/run-dev')
 
 jest.mock('../../../src/lib/app-helper', () => {
   return {
-    ...require.requireActual('../../../src/lib/app-helper'),
+    ...jest.requireActual('../../../src/lib/app-helper'),
     runPackageScript: jest.fn()
   }
 })

diff --git a/test/commands/lib/run-dev.test.js b/test/commands/lib/run-dev.test.js
@@ -62,7 +62,7 @@ jest.mock('../../../src/lib/log-poller')
 jest.mock('@adobe/aio-lib-env')
 
 jest.mock('../../../src/lib/app-helper', () => {
-  const moduleMock = require.requireActual('../../../src/lib/app-helper')
+  const moduleMock = jest.requireActual('../../../src/lib/app-helper')
   return {
     ...moduleMock,
     runPackageScript: jest.fn()

diff --git a/test/jest.setup.js b/test/jest.setup.js
@@ -14,7 +14,7 @@ const { stdout, stderr } = require('stdout-stderr')
 
 jest.setTimeout(15000)
 
-const fs = require.requireActual('fs')
+const fs = jest.requireActual('fs')
 const eol = require('eol')
 const path = require('path')
 const hjson = require('hjson')