Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
annotate
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
annotate
Commits
b944d137
Commit
b944d137
authored
Aug 20, 2015
by
Cuong Tran
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #272 from kamilbielawski/develop
Remove new line before annotation wrapper closing statement
parents
2bea9466
c6c4c907
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
annotate_models.rb
lib/annotate/annotate_models.rb
+1
-1
annotate_models_spec.rb
spec/annotate/annotate_models_spec.rb
+1
-1
No files found.
lib/annotate/annotate_models.rb
View file @
b944d137
...
@@ -292,7 +292,7 @@ module AnnotateModels
...
@@ -292,7 +292,7 @@ module AnnotateModels
end
end
wrapper_open
=
options
[
:wrapper_open
]
?
"#
#{
options
[
:wrapper_open
]
}
\n
"
:
""
wrapper_open
=
options
[
:wrapper_open
]
?
"#
#{
options
[
:wrapper_open
]
}
\n
"
:
""
wrapper_close
=
options
[
:wrapper_close
]
?
"
\n
#
#{
options
[
:wrapper_close
]
}
"
:
""
wrapper_close
=
options
[
:wrapper_close
]
?
"
#
#{
options
[
:wrapper_close
]
}
\n
"
:
""
wrapped_info_block
=
"
#{
wrapper_open
}#{
info_block
}#{
wrapper_close
}
"
wrapped_info_block
=
"
#{
wrapper_open
}#{
info_block
}#{
wrapper_close
}
"
# if there *was* no old schema info (no substitution happened) or :force was passed,
# if there *was* no old schema info (no substitution happened) or :force was passed,
# we simply need to insert it in correct position
# we simply need to insert it in correct position
...
...
spec/annotate/annotate_models_spec.rb
View file @
b944d137
...
@@ -552,7 +552,7 @@ end
...
@@ -552,7 +552,7 @@ end
it
'should wrap annotation if wrapper is specified'
do
it
'should wrap annotation if wrapper is specified'
do
annotate_one_file
:wrapper_open
=>
'START'
,
:wrapper_close
=>
'END'
annotate_one_file
:wrapper_open
=>
'START'
,
:wrapper_close
=>
'END'
expect
(
File
.
read
(
@model_file_name
)).
to
eq
(
"# START
\n
#{
@schema_info
}
\n
# END
\n
#{
@file_content
}
"
)
expect
(
File
.
read
(
@model_file_name
)).
to
eq
(
"# START
\n
#{
@schema_info
}
# END
\n
\n
#{
@file_content
}
"
)
end
end
describe
"with existing annotation => :before"
do
describe
"with existing annotation => :before"
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