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
d4377b8c
Commit
d4377b8c
authored
Apr 03, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update commit icon; fix specs
parent
c998ce66
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
app/views/shared/icons/_icon_commit.svg
app/views/shared/icons/_icon_commit.svg
+1
-3
features/steps/shared/project.rb
features/steps/shared/project.rb
+1
-1
spec/features/dashboard/project_member_activity_index_spec.rb
.../features/dashboard/project_member_activity_index_spec.rb
+3
-3
No files found.
app/views/shared/icons/_icon_commit.svg
View file @
d4377b8c
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"40"
height=
"40"
viewBox=
"0 0 40 40"
>
<svg
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 36 18"
enable-background=
"new 0 0 36 18"
><path
d=
"m34 7h-7.2c-.9-4-4.5-7-8.8-7s-7.9 3-8.8 7h-7.2c-1.1 0-2 .9-2 2 0 1.1.9 2 2 2h7.2c.9 4 4.5 7 8.8 7s7.9-3 8.8-7h7.2c1.1 0 2-.9 2-2 0-1.1-.9-2-2-2m-16 7c-2.8 0-5-2.2-5-5s2.2-5 5-5 5 2.2 5 5-2.2 5-5 5"
/></svg>
<path
fill=
"#8F8F8F"
fill-rule=
"evenodd"
d=
"M28.7769836,18 C27.8675252,13.9920226 24.2831748,11 20,11 C15.7168252,11 12.1324748,13.9920226 11.2230164,18 L4.0085302,18 C2.90195036,18 2,18.8954305 2,20 C2,21.1122704 2.8992496,22 4.0085302,22 L11.2230164,22 C12.1324748,26.0079774 15.7168252,29 20,29 C24.2831748,29 27.8675252,26.0079774 28.7769836,22 L35.9914698,22 C37.0980496,22 38,21.1045695 38,20 C38,18.8877296 37.1007504,18 35.9914698,18 L28.7769836,18 L28.7769836,18 Z M20,25 C22.7614237,25 25,22.7614237 25,20 C25,17.2385763 22.7614237,15 20,15 C17.2385763,15 15,17.2385763 15,20 C15,22.7614237 17.2385763,25 20,25 L20,25 Z"
/>
\ No newline at end of file
</svg>
features/steps/shared/project.rb
View file @
d4377b8c
...
@@ -97,7 +97,7 @@ module SharedProject
...
@@ -97,7 +97,7 @@ module SharedProject
step
'I should see project "Shop" activity feed'
do
step
'I should see project "Shop" activity feed'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
project
=
Project
.
find_by
(
name:
"Shop"
)
expect
(
page
).
to
have_content
"
#{
@user
.
name
}
pushed new branch fix at
#{
project
.
name_with_namespace
}
"
expect
(
page
).
to
have_content
"pushed new branch fix at
#{
project
.
name_with_namespace
}
"
end
end
step
'I should see project settings'
do
step
'I should see project settings'
do
...
...
spec/features/dashboard/project_member_activity_index_spec.rb
View file @
d4377b8c
...
@@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do
...
@@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do
context
'when a user joins the project'
do
context
'when a user joins the project'
do
before
{
visit_activities_and_wait_with_event
(
Event
::
JOINED
)
}
before
{
visit_activities_and_wait_with_event
(
Event
::
JOINED
)
}
it
{
is_expected
.
to
eq
(
"
#{
user
.
name
}
joined project"
)
}
it
{
is_expected
.
to
eq
(
"joined project"
)
}
end
end
context
'when a user leaves the project'
do
context
'when a user leaves the project'
do
before
{
visit_activities_and_wait_with_event
(
Event
::
LEFT
)
}
before
{
visit_activities_and_wait_with_event
(
Event
::
LEFT
)
}
it
{
is_expected
.
to
eq
(
"
#{
user
.
name
}
left project"
)
}
it
{
is_expected
.
to
eq
(
"left project"
)
}
end
end
context
'when a users membership expires for the project'
do
context
'when a users membership expires for the project'
do
before
{
visit_activities_and_wait_with_event
(
Event
::
EXPIRED
)
}
before
{
visit_activities_and_wait_with_event
(
Event
::
EXPIRED
)
}
it
"presents the correct message"
do
it
"presents the correct message"
do
message
=
"
#{
user
.
name
}
removed due to membership expiration from project"
message
=
"removed due to membership expiration from project"
is_expected
.
to
eq
(
message
)
is_expected
.
to
eq
(
message
)
end
end
end
end
...
...
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