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
070a96f5
Commit
070a96f5
authored
Jun 30, 2016
by
Kamil Trzcinski
Committed by
Grzegorz Bizon
Jul 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update configuration of SimpleCov
parent
8cc7a2dd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
16 deletions
+26
-16
.gitlab-ci.yml
.gitlab-ci.yml
+1
-0
features/support/env.rb
features/support/env.rb
+1
-0
scripts/merge-simplecov
scripts/merge-simplecov
+1
-3
spec/simplecov_env.rb
spec/simplecov_env.rb
+22
-13
spec/spec_helper.rb
spec/spec_helper.rb
+1
-0
No files found.
.gitlab-ci.yml
View file @
070a96f5
...
@@ -28,6 +28,7 @@ stages:
...
@@ -28,6 +28,7 @@ stages:
-
prepare
-
prepare
-
test
-
test
-
post-test
-
post-test
-
pages
# Prepare and merge knapsack tests
# Prepare and merge knapsack tests
.knapsack-state
:
&knapsack-state
.knapsack-state
:
&knapsack-state
...
...
features/support/env.rb
View file @
070a96f5
require_relative
Rails
.
root
.
join
(
'spec'
,
'simplecov_env'
)
require_relative
Rails
.
root
.
join
(
'spec'
,
'simplecov_env'
)
SimpleCov
.
start
if
ENV
[
'SIMPLECOV'
]
ENV
[
'RAILS_ENV'
]
=
'test'
ENV
[
'RAILS_ENV'
]
=
'test'
require
'./config/environment'
require
'./config/environment'
...
...
scripts/merge-simplecov
View file @
070a96f5
...
@@ -58,8 +58,6 @@ def merged_result
...
@@ -58,8 +58,6 @@ def merged_result
result
result
end
end
SimpleCov
.
configure
do
require_relative
'../spec/simplecov_env'
merge_timeout
7200
end
merged_result
.
format!
merged_result
.
format!
spec/simplecov_env.rb
View file @
070a96f5
if
ENV
[
'SIMPLECOV'
]
require
'simplecov'
require
'simplecov'
SimpleCov
.
configure
do
load_profile
:rails
SimpleCov
.
start
:rails
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'
]
merge_timeout
7200
end
if
ENV
[
'CI'
]
SimpleCov
.
at_exit
do
# In CI environment don't generate formatted reports
# Only generate .resultset.json
SimpleCov
.
result
end
end
end
add_filter
'/vendor/ruby/'
add_filter
'/vendor/ruby/'
...
@@ -14,5 +22,6 @@ if ENV['SIMPLECOV']
...
@@ -14,5 +22,6 @@ if ENV['SIMPLECOV']
add_group
'Finders'
,
'app/finders'
add_group
'Finders'
,
'app/finders'
add_group
'Uploaders'
,
'app/uploaders'
add_group
'Uploaders'
,
'app/uploaders'
add_group
'Validators'
,
'app/validators'
add_group
'Validators'
,
'app/validators'
end
merge_timeout
7200
end
end
spec/spec_helper.rb
View file @
070a96f5
require_relative
'simplecov_env'
require_relative
'simplecov_env'
SimpleCov
.
start
if
ENV
[
'SIMPLECOV'
]
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