refactor(gradle): Refactor manager test mocks #9957

zharinov · 2021-05-11T13:34:36Z

Changes:

Simplify test mocks. Now it doesn't rely on temp dirs.

Context:

Blocks #9932

Documentation (please check one with an [x])

I have updated the documentation, or
No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

Code inspection only, or
Newly added unit tests, or
No new tests but ran on a real repository, or
Both unit tests + ran on a real repository

…gradle-manager-test

zharinov · 2021-05-11T13:36:37Z

@viceice Can you please run this test on Windows?

viceice · 2021-05-11T13:50:03Z

@viceice Can you please run this test on Windows?

Sure, pushed a cleanup commit. Test is running 😉

viceice

Doesn't work as expected

viceice · 2021-05-11T14:09:02Z

Pushed another commit to fully use our fs wrapper, you now need to fix the tests 😉

zharinov · 2021-05-11T14:12:37Z

Thanks, I'll try to test it on my own, using Virtual Box and Windows 10 developer images

viceice · 2021-05-11T14:13:53Z

wsl2, looks like some mocks are missing now?

 FAIL  lib/manager/gradle/index.spec.ts
  ● manager/gradle/index › extractPackageFile › should update an existing module dependency

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should return gradle.kts dependencies

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should return empty if there are no dependencies

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should return empty if there is no dependency report

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should return empty if renovate report is invalid

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use repositories only for current project

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should execute gradlew when available

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should execute gradlew.bat when available on Windows

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should execute gradle if gradlew is not available

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should return gradle dependencies for build.gradle in subdirectories if there is gradlew in the same directory

    ENOENT: no such file or directory, open '/foo/bar/baz/qux/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use docker if required

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use docker even if gradlew is available

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use docker even if gradlew.bat is available on Windows

    ENOENT: no such file or directory, open '/foo/bar/renovate-plugin.gradle'

viceice · 2021-05-11T14:15:23Z

Windows:


    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:101:34)

  ● manager/gradle/index › extractPackageFile › should return gradle.kts dependencies

    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:110:34)

  ● manager/gradle/index › extractPackageFile › should return empty if there are no dependencies

    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:121:34)

  ● manager/gradle/index › extractPackageFile › should return empty if there is no dependency report

    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:130:34)

  ● manager/gradle/index › extractPackageFile › should return empty if renovate report is invalid

    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:139:34)

  ● manager/gradle/index › extractPackageFile › should use repositories only for current project

    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:150:34)

  ● manager/gradle/index › extractPackageFile › should execute gradlew when available

    expect(received).toEqual(expected) // deep equality

    Expected: "/foo/bar/gradlew"
    Received: "/foo/bar/gradlew.bat"

      59 |     fs.stat.mockImplementationOnce((dirname) => {
      60 |       if (wrapperFilename) {
    > 61 |         expect(dirname).toEqual(join(baseDir, wrapperFilename));
         |                         ^
      62 |         return Promise.resolve({
      63 |           isFile: () => true,
      64 |         } as Stats);

      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:61:25)
      at Object.extractAllPackageFiles (lib/manager/gradle/index.ts:96:21)
      at Object.<anonymous> (lib/manager/gradle/index.spec.ts:159:34)

  ● manager/gradle/index › extractPackageFile › should execute gradlew.bat when available on Windows

    ENOENT: no such file or directory, open 'C:\foo\bar\renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should execute gradle if gradlew is not available

    ENOENT: no such file or directory, open 'C:\foo\bar\renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should return gradle dependencies for build.gradle in subdirectories if there is gradlew in the same directory

    ENOENT: no such file or directory, open 'C:\foo\bar\baz\qux\renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use docker if required

    ENOENT: no such file or directory, open 'C:\foo\bar\renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use docker even if gradlew is available

    ENOENT: no such file or directory, open 'C:\foo\bar\renovate-plugin.gradle'



  ● manager/gradle/index › extractPackageFile › should use docker even if gradlew.bat is available on Windows

    ENOENT: no such file or directory, open 'C:\foo\bar\renovate-plugin.gradle'

zharinov · 2021-05-11T14:19:25Z

Can't remember why we continued to use fs-extra in gradle-updates-report.ts. I guess, because util/fs led to test failures 😂

zharinov · 2021-05-11T14:30:38Z

So, I would propose continue with extra-fs mocks for now, after fixing it for Windows.
In the upcoming PR, we refactor gradle-updates-report.ts separatedly.
And then, rewrite mocks for using util/fs.

viceice · 2021-05-11T14:34:15Z

I've changed only a small bit in index.ts so we schould be able to fix mocking here? or is it interferring with gradle-updates-report so there needs to be used our fs layer too?

zharinov · 2021-05-11T14:36:32Z

I'll try to figure it out

zharinov · 2021-05-11T14:38:12Z

My guess it has something to do with proxies.ts re-export

viceice · 2021-05-11T14:47:58Z

My guess it has something to do with proxies.ts re-export

Ah yes, i remember some issues with typescript and reexports. 🤔

renovate/lib/util/fs/index.ts

Line 6 in 460bfe9

export * from './proxies';

That's maybe also the cause for this:

renovate/lib/manager/npm/post-update/npm.spec.ts

Line 28 in 572749a

fs.readFile = jest.fn(() => 'package-lock-contents') as never;

zharinov · 2021-05-11T14:54:08Z

So, let's solve it in another PR. I want to separate test and execution refactoring for this manager. I don't like how it joins paths with localDir being obtained directly from config.

UPD: I don't like gradle manager at all 😁

This reverts commit 3a54398.

This reverts commit fe98bb8.

zharinov · 2021-05-12T06:58:51Z

Now it should pass in Windows platform, I've made my own check

renovate-release · 2021-05-12T15:21:18Z

🎉 This PR is included in version 25.19.0 🎉

The release is available on:

GitHub release
25.19.0

Your semantic-release bot 📦🚀

Sergei Zharinov added 3 commits May 11, 2021 10:31

Use fixture test helper

ff158dc

Merge branch 'main' of github.com:renovatebot/renovate into refactor/…

9fc775c

…gradle-manager-test

Refactor "index.spec.ts"

25c021b

viceice self-requested a review May 11, 2021 13:41

chore: cleanup

fe98bb8

Merge branch 'main' into refactor/gradle-manager-test

0ddac34

viceice reviewed May 11, 2021

View reviewed changes

chore: fix imports

3a54398

Sergei Zharinov added 4 commits May 11, 2021 17:55

Revert "chore: fix imports"

78fb8ca

This reverts commit 3a54398.

Revert "chore: cleanup"

c876412

This reverts commit fe98bb8.

Remove fragile parameter checks

f663b5e

Fix empty snapshots

840fa3c

Merge branch 'main' into refactor/gradle-manager-test

a84efcb

viceice approved these changes May 12, 2021

View reviewed changes

viceice merged commit 0016485 into renovatebot:main May 12, 2021

viceice deleted the refactor/gradle-manager-test branch May 12, 2021 13:41

github-actions bot locked as resolved and limited conversation to collaborators Jun 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(gradle): Refactor manager test mocks #9957

refactor(gradle): Refactor manager test mocks #9957

zharinov commented May 11, 2021 •

edited

zharinov commented May 11, 2021

viceice commented May 11, 2021

viceice left a comment

viceice commented May 11, 2021

zharinov commented May 11, 2021

viceice commented May 11, 2021 •

edited

viceice commented May 11, 2021

zharinov commented May 11, 2021

zharinov commented May 11, 2021

viceice commented May 11, 2021

zharinov commented May 11, 2021

zharinov commented May 11, 2021

viceice commented May 11, 2021 •

edited

zharinov commented May 11, 2021 •

edited

zharinov commented May 12, 2021

renovate-release commented May 12, 2021

refactor(gradle): Refactor manager test mocks #9957

refactor(gradle): Refactor manager test mocks #9957

Conversation

zharinov commented May 11, 2021 • edited

Changes:

Context:

Documentation (please check one with an [x])

How I've tested my work (please tick one)

zharinov commented May 11, 2021

viceice commented May 11, 2021

viceice left a comment

Choose a reason for hiding this comment

viceice commented May 11, 2021

zharinov commented May 11, 2021

viceice commented May 11, 2021 • edited

viceice commented May 11, 2021

zharinov commented May 11, 2021

zharinov commented May 11, 2021

viceice commented May 11, 2021

zharinov commented May 11, 2021

zharinov commented May 11, 2021

viceice commented May 11, 2021 • edited

zharinov commented May 11, 2021 • edited

zharinov commented May 12, 2021

renovate-release commented May 12, 2021

zharinov commented May 11, 2021 •

edited

viceice commented May 11, 2021 •

edited

viceice commented May 11, 2021 •

edited

zharinov commented May 11, 2021 •

edited