From 0e6c2198007099e4e9363c79da95f45a04a7c4e6 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 17 Jan 2023 23:34:49 +0100
Subject: [PATCH] fix: cypress tests

---
 cypress/e2e/project/project-history.spec.ts           | 4 ++--
 cypress/e2e/project/project-view-list.spec.ts         | 6 +++---
 cypress/e2e/task/overview.spec.ts                     | 4 ++--
 cypress/e2e/task/task.spec.ts                         | 8 ++++----
 cypress/e2e/user/logout.spec.ts                       | 2 +-
 src/components/tasks/partials/singleTaskInProject.vue | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cypress/e2e/project/project-history.spec.ts b/cypress/e2e/project/project-history.spec.ts
index 5b43f4852..91ab258c1 100644
--- a/cypress/e2e/project/project-history.spec.ts
+++ b/cypress/e2e/project/project-history.spec.ts
@@ -5,7 +5,7 @@ import {prepareProjects} from './prepareProjects'
 
 describe('Project History', () => {
 	createFakeUserAndLogin()
-	prepareLists()
+	prepareProjects()
 	
 	it('should show a project history on the home page', () => {
 		cy.intercept(Cypress.env('API_URL') + '/namespaces*').as('loadNamespaces')
@@ -46,7 +46,7 @@ describe('Project History', () => {
 		
 		cy.get('body')
 			.should('contain', 'Last viewed')
-		cy.get('[data-cy="listCardGrid"]')
+		cy.get('[data-cy="projectCardGrid"]')
 			.should('not.contain', projects[0].title)
 			.should('contain', projects[1].title)
 			.should('contain', projects[2].title)
diff --git a/cypress/e2e/project/project-view-list.spec.ts b/cypress/e2e/project/project-view-list.spec.ts
index 894444d65..82c737411 100644
--- a/cypress/e2e/project/project-view-list.spec.ts
+++ b/cypress/e2e/project/project-view-list.spec.ts
@@ -13,7 +13,7 @@ describe('Project View Project', () => {
 	it('Should be an empty project', () => {
 		cy.visit('/projects/1')
 		cy.url()
-			.should('contain', '/projects/1/project')
+			.should('contain', '/projects/1/list')
 		cy.get('.project-title h1')
 			.should('contain', 'First Project')
 		cy.get('.project-title .dropdown')
@@ -38,7 +38,7 @@ describe('Project View Project', () => {
 			id: '{increment}',
 			project_id: 1,
 		})
-		cy.visit('/projects/1/project')
+		cy.visit('/projects/1/list')
 
 		cy.get('.tasks .task .tasktext')
 			.contains(tasks[0].title)
@@ -89,7 +89,7 @@ describe('Project View Project', () => {
 			title: i => `task${i}`,
 			project_id: 1,
 		})
-		cy.visit('/projects/1/project')
+		cy.visit('/projects/1/list')
 
 		cy.get('.tasks')
 			.should('contain', tasks[1].title)
diff --git a/cypress/e2e/task/overview.spec.ts b/cypress/e2e/task/overview.spec.ts
index 222b84430..6103f7a31 100644
--- a/cypress/e2e/task/overview.spec.ts
+++ b/cypress/e2e/task/overview.spec.ts
@@ -73,7 +73,7 @@ describe('Home Page Task Overview', () => {
 			due_date: new Date().toISOString(),
 		}, false)
 		
-		cy.visit(`/projects/${tasks[0].project_id}/project`)
+		cy.visit(`/projects/${tasks[0].project_id}/list`)
 		cy.get('.tasks .task')
 			.first()
 			.should('contain.text', newTaskTitle)
@@ -90,7 +90,7 @@ describe('Home Page Task Overview', () => {
 
 		cy.visit('/')
 
-		cy.visit(`/projects/${tasks[0].project_id}/project`)
+		cy.visit(`/projects/${tasks[0].project_id}/list`)
 		cy.get('.task-add textarea')
 			.type(newTaskTitle+'{enter}')
 		cy.visit('/')
diff --git a/cypress/e2e/task/task.spec.ts b/cypress/e2e/task/task.spec.ts
index 0f2554a50..ce2ae88bc 100644
--- a/cypress/e2e/task/task.spec.ts
+++ b/cypress/e2e/task/task.spec.ts
@@ -63,7 +63,7 @@ describe('Task', () => {
 	})
 
 	it('Should be created new', () => {
-		cy.visit('/projects/1/project')
+		cy.visit('/projects/1/list')
 		cy.get('.input[placeholder="Add a new task…"')
 			.type('New Task')
 		cy.get('.button')
@@ -77,7 +77,7 @@ describe('Task', () => {
 	it('Inserts new tasks at the top of the project', () => {
 		TaskFactory.create(1)
 
-		cy.visit('/projects/1/project')
+		cy.visit('/projects/1/list')
 		cy.get('.project-is-empty-notice')
 			.should('not.exist')
 		cy.get('.input[placeholder="Add a new task…"')
@@ -95,7 +95,7 @@ describe('Task', () => {
 	it('Marks a task as done', () => {
 		TaskFactory.create(1)
 
-		cy.visit('/projects/1/project')
+		cy.visit('/projects/1/list')
 		cy.get('.tasks .task .fancycheckbox label.check')
 			.first()
 			.click()
@@ -106,7 +106,7 @@ describe('Task', () => {
 	it('Can add a task to favorites', () => {
 		TaskFactory.create(1)
 
-		cy.visit('/projects/1/project')
+		cy.visit('/projects/1/list')
 		cy.get('.tasks .task .favorite')
 			.first()
 			.click()
diff --git a/cypress/e2e/user/logout.spec.ts b/cypress/e2e/user/logout.spec.ts
index e95174678..0dc69798e 100644
--- a/cypress/e2e/user/logout.spec.ts
+++ b/cypress/e2e/user/logout.spec.ts
@@ -1,5 +1,5 @@
 import {createFakeUserAndLogin} from '../../support/authenticateUser'
-import {createLists} from '../list/prepareLists'
+import {createProjects} from '../project/prepareProjects'
 
 function logout() {
 	cy.get('.navbar .user .username')
diff --git a/src/components/tasks/partials/singleTaskInProject.vue b/src/components/tasks/partials/singleTaskInProject.vue
index afa34f2a4..50f5648d3 100644
--- a/src/components/tasks/partials/singleTaskInProject.vue
+++ b/src/components/tasks/partials/singleTaskInProject.vue
@@ -7,7 +7,7 @@
 		/>
 		
 		<ColorBubble
-			v-if="showProjectColor && projectColor !== ''"
+			v-if="showProjectColor && projectColor !== '' && currentProject.id !== task.projectId"
 			:color="projectColor"
 			class="mr-1"
 		/>