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
Léo-Paul Géneau
gitlab-ce
Commits
a9c80dce
Commit
a9c80dce
authored
Feb 13, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed timeago specs
parent
8aa757aa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+1
-1
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+3
-3
No files found.
spec/features/commits_spec.rb
View file @
a9c80dce
...
@@ -192,7 +192,7 @@ describe 'Commits' do
...
@@ -192,7 +192,7 @@ describe 'Commits' do
commits
=
project
.
repository
.
commits
(
branch_name
)
commits
=
project
.
repository
.
commits
(
branch_name
)
commits
.
each
do
|
commit
|
commits
.
each
do
|
commit
|
expect
(
page
).
to
have_content
(
"committed
#{
commit
.
committed_date
}
"
)
expect
(
page
).
to
have_content
(
"committed
#{
commit
.
committed_date
.
strftime
(
"%b %d, %Y"
)
}
"
)
end
end
end
end
end
end
...
...
spec/helpers/application_helper_spec.rb
View file @
a9c80dce
...
@@ -193,8 +193,8 @@ describe ApplicationHelper do
...
@@ -193,8 +193,8 @@ describe ApplicationHelper do
describe
'time_ago_with_tooltip'
do
describe
'time_ago_with_tooltip'
do
def
element
(
*
arguments
)
def
element
(
*
arguments
)
Time
.
zone
=
'UTC'
Time
.
zone
=
'UTC'
time
=
Time
.
zone
.
parse
(
'2015-07-02 08:23'
)
@
time
=
Time
.
zone
.
parse
(
'2015-07-02 08:23'
)
element
=
helper
.
time_ago_with_tooltip
(
time
,
*
arguments
)
element
=
helper
.
time_ago_with_tooltip
(
@
time
,
*
arguments
)
Nokogiri
::
HTML
::
DocumentFragment
.
parse
(
element
).
first_element_child
Nokogiri
::
HTML
::
DocumentFragment
.
parse
(
element
).
first_element_child
end
end
...
@@ -204,7 +204,7 @@ describe ApplicationHelper do
...
@@ -204,7 +204,7 @@ describe ApplicationHelper do
end
end
it
'includes the date string'
do
it
'includes the date string'
do
expect
(
element
.
text
).
to
eq
'2015-07-02 08:23:00 UTC'
expect
(
element
.
text
).
to
eq
@time
.
strftime
(
"%b %d, %Y"
)
end
end
it
'has a datetime attribute'
do
it
'has a datetime attribute'
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