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
Tatuya Kamada
gitlab-ce
Commits
95791316
Commit
95791316
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lets fix tests
parent
e45179c9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
9 deletions
+14
-9
app/views/snippets/_snippets.html.haml
app/views/snippets/_snippets.html.haml
+1
-1
features/project/team_management.feature
features/project/team_management.feature
+2
-1
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+7
-4
features/steps/project/project_team_management.rb
features/steps/project/project_team_management.rb
+3
-2
features/steps/shared/project.rb
features/steps/shared/project.rb
+1
-1
No files found.
app/views/snippets/_snippets.html.haml
View file @
95791316
%ul
.bordered-list
=
render
@snippets
=
render
partial:
'snippet'
,
collection:
@snippets
-
if
@snippets
.
empty?
%li
%h3
.nothing_here_message
Nothing here.
...
...
This diff is collapsed.
Click to expand it.
features/project/team_management.feature
View file @
95791316
...
...
@@ -31,6 +31,7 @@ Feature: Project Team management
Scenario
:
Import team from another project
Given
I own project
"Website"
And
"Mike"
is
"Website"
reporter
When
I visit project
"Shop"
team page
And
I click link
"Import team from another project"
When
I submit
"Website"
project for import team
And
I submit
"Website"
project for import team
Then
I should see
"Mike"
in team list as
"Reporter"
This diff is collapsed.
Click to expand it.
features/steps/dashboard/dashboard.rb
View file @
95791316
...
...
@@ -29,7 +29,7 @@ class Dashboard < Spinach::FeatureSteps
Given
'user with name "John Doe" joined project "Shop"'
do
user
=
create
(
:user
,
{
name:
"John Doe"
})
project
=
Project
.
find_by_name
"Shop"
project
.
team
<<
[
user
,
:master
]
Event
.
create
(
project:
project
,
author_id:
user
.
id
,
...
...
@@ -38,12 +38,11 @@ class Dashboard < Spinach::FeatureSteps
end
Then
'I should see "John Doe joined project at Shop" event'
do
page
.
should
have_content
"John Doe joined project at
Shop
"
page
.
should
have_content
"John Doe joined project at
#{
project
.
name_with_namespace
}
"
end
And
'user with name "John Doe" left project "Shop"'
do
user
=
User
.
find_by_name
"John Doe"
project
=
Project
.
find_by_name
"Shop"
Event
.
create
(
project:
project
,
author_id:
user
.
id
,
...
...
@@ -52,7 +51,7 @@ class Dashboard < Spinach::FeatureSteps
end
Then
'I should see "John Doe left project at Shop" event'
do
page
.
should
have_content
"John Doe left project at
Shop
"
page
.
should
have_content
"John Doe left project at
#{
project
.
name_with_namespace
}
"
end
And
'I have group with projects'
do
...
...
@@ -83,4 +82,8 @@ class Dashboard < Spinach::FeatureSteps
Then
'I should see 1 project at group list'
do
page
.
find
(
'span.last_activity/span'
).
should
have_content
(
'1'
)
end
def
project
@project
||=
Project
.
find_by_name
"Shop"
end
end
This diff is collapsed.
Click to expand it.
features/steps/project/project_team_management.rb
View file @
95791316
...
...
@@ -79,7 +79,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
end
Given
'I own project "Website"'
do
@project
=
create
(
:project
,
name:
"Website"
)
@project
=
create
(
:project
,
name:
"Website"
,
namespace:
@user
.
namespace
)
@project
.
team
<<
[
@user
,
:master
]
end
...
...
@@ -94,7 +94,8 @@ class ProjectTeamManagement < Spinach::FeatureSteps
end
When
'I submit "Website" project for import team'
do
select
'Website'
,
from:
'source_project_id'
project
=
Project
.
find_by_name
(
"Website"
)
select
project
.
name_with_namespace
,
from:
'source_project_id'
click_button
'Import'
end
...
...
This diff is collapsed.
Click to expand it.
features/steps/shared/project.rb
View file @
95791316
...
...
@@ -42,7 +42,7 @@ module SharedProject
Then
'I should see project "Shop" activity feed'
do
project
=
Project
.
find_by_name
(
"Shop"
)
page
.
should
have_content
"
#{
@user
.
name
}
pushed new branch new_design at
#{
project
.
name
}
"
page
.
should
have_content
"
#{
@user
.
name
}
pushed new branch new_design at
#{
project
.
name
_with_namespace
}
"
end
Then
'I should see project settings'
do
...
...
This diff is collapsed.
Click to expand it.
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