PR Feedback

This commit is contained in:
Josh Gross 2019-11-12 14:40:32 -05:00
parent bae12fc444
commit ead4a0a409
3 changed files with 13 additions and 4 deletions

View file

@ -33,6 +33,11 @@ beforeAll(() => {
return actualUtils.isValidEvent(); return actualUtils.isValidEvent();
}); });
jest.spyOn(actionUtils, "getSupportedEvents", ).mockImplementation(() => {
const actualUtils = jest.requireActual("../src/utils/actionUtils");
return actualUtils.getSupportedEvents();
});
jest.spyOn(io, "which").mockImplementation(tool => { jest.spyOn(io, "which").mockImplementation(tool => {
return Promise.resolve(tool); return Promise.resolve(tool);
}); });
@ -53,7 +58,7 @@ test("restore with invalid event", async () => {
process.env[Events.Key] = invalidEvent; process.env[Events.Key] = invalidEvent;
await run(); await run();
expect(failedMock).toHaveBeenCalledWith( expect(failedMock).toHaveBeenCalledWith(
`Event Validation Error: The event type ${invalidEvent} is not supported. Only \`push\` and \`pull_request\` events are supported at this time.` `Event Validation Error: The event type ${invalidEvent} is not supported. Only push, pull_request events are supported at this time.`
); );
}); });

View file

@ -5,7 +5,7 @@ import * as io from "@actions/io";
import * as path from "path"; import * as path from "path";
import * as cacheHttpClient from "./cacheHttpClient"; import * as cacheHttpClient from "./cacheHttpClient";
import { Inputs, State } from "./constants"; import { Events, Inputs, State } from "./constants";
import * as utils from "./utils/actionUtils"; import * as utils from "./utils/actionUtils";
async function run() { async function run() {
@ -13,7 +13,7 @@ async function run() {
// Validate inputs, this can cause task failure // Validate inputs, this can cause task failure
if (!utils.isValidEvent()) { if (!utils.isValidEvent()) {
core.setFailed( core.setFailed(
`Event Validation Error: The event type ${process.env["GITHUB_EVENT_NAME"]} is not supported. Only \`push\` and \`pull_request\` events are supported at this time.` `Event Validation Error: The event type ${process.env[Events.Key]} is not supported. Only ${utils.getSupportedEvents().join(", ")} events are supported at this time.`
); );
} }

View file

@ -90,5 +90,9 @@ export function resolvePath(filePath: string): string {
// See GitHub Context https://help.github.com/actions/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#github-context // See GitHub Context https://help.github.com/actions/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#github-context
export function isValidEvent(): boolean { export function isValidEvent(): boolean {
const githubEvent = process.env[Events.Key] || ""; const githubEvent = process.env[Events.Key] || "";
return githubEvent === Events.Push || githubEvent === Events.PullRequest; return getSupportedEvents().includes(githubEvent);
}
export function getSupportedEvents(): string[] {
return [Events.Push, Events.PullRequest];
} }