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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7a0f4d3c
Commit
7a0f4d3c
authored
Jul 21, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Introduce SimpleCovEnv singleton helper and use it
parent
8e5e668e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
37 deletions
+51
-37
features/support/env.rb
features/support/env.rb
+2
-2
scripts/merge-simplecov
scripts/merge-simplecov
+2
-7
spec/simplecov_env.rb
spec/simplecov_env.rb
+45
-26
spec/spec_helper.rb
spec/spec_helper.rb
+2
-2
No files found.
features/support/env.rb
View file @
7a0f4d3c
require
_relative
'../.
./spec/simplecov_env'
require
'
./spec/simplecov_env'
SimpleCov
.
start
if
ENV
[
'SIMPLECOV'
]
SimpleCov
Env
.
start!
ENV
[
'RAILS_ENV'
]
=
'test'
ENV
[
'RAILS_ENV'
]
=
'test'
require
'./config/environment'
require
'./config/environment'
...
...
scripts/merge-simplecov
View file @
7a0f4d3c
#!/usr/bin/env ruby
#!/usr/bin/env ruby
require
'simplecov'
require_relative
'../spec/simplecov_env'
SimpleCovEnv
.
configure_profile
module
SimpleCov
module
SimpleCov
module
ResultMerger
module
ResultMerger
...
@@ -26,10 +27,4 @@ module SimpleCov
...
@@ -26,10 +27,4 @@ module SimpleCov
end
end
end
end
# Ignore CI environment
ENV
[
'CI'
]
=
nil
ENV
[
'CI_BUILD_NAME'
]
=
nil
require_relative
'../spec/simplecov_env'
SimpleCov
::
ResultMerger
.
merged_result
.
format!
SimpleCov
::
ResultMerger
.
merged_result
.
format!
spec/simplecov_env.rb
View file @
7a0f4d3c
require
'simplecov'
require
'simplecov'
SimpleCov
.
configure
do
module
SimpleCovEnv
load_profile
'test_frameworks'
extend
self
track_files
'{app,lib}/**/*.rb'
def
start!
return
unless
ENV
[
'SIMPLECOV'
]
configure_profile
configure_job
SimpleCov
.
start
end
def
configure_job
SimpleCov
.
configure
do
if
ENV
[
'CI_BUILD_NAME'
]
if
ENV
[
'CI_BUILD_NAME'
]
coverage_dir
"coverage/
#{
ENV
[
'CI_BUILD_NAME'
]
}
"
coverage_dir
"coverage/
#{
ENV
[
'CI_BUILD_NAME'
]
}
"
command_name
ENV
[
'CI_BUILD_NAME'
]
command_name
ENV
[
'CI_BUILD_NAME'
]
...
@@ -16,6 +26,13 @@ SimpleCov.configure do
...
@@ -16,6 +26,13 @@ SimpleCov.configure do
SimpleCov
.
result
SimpleCov
.
result
end
end
end
end
end
end
def
configure_profile
SimpleCov
.
configure
do
load_profile
'test_frameworks'
track_files
'{app,lib}/**/*.rb'
add_filter
'/vendor/ruby/'
add_filter
'/vendor/ruby/'
add_filter
'config/initializers/'
add_filter
'config/initializers/'
...
@@ -32,4 +49,6 @@ SimpleCov.configure do
...
@@ -32,4 +49,6 @@ SimpleCov.configure do
add_group
'Validators'
,
'app/validators'
add_group
'Validators'
,
'app/validators'
merge_timeout
7200
merge_timeout
7200
end
end
end
end
spec/spec_helper.rb
View file @
7a0f4d3c
require
_relative
'
simplecov_env'
require
'./spec/
simplecov_env'
SimpleCov
.
start
if
ENV
[
'SIMPLECOV'
]
SimpleCov
Env
.
start!
ENV
[
"RAILS_ENV"
]
||=
'test'
ENV
[
"RAILS_ENV"
]
||=
'test'
...
...
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