fixed merge conflicts

Author: Erlend Storsve

backend/rest/data/houses.json

@@ -1 +1 @@
-[{"location":"Oscar Wistings vei 6","user":{"email":"[email protected]","password":"123"},"available":true},{"location":"location","user":{"email":"[email protected]","password":"passord"},"available":true}]
+[{"location":"Oscar Wistings vei 6","user":{"email":"[email protected]","password":"123"},"available":true},{"location":"location","user":{"email":"[email protected]","password":"passord"},"available":true},{"location":"rwar","user":{"email":"[email protected]","password":"123"},"available":true}]

frontend/README.md

@@ -4,6 +4,7 @@ Written in react. Created using facebook's create-react-app.
 Configured for tailwindcss as a replacement for normal css.
 
 ## How to run
+
 - make sure you have followed the steps on how to run the backend folder first [backend/readme.md](backend/readme.md)
 - cd to frontend folder
 - If it's your first time running this version run "npm i"

frontend/src/components/house.js

@@ -4,8 +4,7 @@ import { Link } from "react-router-dom"
 
 const house = ({ house }) => {
   return (
-    // links to housePage
-    <Link to={"/house/" + house.location}>
+    <Link to={"/house/" + house.location} className="house-link">
       <div className="house">
         {/* image is a default one to keep things simple */}
         <img src={Image} className="w-24 h-16" alt="house" />

frontend/src/tests/addHouse.test.js

@@ -0,0 +1,20 @@
+import { mount } from "@cypress/react"
+import { BrowserRouter as Router } from "react-router-dom"
+import AddHouse from "../components/addHouse"
+
+const setup = () => {
+  mount(
+    // Man må mounte <Router> for å unngå "You should not use <Link> outside a <Router>" error fra cypress
+    <Router>
+      <AddHouse />
+    </Router>
+  )
+}
+
+describe("Add House Page", () => {
+  it("input works", () => {
+    setup()
+
+    cy.get("input").type("test").invoke("val").should("equal", "test")
+  })
+})

frontend/src/tests/house.test.js

@@ -0,0 +1,33 @@
+import { mount } from "@cypress/react"
+import { BrowserRouter as Router } from "react-router-dom"
+import House from "../components/house"
+
+const house = {
+  location: "Location",
+  user: "[email protected]",
+  available: true,
+}
+
+const setup = () => {
+  mount(
+    // Man må mounte <Router> for å unngå "You should not use <Link> outside a <Router>" error fra cypress
+    <Router>
+      <House house={house} />
+    </Router>
+  )
+}
+
+describe("House", () => {
+  it("location is correct", () => {
+    setup()
+
+    cy.get(".house-location").contains("Location")
+  })
+
+  it("clicking house redirects to housepage", () => {
+    setup()
+
+    cy.get(".house-link").click()
+    cy.location("pathname").should("eq", "/house/Location")
+  })
+})

frontend/src/tests/housePage.test.js

@@ -0,0 +1,28 @@
+import { mount } from "@cypress/react"
+import { BrowserRouter as Router } from "react-router-dom"
+import HousePage from "../components/housePage"
+
+const houses = [
+  {
+    location: "Location",
+    user: "[email protected]",
+    available: true,
+  },
+]
+
+const setup = () => {
+  mount(
+    // Man må mounte <Router> for å unngå "You should not use <Link> outside a <Router>" error fra cypress
+    <Router>
+      <HousePage houses={houses} user="[email protected]" />
+    </Router>
+  )
+}
+
+describe("Add House Page", () => {
+  it("if no house is found 404 is shown", () => {
+    setup()
+
+    cy.get("h1").contains("404")
+  })
+})