From ab3dc4e6b36d9900491cb2cc7b222ac8f5d8e16c Mon Sep 17 00:00:00 2001
From: Oleg Krivtsov <olegkrivtsov@gmail.com>
Date: Thu, 16 Dec 2021 19:49:48 +0700
Subject: [PATCH] test(manager/gradle-wrapper): fix snapshot regression in
 gradle-wrapper (#13144)

---
 .../__snapshots__/artifacts.spec.ts.snap      |  2 +-
 .../gradle-wrapper/artifacts-real.spec.ts     | 22 ++++++++++---------
 lib/manager/gradle-wrapper/artifacts.spec.ts  |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/manager/gradle-wrapper/__snapshots__/artifacts.spec.ts.snap b/lib/manager/gradle-wrapper/__snapshots__/artifacts.spec.ts.snap
index 0e5de361fc..e842281010 100644
--- a/lib/manager/gradle-wrapper/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/gradle-wrapper/__snapshots__/artifacts.spec.ts.snap
@@ -27,7 +27,7 @@ Array [
 exports[`manager/gradle-wrapper/artifacts replaces existing value 1`] = `
 Array [
   Object {
-    "cmd": "<gradlew> wrapper --gradle-version 6.3",
+    "cmd": "<gradlew> wrapper --gradle-distribution-url https://services.gradle.org/distributions/gradle-6.3-bin.zip",
     "options": Object {
       "cwd": "/root/project/lib/manager/gradle-wrapper/__fixtures__/testFiles",
       "encoding": "utf-8",
diff --git a/lib/manager/gradle-wrapper/artifacts-real.spec.ts b/lib/manager/gradle-wrapper/artifacts-real.spec.ts
index 96f4047e78..6b61079827 100644
--- a/lib/manager/gradle-wrapper/artifacts-real.spec.ts
+++ b/lib/manager/gradle-wrapper/artifacts-real.spec.ts
@@ -1,11 +1,10 @@
-import { readFileSync } from 'fs-extra';
+import { readFile, readFileSync } from 'fs-extra';
 import Git from 'simple-git';
 import { resolve } from 'upath';
 import * as httpMock from '../../../test/http-mock';
 import { git, partial } from '../../../test/util';
 import { GlobalConfig } from '../../config/global';
 import type { RepoGlobalConfig } from '../../config/types';
-import { readLocalFile } from '../../util/fs';
 import type { StatusResult } from '../../util/git/types';
 import { ifSystemSupportsGradle } from '../gradle/deep/__testutil__/gradle';
 import type { UpdateArtifactsConfig } from '../types';
@@ -23,8 +22,8 @@ const config: UpdateArtifactsConfig = {
   newValue: '5.6.4',
 };
 
-function readString(path: string): Promise<string> {
-  return readLocalFile(path, 'utf8');
+function readString(...paths: string[]): Promise<string> {
+  return readFile(resolve(fixtures, ...paths), 'utf8');
 }
 
 function readBinSync(...paths: string[]): Buffer {
@@ -65,7 +64,7 @@ describe('manager/gradle-wrapper/artifacts-real', () => {
         packageFileName: 'gradle/wrapper/gradle-wrapper.properties',
         updatedDeps: [],
         newPackageFileContent: await readString(
-          `../expectedFiles/gradle/wrapper/gradle-wrapper.properties`
+          `./expectedFiles/gradle/wrapper/gradle-wrapper.properties`
         ),
         config: { ...config, newValue: '6.3' },
       });
@@ -123,7 +122,7 @@ describe('manager/gradle-wrapper/artifacts-real', () => {
         packageFileName: 'gradle/wrapper/gradle-wrapper.properties',
         updatedDeps: [],
         newPackageFileContent: await readString(
-          `../testFiles/gradle/wrapper/gradle-wrapper.properties`
+          `./testFiles/gradle/wrapper/gradle-wrapper.properties`
         ),
         config,
       });
@@ -147,7 +146,7 @@ describe('manager/gradle-wrapper/artifacts-real', () => {
         packageFileName: 'gradle/wrapper/gradle-wrapper.properties',
         updatedDeps: [],
         newPackageFileContent: await readString(
-          `../testFiles/gradle/wrapper/gradle-wrapper.properties`
+          `./testFiles/gradle/wrapper/gradle-wrapper.properties`
         ),
         config,
       });
@@ -174,7 +173,7 @@ describe('manager/gradle-wrapper/artifacts-real', () => {
         packageFileName: 'gradle/wrapper/gradle-wrapper.properties',
         updatedDeps: [],
         newPackageFileContent: await readString(
-          `../testFiles/gradle/wrapper/gradle-wrapper.properties`
+          `./testFiles/gradle/wrapper/gradle-wrapper.properties`
         ),
         config,
       });
@@ -218,7 +217,7 @@ describe('manager/gradle-wrapper/artifacts-real', () => {
         })
       );
 
-      const newContent = await readString(`../gradle-wrapper-sum.properties`);
+      const newContent = await readString(`./gradle-wrapper-sum.properties`);
 
       const result = await gradleWrapper.updateArtifacts({
         packageFileName: 'gradle/wrapper/gradle-wrapper.properties',
@@ -238,7 +237,10 @@ describe('manager/gradle-wrapper/artifacts-real', () => {
       expect(result[0].artifactError).toBeUndefined();
 
       expect(
-        await readString(`gradle/wrapper/gradle-wrapper.properties`)
+        await readString(
+          adminConfig.localDir,
+          `gradle/wrapper/gradle-wrapper.properties`
+        )
       ).toEqual(newContent);
 
       expect(httpMock.getTrace()).toEqual([
diff --git a/lib/manager/gradle-wrapper/artifacts.spec.ts b/lib/manager/gradle-wrapper/artifacts.spec.ts
index 28253c8785..4d042f021f 100644
--- a/lib/manager/gradle-wrapper/artifacts.spec.ts
+++ b/lib/manager/gradle-wrapper/artifacts.spec.ts
@@ -1,4 +1,4 @@
-import { stat } from 'fs-extra';
+import { readFile, stat } from 'fs-extra';
 import { resolve } from 'upath';
 import { envMock, exec, mockExecAll } from '../../../test/exec-util';
 import * as httpMock from '../../../test/http-mock';
@@ -37,7 +37,7 @@ addReplacingSerializer('gradlew.bat', '<gradlew>');
 addReplacingSerializer('./gradlew', '<gradlew>');
 
 function readString(...paths: string[]): Promise<string> {
-  return fs.readLocalFile(resolve(fixtures, ...paths), 'utf8');
+  return readFile(resolve(fixtures, ...paths), 'utf8');
 }
 
 describe('manager/gradle-wrapper/artifacts', () => {
-- 
GitLab