Make tests run again

pkg/models/label_rights.go

@@ -74,7 +74,7 @@ func (l *Label) hasAccessToLabel(a web.Auth) (has bool, maxRight int, err error)
 	// Get all labels associated with these tasks
 	ll := &LabelTask{}
 	has, err = x.Table("labels").
-		Select("labels_task.*").
+		Select("label_task.*").
 		Join("LEFT", "label_task", "label_task.label_id = labels.id").
 		Where("label_task.label_id is not null OR labels.created_by_id = ?", a.GetID()).
 		Or(builder.In("label_task.task_id", taskIDs)).

pkg/models/label_task_test.go

@@ -191,11 +191,11 @@ func TestLabelTask_Create(t *testing.T) {
 				CRUDable: tt.fields.CRUDable,
 				Rights:   tt.fields.Rights,
 			}
-			allowed, _ := l.CanCreate(tt.args.a)
+			allowed, err := l.CanCreate(tt.args.a)
 			if !allowed && !tt.wantForbidden {
 				t.Errorf("LabelTask.CanCreate() forbidden, want %v", tt.wantForbidden)
 			}
-			err := l.Create(tt.args.a)
+			err = l.Create(tt.args.a)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("LabelTask.Create() error = %v, wantErr %v", err, tt.wantErr)
 			}

pkg/models/label_test.go

@@ -240,7 +240,7 @@ func TestLabel_ReadOne(t *testing.T) {
 				Rights:      tt.fields.Rights,
 			}
 
-			allowed, _ := l.CanRead(tt.auth)
+			allowed, _, _ := l.CanRead(tt.auth)
 			if !allowed && !tt.wantForbidden {
 				t.Errorf("Label.CanRead() forbidden, want %v", tt.wantForbidden)
 			}

pkg/models/namespace_test.go

@@ -47,7 +47,7 @@ func TestNamespace_Create(t *testing.T) {
 	assert.NoError(t, err)
 
 	// check if it really exists
-	allowed, err = dummynamespace.CanRead(doer)
+	allowed, _, err = dummynamespace.CanRead(doer)
 	assert.NoError(t, err)
 	assert.True(t, allowed)
 	err = dummynamespace.ReadOne()
@@ -78,7 +78,7 @@ func TestNamespace_Create(t *testing.T) {
 	// Check if it was updated
 	assert.Equal(t, "Dolor sit amet.", dummynamespace.Description)
 	// Get it and check it again
-	allowed, err = dummynamespace.CanRead(doer)
+	allowed, _, err = dummynamespace.CanRead(doer)
 	assert.NoError(t, err)
 	assert.True(t, allowed)
 	err = dummynamespace.ReadOne()
@@ -116,7 +116,7 @@ func TestNamespace_Create(t *testing.T) {
 	assert.True(t, IsErrNamespaceDoesNotExist(err))
 
 	// Check if it was successfully deleted
-	allowed, err = dummynamespace.CanRead(doer)
+	allowed, _, err = dummynamespace.CanRead(doer)
 	assert.False(t, allowed)
 	assert.Error(t, err)
 	assert.True(t, IsErrNamespaceDoesNotExist(err))

pkg/models/task_attachment_test.go

@@ -165,14 +165,14 @@ func TestTaskAttachment_Rights(t *testing.T) {
 		t.Run("Allowed", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
 			ta := &TaskAttachment{TaskID: 1}
-			can, err := ta.CanRead(u)
+			can, _, err := ta.CanRead(u)
 			assert.NoError(t, err)
 			assert.True(t, can)
 		})
 		t.Run("Forbidden", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
 			ta := &TaskAttachment{TaskID: 14}
-			can, err := ta.CanRead(u)
+			can, _, err := ta.CanRead(u)
 			assert.NoError(t, err)
 			assert.False(t, can)
 		})

pkg/models/teams_rights_test.go

@@ -104,7 +104,7 @@ func TestTeam_CanDoSomething(t *testing.T) {
 			if got, _ := tm.CanUpdate(tt.args.a); got != tt.want["CanUpdate"] {
 				t.Errorf("Team.CanUpdate() = %v, want %v", got, tt.want["CanUpdate"])
 			}
-			if got, _ := tm.CanRead(tt.args.a); got != tt.want["CanRead"] {
+			if got, _, _ := tm.CanRead(tt.args.a); got != tt.want["CanRead"] {
 				t.Errorf("Team.CanRead() = %v, want %v", got, tt.want["CanRead"])
 			}
 			if got, _ := tm.IsAdmin(tt.args.a); got != tt.want["IsAdmin"] {