diff --git a/src/components/ChatComponents/RentalMessage.vue b/src/components/ChatComponents/RentalMessage.vue index 9bfaeaaa58b610f1e1b45605e1dbcb6ff31de39e..ba86c9f14a778c7767390a9c5c54e4aa7dba7226 100644 --- a/src/components/ChatComponents/RentalMessage.vue +++ b/src/components/ChatComponents/RentalMessage.vue @@ -49,7 +49,7 @@ <script> import axios from "axios"; import { tokenHeader, parseCurrentUser } from "@/utils/token-utils"; -import { getItemPictures, } from "@/utils/apiutil"; +import { getItemPictures } from "@/utils/apiutil"; export default { props: { @@ -61,7 +61,7 @@ export default { data() { return { image: null, - } + }; }, computed: { userID() { @@ -113,8 +113,8 @@ export default { if (images.length > 0) { this.image = images[0].picture; } else { - this.image = "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8Mnx8dmlld3xlbnwwfHwwfHw%3D&w=1000&q=80"; - + this.image = + "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8Mnx8dmlld3xlbnwwfHwwfHw%3D&w=1000&q=80"; } }, }, diff --git a/tests/unit/component-tests/renting-compnents-tests/new-rent.spec.js b/tests/unit/component-tests/renting-compnents-tests/new-rent.spec.js index 69377d52bd3db913b78280eacb45c11f6013bc39..c4cb88e85e7a68134b52dba817ebd7375e29888b 100644 --- a/tests/unit/component-tests/renting-compnents-tests/new-rent.spec.js +++ b/tests/unit/component-tests/renting-compnents-tests/new-rent.spec.js @@ -2,30 +2,14 @@ import { mount } from "@vue/test-utils"; import NewRent from "@/components/RentingComponents/NewRent.vue"; import axios from "axios"; -// jest.mock("@/utils/token-utils", () => { -// return { -// tokenHeader: () => { -// return {}; -// }, -// parseCurrentUser: () => { -// return { accountId: 1 }; -// }, -// }; -// }); - -jest.mock("@/utils/apiutil", () => { - return { - postNewRent: () => { - return new Promise((resolve) => { - resolve([]); - }); - }, - }; -}); jest.mock("axios"); - +let mockRouter; describe("Confirm and send a rent request", () => { + mockRouter = { + go: jest.fn() + } + let wrapper; beforeEach(() => { wrapper = mount(NewRent, { @@ -40,6 +24,11 @@ describe("Confirm and send a rent request", () => { isAccepted: false, }, }, + global:{ + mocks:{ + $router: mockRouter + } + } }); }); @@ -54,15 +43,19 @@ describe("Confirm and send a rent request", () => { expect(wrapper.find("#price").text()).toEqual("Totaltpris: 200 kr"); }); - it("Check that clicking rent opens confirmbox",async () => { + it("Check that clicking rent sends post request", async () => { const button = wrapper.find("#confirmButton"); axios.post.mockResolvedValueOnce(); - button.trigger("click"); - + button.trigger("click"); await wrapper.vm.$nextTick(); - - - // expect(wrapper.find("notification-modal").exists()).toBeTruthy(); expect(axios.post).toHaveBeenCalledTimes(1); + }); + + it("Checks that page is reloaded when cancelButton is press", async () =>{ + const button = wrapper.find("#cancelButton"); + button.trigger("click"); + await wrapper.vm.$nextTick(); + expect(mockRouter.go).toHaveBeenCalledTimes(1); + expect(mockRouter.go).toHaveBeenCalledWith(0); }) }); diff --git a/tests/unit/component-tests/user-component-tests/user-items.spec.js b/tests/unit/component-tests/user-component-tests/user-items.spec.js index 2f16feb21bc040b09b6a72400abb79d8f53b849b..7640696dee98524a786e6f059aa1520e6934a429 100644 --- a/tests/unit/component-tests/user-component-tests/user-items.spec.js +++ b/tests/unit/component-tests/user-component-tests/user-items.spec.js @@ -34,7 +34,4 @@ describe("UserItems component", () => { it("Check headline", () => { expect(wrapper.find("#headline").text()).toMatch("Mine gjenstander"); }); - - - });