Merge pull request #1426 from mikepenz/feature/upgrade_dependencies_j…

…est_fix

Upgrade remaining dependency | Fix jest setup

__tests__/configuration.test.ts

@@ -1,6 +1,6 @@
-
 import {mergeConfiguration, parseConfiguration, resolveConfiguration} from '../src/utils.js'
-import { clear } from "../src/transform.js";
+import {clear} from '../src/transform.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/demo/demo.test.ts

@@ -1,6 +1,7 @@
 import {mergeConfiguration, resolveConfiguration} from '../../src/utils.js'
 import {ReleaseNotesBuilder} from '../../src/releaseNotesBuilder.js'
 import {GithubRepository} from '../../src/repositories/GithubRepository.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 

__tests__/gitea/releaseNotesBuilderGitea.test.ts

@@ -2,6 +2,7 @@ import {mergeConfiguration, resolveConfiguration} from '../../src/utils.js'
 import {ReleaseNotesBuilder} from '../../src/releaseNotesBuilder.js'
 import {GiteaRepository} from '../../src/repositories/GiteaRepository.js'
 import {clear} from '../../src/transform.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/gitea/releaseNotesBuilderPullGitea.test.ts

@@ -4,6 +4,7 @@ import {Options, pullData} from '../../src/pr-collector/prCollector.js'
 import {GiteaRepository} from '../../src/repositories/GiteaRepository.js'
 import {clear} from '../../src/transform.js'
 import {ReleaseNotesOptions} from '../../src/releaseNotesBuilder.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/main.test.ts

@@ -3,10 +3,15 @@ import * as process from 'process'
 import * as cp from 'child_process'
 import * as fs from 'fs'
 import {clear} from '../src/transform.js'
+import {jest} from '@jest/globals'
+import { fileURLToPath } from 'url';
 
 jest.setTimeout(180000)
 clear()
 
+const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
+const __dirname = path.dirname(__filename); // get the name of the directory
+
 test('missing values should result in failure', () => {
   expect.assertions(1)
 

__tests__/regexUtils.test.ts

@@ -1,6 +1,7 @@
 import {transformStringToValue, validateRegex} from '../src/pr-collector/regexUtils.js'
 import {Regex} from '../src/pr-collector/types.js'
 import {clear} from '../src/transform.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/releaseNotesBuilder.test.ts

@@ -2,6 +2,7 @@ import {mergeConfiguration, resolveConfiguration} from '../src/utils.js'
 import {ReleaseNotesBuilder} from '../src/releaseNotesBuilder.js'
 import {GithubRepository} from '../src/repositories/GithubRepository.js'
 import {clear} from '../src/transform.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/releaseNotesBuilderPull.test.ts

@@ -4,6 +4,7 @@ import {Options, pullData} from '../src/pr-collector/prCollector.js'
 import {GithubRepository} from '../src/repositories/GithubRepository.js'
 import {clear} from '../src/transform.js'
 import {ReleaseNotesOptions} from '../src/releaseNotesBuilder.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/tags.test.ts

@@ -2,6 +2,7 @@ import {TagResolver} from '../src/configuration.js'
 import {validateRegex} from '../src/pr-collector/regexUtils.js'
 import {filterTags, prepareAndSortTags, TagInfo, transformTags} from '../src/pr-collector/tags.js'
 import {clear} from '../src/transform.js'
+import {jest} from '@jest/globals'
 
 jest.setTimeout(180000)
 clear()

__tests__/transform.test.ts

@@ -1,15 +1,33 @@
 import {buildChangelog} from '../src/transform.js'
 import moment from 'moment'
-import {DefaultConfiguration} from '../src/configuration.js'
+import {Configuration, DefaultConfiguration} from '../src/configuration.js'
 import {PullRequestInfo} from '../src/pr-collector/pullRequests.js'
 import {DefaultDiffInfo} from '../src/pr-collector/commits.js'
 import {GithubRepository} from '../src/repositories/GithubRepository.js'
 import {clear} from '../src/transform.js'
-import { buildChangelogTest } from "./utils.js";
+import {jest} from '@jest/globals'
+import {BaseRepository} from '../src/repositories/BaseRepository.js'
 
 jest.setTimeout(180000)
 clear()
 
+const buildChangelogTest = (config: Configuration, prs: PullRequestInfo[], repositoryUtils: BaseRepository): string => {
+  return buildChangelog(DefaultDiffInfo, prs, {
+    owner: 'mikepenz',
+    repo: 'test-repo',
+    fromTag: {name: '1.0.0'},
+    toTag: {name: '2.0.0'},
+    includeOpen: false,
+    failOnError: false,
+    fetchReviewers: false,
+    fetchReleaseInformation: false,
+    fetchReviews: false,
+    mode: 'PR',
+    configuration: config,
+    repositoryUtils
+  })
+}
+
 const configuration = Object.assign({}, DefaultConfiguration)
 configuration.categories = [
   {

__tests__/transformNested.test.ts

@@ -1,15 +1,54 @@
 import moment from 'moment'
-import {DefaultConfiguration} from '../src/configuration.js'
+import {Configuration, DefaultConfiguration} from '../src/configuration.js'
 import {PullRequestInfo} from '../src/pr-collector/pullRequests.js'
 import {GithubRepository} from '../src/repositories/GithubRepository.js'
-import {clear} from '../src/transform.js'
-import {buildChangelogTest, buildPullRequeset} from './utils.js'
+import {buildChangelog, clear} from '../src/transform.js'
+import {jest} from '@jest/globals'
+import {BaseRepository} from '../src/repositories/BaseRepository.js'
+import {DefaultDiffInfo} from '../src/pr-collector/commits.js'
 
 jest.setTimeout(180000)
 clear()
 
 const repositoryUtils = new GithubRepository(process.env.GITEA_TOKEN || '', undefined, '.')
+const buildChangelogTest = (config: Configuration, prs: PullRequestInfo[], repositoryUtils: BaseRepository): string => {
+  return buildChangelog(DefaultDiffInfo, prs, {
+    owner: 'mikepenz',
+    repo: 'test-repo',
+    fromTag: {name: '1.0.0'},
+    toTag: {name: '2.0.0'},
+    includeOpen: false,
+    failOnError: false,
+    fetchReviewers: false,
+    fetchReleaseInformation: false,
+    fetchReviews: false,
+    mode: 'PR',
+    configuration: config,
+    repositoryUtils
+  })
+}
 
+const buildPullRequeset = (number: number, title: string, labels: string[] = ['feature']): PullRequestInfo => {
+  return {
+    number,
+    title,
+    htmlURL: '',
+    baseBranch: '',
+    createdAt: moment(),
+    mergedAt: moment(),
+    mergeCommitSha: 'sha',
+    author: 'Author',
+    authorName: 'Author',
+    repoName: 'test-repo',
+    labels,
+    milestone: '',
+    body: '',
+    assignees: [],
+    requestedReviewers: [],
+    approvedReviewers: [],
+    status: 'merged'
+  }
+}
 // test set of PRs with lables predefined
 const pullRequestsWithLabels: PullRequestInfo[] = []
 pullRequestsWithLabels.push(