@@ -20,7 +20,7 @@ func (suite *MethodTestSuite) TestParameters() {
20
20
Scope : database .ParameterScopeWorkspace ,
21
21
SourceScheme : database .ParameterSourceSchemeNone ,
22
22
DestinationScheme : database .ParameterDestinationSchemeNone ,
23
- }), asserts (w , rbac .ActionUpdate ))
23
+ }), asserts (w , rbac .ActionUpdate ), nil )
24
24
})
25
25
})
26
26
suite .Run ("TemplateVersionNoTemplate/InsertParameterValue" , func () {
@@ -32,7 +32,7 @@ func (suite *MethodTestSuite) TestParameters() {
32
32
Scope : database .ParameterScopeImportJob ,
33
33
SourceScheme : database .ParameterSourceSchemeNone ,
34
34
DestinationScheme : database .ParameterDestinationSchemeNone ,
35
- }), asserts (v .RBACObjectNoTemplate (), rbac .ActionUpdate ))
35
+ }), asserts (v .RBACObjectNoTemplate (), rbac .ActionUpdate ), nil )
36
36
})
37
37
})
38
38
suite .Run ("TemplateVersionTemplate/InsertParameterValue" , func () {
@@ -50,7 +50,7 @@ func (suite *MethodTestSuite) TestParameters() {
50
50
Scope : database .ParameterScopeImportJob ,
51
51
SourceScheme : database .ParameterSourceSchemeNone ,
52
52
DestinationScheme : database .ParameterDestinationSchemeNone ,
53
- }), asserts (v .RBACObject (tpl ), rbac .ActionUpdate ))
53
+ }), asserts (v .RBACObject (tpl ), rbac .ActionUpdate ), nil )
54
54
})
55
55
})
56
56
suite .Run ("Template/InsertParameterValue" , func () {
@@ -61,7 +61,7 @@ func (suite *MethodTestSuite) TestParameters() {
61
61
Scope : database .ParameterScopeTemplate ,
62
62
SourceScheme : database .ParameterSourceSchemeNone ,
63
63
DestinationScheme : database .ParameterDestinationSchemeNone ,
64
- }), asserts (tpl , rbac .ActionUpdate ))
64
+ }), asserts (tpl , rbac .ActionUpdate ), nil )
65
65
})
66
66
})
67
67
suite .Run ("Template/ParameterValue" , func () {
@@ -71,7 +71,7 @@ func (suite *MethodTestSuite) TestParameters() {
71
71
ScopeID : tpl .ID ,
72
72
Scope : database .ParameterScopeTemplate ,
73
73
})
74
- return methodCase (values (pv .ID ), asserts (tpl , rbac .ActionRead ))
74
+ return methodCase (values (pv .ID ), asserts (tpl , rbac .ActionRead ), values ( pv ) )
75
75
})
76
76
})
77
77
suite .Run ("ParameterValues" , func () {
@@ -88,16 +88,18 @@ func (suite *MethodTestSuite) TestParameters() {
88
88
})
89
89
return methodCase (values (database.ParameterValuesParams {
90
90
IDs : []uuid.UUID {a .ID , b .ID },
91
- }), asserts (tpl , rbac .ActionRead , w , rbac .ActionRead ))
91
+ }), asserts (tpl , rbac .ActionRead , w , rbac .ActionRead ),
92
+ values ([]database.ParameterValue {a , b }))
92
93
})
93
94
})
94
95
suite .Run ("GetParameterSchemasByJobID" , func () {
95
96
suite .RunMethodTest (func (t * testing.T , db database.Store ) MethodCase {
96
97
j := dbgen .ProvisionerJob (t , db , database.ProvisionerJob {})
97
98
tpl := dbgen .Template (t , db , database.Template {})
98
99
tv := dbgen .TemplateVersion (t , db , database.TemplateVersion {JobID : j .ID , TemplateID : uuid.NullUUID {UUID : tpl .ID , Valid : true }})
99
- _ = dbgen .ParameterSchema (t , db , database.ParameterSchema {JobID : j .ID })
100
- return methodCase (values (j .ID ), asserts (tv .RBACObject (tpl ), rbac .ActionRead ))
100
+ a := dbgen .ParameterSchema (t , db , database.ParameterSchema {JobID : j .ID })
101
+ return methodCase (values (j .ID ), asserts (tv .RBACObject (tpl ), rbac .ActionRead ),
102
+ values ([]database.ParameterSchema {a }))
101
103
})
102
104
})
103
105
suite .Run ("Workspace/GetParameterValueByScopeAndName" , func () {
@@ -111,7 +113,7 @@ func (suite *MethodTestSuite) TestParameters() {
111
113
Scope : v .Scope ,
112
114
ScopeID : v .ScopeID ,
113
115
Name : v .Name ,
114
- }), asserts (w , rbac .ActionRead ))
116
+ }), asserts (w , rbac .ActionRead ), values ( v ) )
115
117
})
116
118
})
117
119
suite .Run ("Workspace/DeleteParameterValueByID" , func () {
@@ -121,7 +123,7 @@ func (suite *MethodTestSuite) TestParameters() {
121
123
Scope : database .ParameterScopeWorkspace ,
122
124
ScopeID : w .ID ,
123
125
})
124
- return methodCase (values (v .ID ), asserts (w , rbac .ActionUpdate ))
126
+ return methodCase (values (v .ID ), asserts (w , rbac .ActionUpdate ), values () )
125
127
})
126
128
})
127
129
}
0 commit comments