diff --git a/src/components/RentingComponents/NewRent.vue b/src/components/RentingComponents/NewRent.vue index 7ced0d6da6b8575e6fa37f287ddc3ae464fa0072..61d3373f07f517e8fe79a115149fc50e06635eca 100644 --- a/src/components/RentingComponents/NewRent.vue +++ b/src/components/RentingComponents/NewRent.vue @@ -42,6 +42,7 @@ </div> <div> <notification-modal + id="notification-modal" @click="routeToHome" :visible="confirmed" :title="'Vellykket'" diff --git a/src/components/UserProfileComponents/UserItems.vue b/src/components/UserProfileComponents/UserItems.vue index 418a4f22fa9e684959fe6cfa2d5033c7ce5671c3..fffd6bcbdb23601bcce773e666aa591811fddc76 100644 --- a/src/components/UserProfileComponents/UserItems.vue +++ b/src/components/UserProfileComponents/UserItems.vue @@ -311,6 +311,7 @@ export default { .cardContainer { position: relative; } + .DotButton { position: absolute; right: 40px; 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 3f8ffafa68bf5dd606afdeda9214b57871ff174f..d9be9b0e11106c7620e11f169bdd5c71d593c625 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 @@ -1,16 +1,22 @@ import { mount } from "@vue/test-utils"; import NewRent from "@/components/RentingComponents/NewRent.vue"; +import axios from "axios"; -describe("Confirm and send a rent request", () => { - let wrapper; - const route = { - params: { - id: 1, +jest.mock("@/utils/token-utils", () => { + return { + tokenHeader: () => { + return {}; + }, + parseCurrentUser: () => { + return { accountId: 1 }; }, }; - const router = { - push: jest.fn(), - }; +}); +jest.mock("axios"); + + +describe("Confirm and send a rent request", () => { + let wrapper; beforeEach(() => { wrapper = mount(NewRent, { props: { @@ -24,12 +30,6 @@ describe("Confirm and send a rent request", () => { isAccepted: false, }, }, - global: { - mocks: { - $route: route, - $router: router, - }, - }, }); }); @@ -37,10 +37,23 @@ describe("Confirm and send a rent request", () => { expect(wrapper.exists()).toBeTruthy(); }); - it("Check if fields show correct informations", () => { + it("Check that fields show correct informations", () => { expect(wrapper.find("#rentTitle").text()).toEqual("Telt"); expect(wrapper.find("#fromTime").text()).toMatch("19. September 2022"); expect(wrapper.find("#toTime").text()).toMatch("23. September 2022"); expect(wrapper.find("#price").text()).toEqual("Totaltpris: 200 kr"); }); + + it("Check that clicking rent opens confirmbox",async () => { + wrapper.find("#confirmButton").trigger("click"); + + + // await wrapper.vm.$nextTick(); + await axios.put.mockResolvedValueOnce(props.newRentBox); + + + + // expect(wrapper.find("notification-modal").exists()).toBeTruthy(); + expect(axios.post).toHaveBeenCalledTimes(1); + }) }); 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 7640696dee98524a786e6f059aa1520e6934a429..3fcede698c44acd30e2b2721b1283aa2365c1b3a 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,4 +34,8 @@ describe("UserItems component", () => { it("Check headline", () => { expect(wrapper.find("#headline").text()).toMatch("Mine gjenstander"); }); + + // it("Check title", () => { + // expect(wrapper.findAll(".ItemCardPage")[0].exists()).toBeTruthy(); + // }) });