gisle/stufflog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests.
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
gisle
2020-02-04 19:04:03 +01:00
parent 54234e3457
commit 9feb4575c9
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+3 -3
View File
@@ -8,7 +8,7 @@ steps:
image: golang:1.11 image: golang:1.11
commands: commands:
- go mod download - go mod download
- CGO_ENABLED=0 go build -ldflags "-w -s" -o /build/lektura main.go - CGO_ENABLED=0 go build -ldflags "-w -s" -o main.go
when: when:
event: event:
exclude: exclude:
@@ -18,7 +18,7 @@ steps:
image: golang:1.12 image: golang:1.12
commands: commands:
- go mod download - go mod download
- CGO_ENABLED=0 go build -ldflags "-w -s" -o /build/lektura main.go - CGO_ENABLED=0 go build -ldflags "-w -s" main.go
when: when:
event: event:
exclude: exclude:
@@ -28,7 +28,7 @@ steps:
image: golang:1.13 image: golang:1.13
commands: commands:
- go mod download - go mod download
- CGO_ENABLED=0 go build -ldflags "-w -s" -o /build/lektura main.go - CGO_ENABLED=0 go build -ldflags "-w -s" -o main.go
when: when:
event: event:
exclude: exclude:
database/drivers/bolt/activity_test.go
+14 -14
View File
@@ -30,9 +30,9 @@ func TestActivityRepository(t *testing.T) {
UserID: testUser1.ID, UserID: testUser1.ID,
Icon: "cube", Icon: "cube",
SubActivities: []models.SubActivity{ SubActivities: []models.SubActivity{
{ID: "S1001", Name: "Practice", UnitName: "minute", Multiplier: 15}, {ID: "S1001", Name: "Practice", UnitName: "minute", Value: 15},
{ID: "S1002", Name: "Tutorial", UnitName: "minute", Multiplier: 20}, {ID: "S1002", Name: "Tutorial", UnitName: "minute", Value: 20},
{ID: "S1003", Name: "Scene", UnitName: "minute", Multiplier: 30}, {ID: "S1003", Name: "Scene", UnitName: "minute", Value: 30},
}, },
} }
testActivity2 := models.Activity{ testActivity2 := models.Activity{
@@ -41,11 +41,11 @@ func TestActivityRepository(t *testing.T) {
UserID: testUser2.ID, UserID: testUser2.ID,
Icon: "dice-d20", Icon: "dice-d20",
SubActivities: []models.SubActivity{ SubActivities: []models.SubActivity{
{ID: "S2001", Name: "Writing", UnitName: "word", Multiplier: 1}, {ID: "S2001", Name: "Writing", UnitName: "word", Value: 1},
{ID: "S2002", Name: "Planning", UnitName: "word", Multiplier: 2}, {ID: "S2002", Name: "Planning", UnitName: "word", Value: 2},
{ID: "S2003", Name: "Publish", UnitName: "word", Multiplier: 1}, {ID: "S2003", Name: "Publish", UnitName: "word", Value: 1},
{ID: "S2003", Name: "Write & Publish", UnitName: "word", Multiplier: 3}, {ID: "S2003", Name: "Write & Publish", UnitName: "word", Value: 3},
{ID: "S2004", Name: "IRC RP", UnitName: "minute", Multiplier: 6.6}, {ID: "S2004", Name: "IRC RP", UnitName: "minute", Value: 6.6},
}, },
} }
testActivity3 := models.Activity{ testActivity3 := models.Activity{
@@ -54,15 +54,15 @@ func TestActivityRepository(t *testing.T) {
UserID: testUser1.ID, UserID: testUser1.ID,
Icon: "code", Icon: "code",
SubActivities: []models.SubActivity{ SubActivities: []models.SubActivity{
{ID: "S3001", Name: "Rust NameGen", UnitName: "minute", Multiplier: 20}, {ID: "S3001", Name: "Rust NameGen", UnitName: "minute", Value: 20},
{ID: "S3002", Name: "Learn GoLang", UnitName: "minute", Multiplier: 25}, {ID: "S3002", Name: "Learn GoLang", UnitName: "minute", Value: 25},
}, },
} }
testActivities := []*models.Activity{&testActivity1, &testActivity2, &testActivity3} testActivities := []*models.Activity{&testActivity1, &testActivity2, &testActivity3}
testActivity3Update := models.ActivityUpdate{ testActivity3Update := models.ActivityUpdate{
SetName: strPtr("Programming"), SetName: strPtr("Programming"),
AddSub: &models.SubActivity{Name: "Website Rewrite", UnitName: "minute", Multiplier: 15}, AddSub: &models.SubActivity{Name: "Website Rewrite", UnitName: "minute", Value: 15},
EditSub: &models.SubActivity{ID: "S3001", Name: "Rust SetName Generator", UnitName: "minute", Multiplier: 22}, EditSub: &models.SubActivity{ID: "S3001", Name: "Rust SetName Generator", UnitName: "minute", Value: 22},
RemoveSub: strPtr("S3002"), RemoveSub: strPtr("S3002"),
} }
testActivity3Updated := models.Activity{ testActivity3Updated := models.Activity{
@@ -71,8 +71,8 @@ func TestActivityRepository(t *testing.T) {
UserID: testUser1.ID, UserID: testUser1.ID,
Icon: "code", Icon: "code",
SubActivities: []models.SubActivity{ SubActivities: []models.SubActivity{
{ID: "S3001", Name: "Rust SetName Generator", UnitName: "minute", Multiplier: 22}, {ID: "S3001", Name: "Rust SetName Generator", UnitName: "minute", Value: 22},
{Name: "Website Rewrite", UnitName: "minute", Multiplier: 15}, {Name: "Website Rewrite", UnitName: "minute", Value: 15},
}, },
} }