Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
masinnae committed May 20, 2024
1 parent 1194de1 commit f094714
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions frontend/tests/views/GroupView.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import GroupView from "@/views/GroupView.vue"
import {ref} from "vue";

const testGroupQuery = {
data: ref({project_id: 1, id: 1, team_name: "testgroup", members: [{given_name: "test", surname: "member"}]}),
data: ref({project_id: 1, id: 1, num: 1, members: [{given_name: "test", surname: "member"}]}),
isLoading: ref(true),
isError: ref(true),
setLoading(value){
Expand Down Expand Up @@ -100,7 +100,7 @@ describe("GroupView", () => {
});
it("render if student", () => {
const text = wrapper.text()
expect(text).toContain("testgroup")
expect(text).toContain("Groep 1")
expect(text).toContain("Project: testproject")
expect(text).toContain("test member")
expect(wrapper.findComponent(".groupButtons").exists()).toBeTruthy()
Expand Down

0 comments on commit f094714

Please sign in to comment.