Merge branch 'dev' into releases/v2

Author: JamesIves

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: '.node-version'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Yarn

.github/workflows/integration.yml

@@ -4,7 +4,6 @@ on:
   workflow_dispatch:
   schedule:
     - cron: 30 15 * * 0-6
-
   push:
     tags-ignore:
       - '*.*'

.github/workflows/production.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: '.node-version'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Yarn

.github/workflows/version.yml

@@ -29,7 +29,7 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: '.node-version'
           registry-url: 'https://registry.npmjs.org'
           scope: '@jamesives'
 
@@ -60,7 +60,7 @@ jobs:
       # Setup .npmrc file to publish to GitHub Packages
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: '.node-version'
           registry-url: 'https://npm.pkg.github.com'
           scope: '@jamesives'
 

.node-version

@@ -0,0 +1 @@
+v22.11.0

.nvmrc

@@ -15,7 +15,7 @@ When contributing to this repository, please first discuss the change you wish t
 
 ## Deploying 🚚
 
-In order to deploy and test your own fork of this action, you must commit the `node_modules` dependencies. Be sure to run `nvm use` before installing any dependencies. You can learn more about nvm [here](https://github.com/nvm-sh/nvm/blob/master/README.md).
+In order to deploy and test your own fork of this action, you must commit the `node_modules` dependencies. Be sure to switch to the Node version listed in the [.node-version](./.node-version) file first.
 
 To do this you can follow the instructions below:
 

CONTRIBUTING.md

@@ -1,17 +1,18 @@
 import {retrieveData, generateExport} from '../src/fetch'
-import nock from 'nock'
 
 jest.setTimeout(1000000)
-nock.enableNetConnect()
 
 describe('fetch', () => {
   describe('retrieveData', () => {
-    afterEach(nock.cleanAll)
-    afterAll(nock.restore)
+    afterEach(() => {
+      jest.clearAllMocks()
+    })
 
     it('should return some data', async () => {
-      nock('https://jamesiv.es').get('/').reply(200, {
-        data: '12345'
+      global.fetch = jest.fn().mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue({data: '12345'}),
+        text: jest.fn().mockResolvedValue('{"data":"12345"}')
       })
 
       const data = await retrieveData({
@@ -22,11 +23,11 @@ describe('fetch', () => {
     })
 
     it('should handle the triple bracket replacements', async () => {
-      nock('https://jives.dev/')
-        .post('/', '{"bestCat":"montezuma"}')
-        .reply(200, {
-          data: '12345'
-        })
+      global.fetch = jest.fn().mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue({data: '12345'}),
+        text: jest.fn().mockResolvedValue('{"data":"12345"}')
+      })
 
       const data = await retrieveData({
         debug: true,
@@ -45,8 +46,6 @@ describe('fetch', () => {
 
     it('should error if improperly formatted json is passed in', async () => {
       try {
-        nock('https://jamesiv.es').get('/').reply(200)
-
         await retrieveData({
           debug: true,
           endpoint: 'https://example.com',
@@ -61,8 +60,10 @@ describe('fetch', () => {
     })
 
     it('should error if the response is not ok', async () => {
-      nock('https://jamesiv.es').post('/').reply(404, {
-        a: 1
+      global.fetch = jest.fn().mockResolvedValue({
+        ok: false,
+        json: jest.fn().mockResolvedValue({a: 1}),
+        text: jest.fn().mockResolvedValue('{"a":1}')
       })
 
       try {
@@ -83,18 +84,18 @@ describe('fetch', () => {
       }
     })
 
-    it('should error if the response is not ok after several retrys', async () => {
+    it('should error if the response is not ok after several retries', async () => {
       jest.setTimeout(1000000)
-
-      try {
-        nock('https://jives.dev').get('/').once().replyWithError({
-          message: 'This is catastrophic'
-        })
-
-        nock('https://jives.dev').get('/').reply(200, {
-          data: '12345'
+      global.fetch = jest
+        .fn()
+        .mockRejectedValueOnce(new Error('This is catastrophic'))
+        .mockResolvedValueOnce({
+          ok: true,
+          json: jest.fn().mockResolvedValue({data: '12345'}),
+          text: jest.fn().mockResolvedValue('{"data":"12345"}')
         })
 
+      try {
         await retrieveData({
           debug: true,
           endpoint: 'https://jives.dev',
@@ -117,7 +118,7 @@ describe('fetch', () => {
       expect(process.env['fetchApiData']).toBe('{"bestCat":"montezuma"}')
     })
 
-    it('should save non standard file types', async () => {
+    it('should save non-standard file types', async () => {
       await generateExport({
         data: 'hello',
         format: 'txt',

__tests__/fetch.test.ts

@@ -1,5 +1,4 @@
 import {exportVariable, setFailed} from '@actions/core'
-import nock from 'nock'
 import {action} from '../src/constants'
 import run from '../src/lib'
 import '../src/main'
@@ -15,38 +14,49 @@ jest.mock('@actions/core', () => ({
 
 describe('lib', () => {
   beforeEach(() => {
-    nock('https://jamesiv.es').get('/').reply(200, {
-      data: '12345'
+    jest.clearAllMocks()
+
+    global.fetch = jest.fn().mockResolvedValue({
+      json: jest.fn().mockResolvedValue({data: '12345'}),
+      text: jest.fn().mockResolvedValue('{"data":"12345"}'),
+      ok: true
     })
   })
 
   afterEach(() => {
-    nock.restore()
     Object.assign(action, JSON.parse(originalAction))
   })
 
-  afterEach(nock.cleanAll)
-
   it('should run through the commands', async () => {
     Object.assign(action, {
       debug: true,
-      endpoint: 'https://jamesiv.es',
+      endpoint: 'https://jives.dev',
       setOutput: true
     })
+
     await run(action)
 
-    expect(exportVariable).toHaveBeenCalled()
+    expect(exportVariable).toHaveBeenCalledTimes(1)
+    expect(global.fetch).toHaveBeenCalledWith(
+      'https://jives.dev',
+      expect.any(Object)
+    )
   })
 
   it('should run through the commands but not save output', async () => {
     Object.assign(action, {
       debug: true,
-      endpoint: 'https://jamesiv.es',
+      endpoint: 'https://jives.dev',
       setOutput: false
     })
+
     await run(action)
 
     expect(exportVariable).toHaveBeenCalledTimes(0)
+    expect(global.fetch).toHaveBeenCalledWith(
+      'https://jives.dev',
+      expect.any(Object)
+    )
   })
 
   it('should throw an error if no endpoint is provided', async () => {
@@ -58,6 +68,7 @@ describe('lib', () => {
     try {
       await run(action)
     } catch (error) {
+      console.error(error)
       expect(setFailed).toHaveBeenCalled()
     }
   })
@@ -73,6 +84,7 @@ describe('lib', () => {
     try {
       await run(action)
     } catch (error) {
+      console.error(error)
       expect(setFailed).toHaveBeenCalled()
     }
   })

__tests__/lib.test.ts

@@ -17,7 +17,7 @@ export default tseslint.config(
     },
     rules: {
       'jest/no-conditional-expect': 'off',
-      '@typescript-eslint/ban-types': [
+      '@typescript-eslint/no-restricted-types': [
         'error',
         {
           types: {