Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e1882b53
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e1882b53
编写于
6月 18, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More userteam links removed. Removed teams spinach tests
上级
2a63f64f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
0 addition
and
318 deletion
+0
-318
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+0
-6
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+0
-6
features/admin/teams.feature
features/admin/teams.feature
+0
-70
features/steps/admin/admin_teams.rb
features/steps/admin/admin_teams.rb
+0
-236
未找到文件。
app/views/profiles/show.html.haml
浏览文件 @
e1882b53
...
...
@@ -67,12 +67,6 @@
Need a group for several dependent projects?
=
link_to
new_group_path
,
class:
"btn btn-tiny"
do
Create a group
-
if
current_user
.
can_create_team?
%li
%p
Want to share a team between projects?
=
link_to
new_team_path
,
class:
"btn btn-tiny"
do
Create a team
-
unless
current_user
.
projects_limit_left
>
100
%fieldset
%legend
...
...
app/views/projects/new.html.haml
浏览文件 @
e1882b53
...
...
@@ -40,12 +40,6 @@
Need a group for several dependent projects?
=
link_to
new_group_path
,
class:
"btn btn-tiny"
do
Create a group
-
if
current_user
.
can_create_team?
.clearfix
.input.light
Want to share a project between team?
=
link_to
new_team_path
,
class:
"btn btn-tiny"
do
Create a team
.save-project-loader.hide
%center
...
...
features/admin/teams.feature
已删除
100644 → 0
浏览文件 @
2a63f64f
Feature
:
Admin Teams
Background
:
Given
I sign in as an admin
And
Create gitlab user
"John"
Scenario
:
Create a team
When
I visit admin teams page
And
I click new team link
And
submit form with new team info
Then
I should be redirected to team page
And
I should see newly created team
Scenario
:
Add user to team
When
I visit admin teams page
When
I have clean
"HardCoders"
team
And
I visit
"HardCoders"
team page
When
I click to
"Add members"
link
When
I select user
"John"
from user list as
"Developer"
And
submit form with new team member info
Then
I should see
"John"
in teams members list as
"Developer"
Scenario
:
Assign team to existing project
When
I visit admin teams page
When
I have
"HardCoders"
team with
"John"
member with
"Developer"
role
When
I have
"Shop"
project
And
I visit
"HardCoders"
team page
Then
I should see empty projects table
When
I click to
"Add projects"
link
When
I select project
"Shop"
with max access
"Reporter"
And
submit form with new team project info
Then
I should see
"Shop"
project in projects list
When
I visit
"Shop"
project admin page
Then
I should see
"John"
user with role
"Reporter"
in team table
Scenario
:
Add user to team with ptojects
When
I visit admin teams page
When
I have
"HardCoders"
team with
"John"
member with
"Developer"
role
And
"HardCoders"
team assigned to
"Shop"
project with
"Developer"
max role access
When
I have gitlab user
"Jimm"
And
I visit
"HardCoders"
team page
Then
I should see members table without
"Jimm"
member
When
I click to
"Add members"
link
When
I select user
"Jimm"
ub team members list as
"Master"
And
submit form with new team member info
Then
I should see
"Jimm"
in teams members list as
"Master"
Scenario
:
Remove member from team
Given
I have users team
"HardCoders"
And
gitlab user
"John"
is a member
"HardCoders"
team
And
gitlab user
"Jimm"
is a member
"HardCoders"
team
And
"HardCoders"
team is assigned to
"Shop"
project
When
I visit admin teams page
When
I visit
"HardCoders"
team admin page
Then
I shoould see
"John"
in members list
And
I should see
"Jimm"
in members list
And
I should see
"Shop"
in projects list
When
I click on remove
"Jimm"
user link
Then
I should be redirected to
"HardCoders"
team admin page
And
I should not to see
"Jimm"
user in members list
Scenario
:
Remove project from team
Given
I have users team
"HardCoders"
And
gitlab user
"John"
is a member
"HardCoders"
team
And
gitlab user
"Jimm"
is a member
"HardCoders"
team
And
"HardCoders"
team is assigned to
"Shop"
project
When
I visit admin teams page
When
I visit
"HardCoders"
team admin page
Then
I should see
"Shop"
project in projects list
When
I click on
"Relegate"
link on
"Shop"
project
Then
I should see projects liston team page without
"Shop"
project
features/steps/admin/admin_teams.rb
已删除
100644 → 0
浏览文件 @
2a63f64f
class
AdminTeams
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedPaths
include
SharedActiveTab
include
SharedAdmin
And
'I have own project'
do
create
:project
end
And
'Create gitlab user "John"'
do
@user
=
create
(
:user
,
name:
"John"
)
end
And
'I click new team link'
do
click_link
"New Team"
end
And
'submit form with new team info'
do
fill_in
'user_team_name'
,
with:
'gitlab'
fill_in
'user_team_description'
,
with:
'description'
click_button
'Create team'
end
Then
'I should be redirected to team page'
do
current_path
.
should
==
admin_team_path
(
UserTeam
.
last
)
end
And
'I should see newly created team'
do
page
.
should
have_content
"Team: gitlab"
page
.
should
have_content
"description"
end
When
'I visit admin teams page'
do
visit
admin_teams_path
end
When
'I have clean "HardCoders" team'
do
@team
=
create
:user_team
,
name:
"HardCoders"
,
owner:
current_user
end
And
'I visit "HardCoders" team page'
do
visit
admin_team_path
(
UserTeam
.
find_by_name
(
"HardCoders"
))
end
Then
'I should see only me in members table'
do
members_list
=
find
(
"#members_list .member"
)
members_list
.
should
have_content
(
current_user
.
name
)
members_list
.
should
have_content
(
current_user
.
username
)
end
When
'I select user "John" from user list as "Developer"'
do
@user
||=
User
.
find_by_name
(
"John"
)
within
"#team_members"
do
select
"
#{
@user
.
name
}
(
#{
@user
.
username
}
)"
,
from:
"user_ids"
select
"Developer"
,
from:
"default_project_access"
end
end
And
'submit form with new team member info'
do
click_button
'add_members_to_team'
end
Then
'I should see "John" in teams members list as "Developer"'
do
@user
||=
User
.
find_by_name
(
"John"
)
find_in_list
(
"#members_list .member"
,
@user
).
must_equal
true
end
When
'I visit "John" user admin page'
do
pending
'step not implemented'
end
Then
'I should see "HardCoders" team in teams table'
do
pending
'step not implemented'
end
When
'I have "HardCoders" team with "John" member with "Developer" role'
do
@team
=
create
:user_team
,
name:
"HardCoders"
,
owner:
current_user
@user
||=
User
.
find_by_name
(
"John"
)
@team
.
add_member
(
@user
,
UserTeam
.
access_roles
[
"Developer"
],
group_admin:
false
)
end
When
'I have "Shop" project'
do
@project
=
create
:project
,
name:
"Shop"
end
Then
'I should see empty projects table'
do
page
.
should
have_content
"Projects (0)"
end
When
'I select project "Shop" with max access "Reporter"'
do
@project
||=
Project
.
find_by_name
(
"Shop"
)
within
"#assign_projects"
do
select
@project
.
name
,
from:
"project_ids"
select
"Reporter"
,
from:
"greatest_project_access"
end
end
And
'submit form with new team project info'
do
click_button
'assign_projects_to_team'
end
Then
'I should see "Shop" project in projects list'
do
project
=
Project
.
find_by_name
(
"Shop"
)
find_in_list
(
"#projects_list .project"
,
project
).
must_equal
true
end
When
'I visit "Shop" project admin page'
do
project
=
Project
.
find_by_name
(
"Shop"
)
visit
admin_project_path
(
project
)
end
And
'"HardCoders" team assigned to "Shop" project with "Developer" max role access'
do
@team
=
UserTeam
.
find_by_name
(
"HardCoders"
)
@project
=
create
:project
,
name:
"Shop"
@team
.
assign_to_project
(
@project
,
UserTeam
.
access_roles
[
"Developer"
])
end
When
'I have gitlab user "Jimm"'
do
create
:user
,
name:
"Jimm"
end
Then
'I should see members table without "Jimm" member'
do
user
=
User
.
find_by_name
(
"Jimm"
)
find_in_list
(
"#members_list .member"
,
user
).
must_equal
false
end
When
'I select user "Jimm" ub team members list as "Master"'
do
user
=
User
.
find_by_name
(
"Jimm"
)
within
"#team_members"
do
select
"
#{
user
.
name
}
(
#{
user
.
username
}
)"
,
from:
"user_ids"
select
"Developer"
,
from:
"default_project_access"
end
end
Then
'I should see "Jimm" in teams members list as "Master"'
do
user
=
User
.
find_by_name
(
"Jimm"
)
find_in_list
(
"#members_list .member"
,
user
).
must_equal
true
end
Given
'I have users team "HardCoders"'
do
@team
=
create
:user_team
,
name:
"HardCoders"
end
And
'gitlab user "John" is a member "HardCoders" team'
do
@team
=
UserTeam
.
find_by_name
(
"HardCoders"
)
@user
=
User
.
find_by_name
(
"John"
)
@user
=
create
:user
,
name:
"John"
unless
@user
@team
.
add_member
(
@user
,
UserTeam
.
access_roles
[
"Master"
],
group_admin:
false
)
end
And
'gitlab user "Jimm" is a member "HardCoders" team'
do
@team
=
UserTeam
.
find_by_name
(
"HardCoders"
)
@user
=
User
.
find_by_name
(
"Jimm"
)
@user
=
create
:user
,
name:
"Jimm"
unless
@user
@team
.
add_member
(
@user
,
UserTeam
.
access_roles
[
"Master"
],
group_admin:
false
)
end
And
'"HardCoders" team is assigned to "Shop" project'
do
@team
=
UserTeam
.
find_by_name
(
"HardCoders"
)
@project
=
create
:project
,
name:
"Shop"
@team
.
assign_to_project
(
@project
,
UserTeam
.
access_roles
[
"Developer"
])
end
When
'I visit "HardCoders" team admin page'
do
visit
admin_team_path
(
UserTeam
.
find_by_name
(
"HardCoders"
))
end
Then
'I shoould see "John" in members list'
do
user
=
User
.
find_by_name
(
"John"
)
find_in_list
(
"#members_list .member"
,
user
).
must_equal
true
end
And
'I should see "Jimm" in members list'
do
user
=
User
.
find_by_name
(
"Jimm"
)
find_in_list
(
"#members_list .member"
,
user
).
must_equal
true
end
And
'I should see "Shop" in projects list'
do
project
=
Project
.
find_by_name
(
"Shop"
)
find_in_list
(
"#projects_list .project"
,
project
).
must_equal
true
end
When
'I click on remove "Jimm" user link'
do
user
=
User
.
find_by_name
(
"Jimm"
)
click_link
"remove_member_
#{
user
.
id
}
"
end
Then
'I should be redirected to "HardCoders" team admin page'
do
current_path
.
should
==
admin_team_path
(
UserTeam
.
find_by_name
(
"HardCoders"
))
end
And
'I should not to see "Jimm" user in members list'
do
user
=
User
.
find_by_name
(
"Jimm"
)
find_in_list
(
"#members_list .member"
,
user
).
must_equal
false
end
When
'I click on "Relegate" link on "Shop" project'
do
project
=
Project
.
find_by_name
(
"Shop"
)
click_link
"relegate_project_
#{
project
.
id
}
"
end
Then
'I should see projects liston team page without "Shop" project'
do
project
=
Project
.
find_by_name
(
"Shop"
)
find_in_list
(
"#projects_list .project"
,
project
).
must_equal
false
end
Then
'I should see "John" user with role "Reporter" in team table'
do
user
=
User
.
find_by_name
(
"John"
)
find_in_list
(
".team_members"
,
user
).
must_equal
true
end
When
'I click to "Add members" link'
do
click_link
"Add members"
end
When
'I click to "Add projects" link'
do
click_link
"Add projects"
end
protected
def
current_team
@team
||=
Team
.
first
end
def
find_in_list
(
selector
,
item
)
members_list
=
all
(
selector
)
entered
=
false
members_list
.
each
do
|
member_item
|
entered
=
true
if
member_item
.
has_content?
(
item
.
name
)
end
entered
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录