Skip to content

Commit eb9d82b

Browse files
committed
add changelog link and skip for feature flag lines in tests
1 parent 3f5f015 commit eb9d82b

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Added BETA support for including `projects` relationship and `projects-count` attribute to policy_set on create by @hs26gill [#737](https://github.com/hashicorp/go-tfe/pull/737)
77
* Added BETA method `AddProjects` and `RemoveProjects` for attaching/detaching policy set to projects by @Netra2104 [#735](https://github.com/hashicorp/go-tfe/pull/735)
88
* Added BETA support for adding and updating custom permissions to `TeamProjectAccesses`. A `TeamProjectAccessType` of `"custom"` can set various permissions applied at
9-
the project level to the project itself (`ProjectAccessOptions`) and all of the workspaces in a project (`WorkspaceAccessOptions`).[]()
9+
the project level to the project itself (`ProjectAccessOptions`) and all of the workspaces in a project (`WorkspaceAccessOptions`).[#745](https://github.com/hashicorp/go-tfe/pull/745)
1010

1111
# v1.30.0
1212

team_project_access_integration_test.go

+18-14
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ func TestTeamProjectAccessesAdd(t *testing.T) {
166166
})
167167

168168
t.Run("with valid options for all custom TeamProject permissions", func(t *testing.T) {
169+
skipUnlessBeta(t)
169170
options := TeamProjectAccessAddOptions{
170171
Access: *ProjectAccess(TeamProjectAccessCustom),
171172
Team: tmTest,
@@ -222,6 +223,7 @@ func TestTeamProjectAccessesAdd(t *testing.T) {
222223
})
223224

224225
t.Run("with valid options for some custom TeamProject permissions", func(t *testing.T) {
226+
skipUnlessBeta(t)
225227
options := TeamProjectAccessAddOptions{
226228
Access: *ProjectAccess(TeamProjectAccessCustom),
227229
Team: tmTest,
@@ -301,6 +303,7 @@ func TestTeamProjectAccessesAdd(t *testing.T) {
301303
})
302304

303305
t.Run("when invalid custom project permission is provided in options", func(t *testing.T) {
306+
skipUnlessBeta(t)
304307
tpa, err := client.TeamProjectAccess.Add(ctx, TeamProjectAccessAddOptions{
305308
Access: *ProjectAccess(TeamProjectAccessCustom),
306309
Team: tmTest,
@@ -352,6 +355,7 @@ func TestTeamProjectAccessesUpdate(t *testing.T) {
352355
})
353356

354357
t.Run("with valid custom permissions attributes for all permissions", func(t *testing.T) {
358+
skipUnlessBeta(t)
355359
options := TeamProjectAccessUpdateOptions{
356360
Access: ProjectAccess(TeamProjectAccessCustom),
357361
ProjectAccess: &ProjectAccessOptions{
@@ -388,21 +392,8 @@ func TestTeamProjectAccessesUpdate(t *testing.T) {
388392
assert.Equal(t, true, tpa.WorkspaceAccess.WorkspaceRunTasksPermission)
389393
})
390394

391-
t.Run("with invalid custom permissions attributes", func(t *testing.T) {
392-
options := TeamProjectAccessUpdateOptions{
393-
Access: ProjectAccess(TeamProjectAccessCustom),
394-
ProjectAccess: &ProjectAccessOptions{
395-
Teams: ProjectTeamsPermission(badIdentifier),
396-
},
397-
}
398-
399-
tpa, err := client.TeamProjectAccess.Update(ctx, tpaTest.ID, options)
400-
401-
assert.Nil(t, tpa)
402-
assert.Error(t, err)
403-
})
404-
405395
t.Run("with valid custom permissions attributes for some permissions", func(t *testing.T) {
396+
skipUnlessBeta(t)
406397
options := TeamProjectAccessUpdateOptions{
407398
Access: ProjectAccess(TeamProjectAccessCustom),
408399
ProjectAccess: &ProjectAccessOptions{
@@ -412,7 +403,20 @@ func TestTeamProjectAccessesUpdate(t *testing.T) {
412403
Create: false,
413404
},
414405
}
406+
t.Run("with invalid custom permissions attributes", func(t *testing.T) {
407+
skipUnlessBeta(t)
408+
options := TeamProjectAccessUpdateOptions{
409+
Access: ProjectAccess(TeamProjectAccessCustom),
410+
ProjectAccess: &ProjectAccessOptions{
411+
Teams: ProjectTeamsPermission(badIdentifier),
412+
},
413+
}
415414

415+
tpa, err := client.TeamProjectAccess.Update(ctx, tpaTest.ID, options)
416+
417+
assert.Nil(t, tpa)
418+
assert.Error(t, err)
419+
})
416420
tpa, err := client.TeamProjectAccess.Update(ctx, tpaTest.ID, options)
417421
require.NoError(t, err)
418422

0 commit comments

Comments
 (0)