Merge pull request #1 from elizabrock/master

Fixing up tests
This commit is contained in:
David Bond 2020-06-25 16:11:31 +01:00 committed by GitHub
commit d5f1550948
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 30 deletions

View file

@ -194,13 +194,3 @@ test("getInputAsArray handles empty lines correctly", () => {
testUtils.setInput("foo", "\n\nbar\n\nbaz\n\n");
expect(actionUtils.getInputAsArray("foo")).toEqual(["bar", "baz"]);
});
test("getInputAsBoolean returns true if the value is set to 'true'", () => {
testUtils.setInput("foo", "true");
expect(actionUtils.getInputAsBoolean("foo")).toEqual(true);
});
test("getInputAsBoolean returns false if the value is set to anything else", () => {
testUtils.setInput("foo", "false");
expect(actionUtils.getInputAsBoolean("foo")).toEqual(false);
});

View file

@ -118,7 +118,8 @@ test("save with exact match returns early", async () => {
expect(failedMock).toHaveBeenCalledTimes(0);
});
test("save with exact match updates when configured", async () => {
test("save with exact match and updates enabled updates the cache", async () => {
const infoMock = jest.spyOn(core, "info");
const failedMock = jest.spyOn(core, "setFailed");
const primaryKey = "Linux-node-bb828da54c148048dd17899ba9fda624811cfb43";
@ -147,9 +148,11 @@ test("save with exact match updates when configured", async () => {
await run();
expect(infoMock).toHaveBeenCalledWith(
`Cache hit occurred on the primary key ${primaryKey}, but updates were enabled, so updating cache.`
);
expect(saveCacheMock).toHaveBeenCalledTimes(1);
expect(saveCacheMock).toHaveBeenCalledWith([inputPath], primaryKey);
expect(failedMock).toHaveBeenCalledTimes(0);
});

View file

@ -6717,6 +6717,7 @@ var Inputs;
Inputs["Key"] = "key";
Inputs["Path"] = "path";
Inputs["RestoreKeys"] = "restore-keys";
Inputs["Update"] = "update";
})(Inputs = exports.Inputs || (exports.Inputs = {}));
var Outputs;
(function (Outputs) {

10
dist/save/index.js vendored
View file

@ -6605,8 +6605,13 @@ function run() {
return;
}
if (utils.isExactKeyMatch(primaryKey, state)) {
core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
return;
if (core.getInput(constants_1.Inputs.Update) === "true") {
core.info(`Cache hit occurred on the primary key ${primaryKey}, but updates were enabled, so updating cache.`);
}
else {
core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
return;
}
}
const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
required: true
@ -6802,6 +6807,7 @@ var Inputs;
Inputs["Key"] = "key";
Inputs["Path"] = "path";
Inputs["RestoreKeys"] = "restore-keys";
Inputs["Update"] = "update";
})(Inputs = exports.Inputs || (exports.Inputs = {}));
var Outputs;
(function (Outputs) {

View file

@ -16,21 +16,25 @@ async function run(): Promise<void> {
}
const state = utils.getCacheState();
// Inputs are re-evaluated before the post action, so we want the original key used for restore
// Inputs are re-evaluted before the post action, so we want the original key used for restore
const primaryKey = core.getState(State.CachePrimaryKey);
if (!primaryKey) {
utils.logWarning(`Error retrieving key from state.`);
return;
}
if (
utils.isExactKeyMatch(primaryKey, state) &&
!utils.getInputAsBoolean(Inputs.Update)
) {
core.info(
`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`
);
return;
if (utils.isExactKeyMatch(primaryKey, state)) {
if (core.getInput(Inputs.Update) === "true") {
core.info(
`Cache hit occurred on the primary key ${primaryKey}, but updates were enabled, so updating cache.`
);
} else {
core.info(
`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`
);
return;
}
}
const cachePaths = utils.getInputAsArray(Inputs.Path, {

View file

@ -56,10 +56,3 @@ export function getInputAsArray(
.map(s => s.trim())
.filter(x => x !== "");
}
export function getInputAsBoolean(
name: string,
options?: core.InputOptions
): boolean {
return core.getInput(name, options) === "true";
}

View file

@ -13,11 +13,13 @@ interface CacheInput {
path: string;
key: string;
restoreKeys?: string[];
update: string;
}
export function setInputs(input: CacheInput): void {
setInput(Inputs.Path, input.path);
setInput(Inputs.Key, input.key);
setInput(Inputs.Update, input.update);
input.restoreKeys &&
setInput(Inputs.RestoreKeys, input.restoreKeys.join("\n"));
}
@ -25,5 +27,6 @@ export function setInputs(input: CacheInput): void {
export function clearInputs(): void {
delete process.env[getInputName(Inputs.Path)];
delete process.env[getInputName(Inputs.Key)];
delete process.env[getInputName(Inputs.Update)];
delete process.env[getInputName(Inputs.RestoreKeys)];
}