spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

FBOS beta tag name fetch fix

pull/1265/head
gabrielburnworth 2019-07-10 15:45:58 -07:00
parent 3976d0767c
commit bbc2b24ea7
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/devices/__tests__/actions_test.ts
View File

@ -364,17 +364,21 @@ describe("fetchReleases()", () => {
});
describe("fetchLatestGHBetaRelease()", () => {
it("fetches latest beta OS release version", async () => {
mockGetRelease = Promise.resolve({ data: [{ tag_name: "v1.0.0-beta" }] });
const dispatch = jest.fn();
await actions.fetchLatestGHBetaRelease("url/001")(dispatch);
expect(axios.get).toHaveBeenCalledWith("url");
expect(error).not.toHaveBeenCalled();
expect(dispatch).toHaveBeenCalledWith({
payload: { version: "1.0.0-beta", commit: undefined },
type: Actions.FETCH_BETA_OS_UPDATE_INFO_OK
const testFetchBeta = (tag_name: string, version: string) =>
it(`fetches latest beta OS release version: ${tag_name}`, async () => {
mockGetRelease = Promise.resolve({ data: [{ tag_name }] });
const dispatch = jest.fn();
await actions.fetchLatestGHBetaRelease("url/001")(dispatch);
expect(axios.get).toHaveBeenCalledWith("url");
expect(error).not.toHaveBeenCalled();
expect(dispatch).toHaveBeenCalledWith({
payload: { version, commit: undefined },
type: Actions.FETCH_BETA_OS_UPDATE_INFO_OK
});
});
});
testFetchBeta("v1.0.0-beta", "1.0.0-beta");
testFetchBeta("v1.0.0-rc1", "1.0.0-rc1");
it("fails to fetches latest beta OS release version", async () => {
mockGetRelease = Promise.reject("error");

4
frontend/devices/actions.ts
View File

@ -180,8 +180,8 @@ export const fetchLatestGHBetaRelease =
axios
.get<GithubRelease[]>(releasesURL)
.then(resp => {
const latestBeta = resp.data
.filter(x => x.tag_name.includes("beta"))[0];
const latestBeta = resp.data.filter(x =>
x.tag_name.includes("beta") || x.tag_name.includes("rc"))[0];
const { tag_name, target_commitish } = latestBeta;
const version = tagNameToVersionString(tag_name);
dispatch({