Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7c965a24
Commit
7c965a24
authored
May 22, 2018
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec
parent
cfcc7043
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
spec/features/projects/settings/user_manages_group_links_spec.rb
...atures/projects/settings/user_manages_group_links_spec.rb
+1
-1
spec/features/projects/settings/user_manages_project_members_spec.rb
...es/projects/settings/user_manages_project_members_spec.rb
+1
-1
spec/javascripts/notes/components/note_actions_spec.js
spec/javascripts/notes/components/note_actions_spec.js
+2
-2
spec/models/project_team_spec.rb
spec/models/project_team_spec.rb
+2
-2
No files found.
spec/features/projects/settings/user_manages_group_links_spec.rb
View file @
7c965a24
...
@@ -30,7 +30,7 @@ describe 'Projects > Settings > User manages group links' do
...
@@ -30,7 +30,7 @@ describe 'Projects > Settings > User manages group links' do
click_link
(
'Share with group'
)
click_link
(
'Share with group'
)
select2
(
group_market
.
id
,
from:
'#link_group_id'
)
select2
(
group_market
.
id
,
from:
'#link_group_id'
)
select
(
'Ma
st
er'
,
from:
'link_group_access'
)
select
(
'Ma
intain
er'
,
from:
'link_group_access'
)
click_button
(
'Share'
)
click_button
(
'Share'
)
...
...
spec/features/projects/settings/user_manages_project_members_spec.rb
View file @
7c965a24
...
@@ -62,7 +62,7 @@ describe 'Projects > Settings > User manages project members' do
...
@@ -62,7 +62,7 @@ describe 'Projects > Settings > User manages project members' do
page
.
within
(
'.project-members-groups'
)
do
page
.
within
(
'.project-members-groups'
)
do
expect
(
page
).
to
have_content
(
'OpenSource'
)
expect
(
page
).
to
have_content
(
'OpenSource'
)
expect
(
first
(
'.group_member'
)).
to
have_content
(
'Ma
st
er'
)
expect
(
first
(
'.group_member'
)).
to
have_content
(
'Ma
intain
er'
)
end
end
end
end
end
end
spec/javascripts/notes/components/note_actions_spec.js
View file @
7c965a24
...
@@ -20,7 +20,7 @@ describe('issue_note_actions component', () => {
...
@@ -20,7 +20,7 @@ describe('issue_note_actions component', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
props
=
{
props
=
{
accessLevel
:
'
Ma
st
er
'
,
accessLevel
:
'
Ma
intain
er
'
,
authorId
:
26
,
authorId
:
26
,
canDelete
:
true
,
canDelete
:
true
,
canEdit
:
true
,
canEdit
:
true
,
...
@@ -67,7 +67,7 @@ describe('issue_note_actions component', () => {
...
@@ -67,7 +67,7 @@ describe('issue_note_actions component', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
store
.
dispatch
(
'
setUserData
'
,
{});
store
.
dispatch
(
'
setUserData
'
,
{});
props
=
{
props
=
{
accessLevel
:
'
Ma
st
er
'
,
accessLevel
:
'
Ma
intain
er
'
,
authorId
:
26
,
authorId
:
26
,
canDelete
:
false
,
canDelete
:
false
,
canEdit
:
false
,
canEdit
:
false
,
...
...
spec/models/project_team_spec.rb
View file @
7c965a24
...
@@ -179,14 +179,14 @@ describe ProjectTeam do
...
@@ -179,14 +179,14 @@ describe ProjectTeam do
end
end
describe
"#human_max_access"
do
describe
"#human_max_access"
do
it
'returns Ma
st
er role'
do
it
'returns Ma
intain
er role'
do
user
=
create
(
:user
)
user
=
create
(
:user
)
group
=
create
(
:group
)
group
=
create
(
:group
)
project
=
create
(
:project
,
namespace:
group
)
project
=
create
(
:project
,
namespace:
group
)
group
.
add_master
(
user
)
group
.
add_master
(
user
)
expect
(
project
.
team
.
human_max_access
(
user
.
id
)).
to
eq
'Ma
st
er'
expect
(
project
.
team
.
human_max_access
(
user
.
id
)).
to
eq
'Ma
intain
er'
end
end
it
'returns Owner role'
do
it
'returns Owner role'
do
...
...
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