BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
33d66a47
Unverified
Commit
33d66a47
authored
May 24, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct editable_helper spec and format issuable_app_data updated_at to iso8061
parent
aa1d87bd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
editable_helper.rb
app/helpers/editable_helper.rb
+1
-1
editable_helper_spec.rb
spec/helpers/editable_helper_spec.rb
+2
-2
No files found.
app/helpers/editable_helper.rb
View file @
33d66a47
...
@@ -3,7 +3,7 @@ module EditableHelper
...
@@ -3,7 +3,7 @@ module EditableHelper
return
{}
unless
editable
.
is_edited?
return
{}
unless
editable
.
is_edited?
{
{
updated_at:
editable
.
updated_at
,
updated_at:
editable
.
updated_at
.
to_time
.
iso8601
,
updated_by:
{
updated_by:
{
name:
editable
.
last_edited_by
.
name
,
name:
editable
.
last_edited_by
.
name
,
path:
user_path
(
editable
.
last_edited_by
)
path:
user_path
(
editable
.
last_edited_by
)
...
...
spec/helpers/editable_helper_spec.rb
View file @
33d66a47
...
@@ -7,7 +7,7 @@ describe EditableHelper do
...
@@ -7,7 +7,7 @@ describe EditableHelper do
let
(
:edited_editable
)
{
create
(
:issue
,
last_edited_by:
user
,
created_at:
3
.
days
.
ago
,
updated_at:
2
.
days
.
ago
,
last_edited_at:
2
.
days
.
ago
)
}
let
(
:edited_editable
)
{
create
(
:issue
,
last_edited_by:
user
,
created_at:
3
.
days
.
ago
,
updated_at:
2
.
days
.
ago
,
last_edited_at:
2
.
days
.
ago
)
}
let
(
:edited_updated_at_by
)
do
let
(
:edited_updated_at_by
)
do
{
{
updated_at:
edited_editable
.
updated_at
,
updated_at:
edited_editable
.
updated_at
.
to_time
.
iso8601
,
updated_by:
{
updated_by:
{
name:
user
.
name
,
name:
user
.
name
,
path:
user_path
(
user
)
path:
user_path
(
user
)
...
@@ -15,7 +15,7 @@ describe EditableHelper do
...
@@ -15,7 +15,7 @@ describe EditableHelper do
}
}
end
end
it
{
expect
(
helper
.
updated_at_by
(
unedited_editable
)).
to
be_nil
}
it
{
expect
(
helper
.
updated_at_by
(
unedited_editable
)).
to
eq
({})
}
it
{
expect
(
helper
.
updated_at_by
(
edited_editable
)).
to
eq
(
edited_updated_at_by
)
}
it
{
expect
(
helper
.
updated_at_by
(
edited_editable
)).
to
eq
(
edited_updated_at_by
)
}
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