Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
0f8baaaa
Commit
0f8baaaa
authored
May 03, 2021
by
Paul Kaplan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests for new studio permissions
parent
29f6006b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
121 additions
and
5 deletions
+121
-5
src/redux/studio-permissions.js
src/redux/studio-permissions.js
+5
-4
test/helpers/state-fixtures.json
test/helpers/state-fixtures.json
+3
-0
test/unit/redux/studio-permissions.test.js
test/unit/redux/studio-permissions.test.js
+113
-1
No files found.
src/redux/studio-permissions.js
View file @
0f8baaaa
...
...
@@ -29,14 +29,15 @@ const selectCanFollowStudio = state => selectIsLoggedIn(state);
const
selectCanEditCommentsAllowed
=
state
=>
selectIsAdmin
(
state
)
||
isCreator
(
state
);
const
selectCanEditOpenToAll
=
state
=>
isManager
(
state
);
const
selectShowCuratorInvite
=
state
=>
state
.
studio
.
invited
;
const
selectShowCuratorInvite
=
state
=>
!!
state
.
studio
.
invited
;
const
selectCanInviteCurators
=
state
=>
isManager
(
state
);
const
selectCanRemoveCurators
=
state
=>
isManager
(
state
);
const
selectCanRemoveManager
=
(
state
,
managerId
)
=>
isManager
(
state
)
&&
managerId
!==
state
.
studio
.
owner
;
const
selectCanRemoveCurators
=
state
=>
isManager
(
state
)
||
selectIsAdmin
(
state
);
const
selectCanRemoveManager
=
(
state
,
managerId
)
=>
(
selectIsAdmin
(
state
)
||
isManager
(
state
))
&&
managerId
!==
state
.
studio
.
owner
;
const
selectCanPromoteCurators
=
state
=>
isManager
(
state
);
// TODO this permission needs to account for who added the project
const
selectCanRemoveProjects
=
state
=>
isCurator
(
state
)
||
isManager
(
state
);
const
selectCanRemoveProjects
=
state
=>
isCurator
(
state
)
||
isManager
(
state
)
||
selectIsAdmin
(
state
)
;
export
{
selectCanEditInfo
,
...
...
test/helpers/state-fixtures.json
View file @
0f8baaaa
...
...
@@ -6,6 +6,9 @@
"isCurator"
:
{
"curator"
:
true
},
"isInvited"
:
{
"invited"
:
true
},
"creator1"
:
{
"owner"
:
1
},
...
...
test/unit/redux/studio-permissions.test.js
View file @
0f8baaaa
...
...
@@ -8,7 +8,13 @@ import {
selectCanRestoreComment
,
selectCanFollowStudio
,
selectCanEditCommentsAllowed
,
selectCanEditOpenToAll
selectCanEditOpenToAll
,
selectShowCuratorInvite
,
selectCanInviteCurators
,
selectCanRemoveCurators
,
selectCanRemoveManager
,
selectCanPromoteCurators
,
selectCanRemoveProjects
}
from
'
../../../src/redux/studio-permissions
'
;
import
{
getInitialState
as
getInitialStudioState
}
from
'
../../../src/redux/studio
'
;
...
...
@@ -42,6 +48,9 @@ const setStateByRole = (role) => {
break
;
case
'
logged out
'
:
// Default state set in beforeEach
break
;
case
'
invited
'
:
state
.
studio
=
studios
.
isInvited
;
break
;
default
:
throw
new
Error
(
'
Unknown user role in test:
'
+
role
);
}
...
...
@@ -98,6 +107,21 @@ describe('studio projects', () => {
expect
(
selectCanAddProjects
(
state
)).
toBe
(
expected
);
});
});
describe
(
'
can remove projects
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
true
],
[
'
curator
'
,
true
],
[
'
manager
'
,
true
],
[
'
creator
'
,
true
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
// TODO this permission is wrong, curators can only remove projects they added
expect
(
selectCanRemoveProjects
(
state
)).
toBe
(
expected
);
});
});
});
describe
(
'
studio comments
'
,
()
=>
{
...
...
@@ -208,4 +232,92 @@ describe('studio comments', () => {
expect
(
selectCanEditOpenToAll
(
state
)).
toBe
(
expected
);
});
});
describe
(
'
studio members
'
,
()
=>
{
describe
(
'
can accept invitation
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
false
],
[
'
curator
'
,
false
],
[
'
manager
'
,
false
],
[
'
creator
'
,
false
],
[
'
invited
'
,
true
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
expect
(
selectShowCuratorInvite
(
state
)).
toBe
(
expected
);
});
});
describe
(
'
can promote curators
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
false
],
[
'
curator
'
,
false
],
[
'
manager
'
,
true
],
[
'
creator
'
,
true
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
expect
(
selectCanPromoteCurators
(
state
)).
toBe
(
expected
);
});
});
describe
(
'
can remove curators
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
true
],
[
'
curator
'
,
false
],
[
'
manager
'
,
true
],
[
'
creator
'
,
true
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
expect
(
selectCanRemoveCurators
(
state
)).
toBe
(
expected
);
});
});
describe
(
'
can remove managers
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
true
],
[
'
curator
'
,
false
],
[
'
manager
'
,
true
],
[
'
creator
'
,
true
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
expect
(
selectCanRemoveManager
(
state
,
'
123
'
)).
toBe
(
expected
);
});
describe
(
'
nobody can remove the studio creator
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
false
],
[
'
curator
'
,
false
],
[
'
manager
'
,
false
],
[
'
creator
'
,
false
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
state
.
studio
.
owner
=
'
the creator
'
;
expect
(
selectCanRemoveManager
(
state
,
'
the creator
'
)).
toBe
(
expected
);
});
});
});
describe
(
'
can invite curators
'
,
()
=>
{
test
.
each
([
[
'
admin
'
,
false
],
[
'
curator
'
,
false
],
[
'
manager
'
,
true
],
[
'
creator
'
,
false
],
[
'
logged in
'
,
false
],
[
'
unconfirmed
'
,
false
],
[
'
logged out
'
,
false
]
])(
'
%s: %s
'
,
(
role
,
expected
)
=>
{
setStateByRole
(
role
);
expect
(
selectCanInviteCurators
(
state
)).
toBe
(
expected
);
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment