Compare commits

..

No commits in common. "63df0da4d78536eb889e5d81f26787f2183b4006" and "f9fb956efd7205e3ace2dffe2fb07d5a35d82b1a" have entirely different histories.

5 changed files with 2 additions and 38 deletions

View File

@ -605,36 +605,6 @@ func TestCompleteTask(t *testing.T) {
}
}
func TestCompleteTaskWithNoWeights(t *testing.T) {
e := startServer(t)
taskId := createTestTaskWithAmount(e, 101)
e.GET("/tasks").Expect().Status(200).JSON().Array().Length().IsEqual(1)
// Ensure main allowance has no weight
e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{
Weight: 0,
}).Expect().Status(200)
// Complete the task
e.POST("/task/" + strconv.Itoa(taskId) + "/complete").Expect().Status(200)
// Verify the task is marked as completed
e.GET("/task/" + strconv.Itoa(taskId)).Expect().Status(404)
// Verify the allowances are updated for user 1
allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
allowances.Length().IsEqual(1)
allowances.Value(0).Object().Value("id").Number().IsEqual(0)
allowances.Value(0).Object().Value("progress").Number().InDelta(101.00, 0.01)
// And also for user 2
allowances = e.GET("/user/2/allowance").Expect().Status(200).JSON().Array()
allowances.Length().IsEqual(1)
allowances.Value(0).Object().Value("id").Number().IsEqual(0)
allowances.Value(0).Object().Value("progress").Number().InDelta(101.00, 0.01)
}
func TestCompleteTaskAllowanceWeightsSumTo0(t *testing.T) {
e := startServer(t)
taskId := createTestTaskWithAmount(e, 101)
@ -673,11 +643,6 @@ func TestCompleteAllowance(t *testing.T) {
createTestTaskWithAmount(e, 100)
createTestAllowance(e, "Test Allowance 1", 100, 50)
// Update base allowance
e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{
Weight: 0,
}).Expect().Status(200)
// Complete the task
e.POST("/task/1/complete").Expect().Status(200)

View File

@ -2,7 +2,7 @@ create table users
(
id integer primary key,
name text not null,
weight real not null default 10.0,
weight real not null default 0.0,
balance integer not null default 0
) strict;

View File

@ -1,2 +1,2 @@
alter table allowances
add column colour integer not null;
add column colour integer;

View File

@ -1 +0,0 @@
update users set weight = 10.0 where weight = 0.0;