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
Kazuhiko Shiozaki
gitlab-ce
Commits
560c3280
Commit
560c3280
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7929 from gitlabhq/improve-coveralls
Try wear_merged! without argument
parents
3dde6bb3
522d754d
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
features/support/env.rb
features/support/env.rb
+1
-1
lib/tasks/test.rake
lib/tasks/test.rake
+1
-1
spec/spec_helper.rb
spec/spec_helper.rb
+1
-1
No files found.
features/support/env.rb
View file @
560c3280
...
@@ -4,7 +4,7 @@ end
...
@@ -4,7 +4,7 @@ end
if
ENV
[
'COVERALLS'
]
if
ENV
[
'COVERALLS'
]
require
'coveralls'
require
'coveralls'
Coveralls
.
wear_merged!
(
'rails'
)
Coveralls
.
wear_merged!
end
end
ENV
[
'RAILS_ENV'
]
=
'test'
ENV
[
'RAILS_ENV'
]
=
'test'
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/test.rake
View file @
560c3280
...
@@ -9,5 +9,5 @@ unless Rails.env.production?
...
@@ -9,5 +9,5 @@ unless Rails.env.production?
require
'coveralls/rake/task'
require
'coveralls/rake/task'
Coveralls
::
RakeTask
.
new
Coveralls
::
RakeTask
.
new
desc
"GITLAB | Run all tests on CI with simplecov"
desc
"GITLAB | Run all tests on CI with simplecov"
task
:test_ci
=>
[
:sp
ec
,
:spinach
,
'coveralls:push'
]
task
:test_ci
=>
[
:sp
inach
,
:spec
,
'coveralls:push'
]
end
end
This diff is collapsed.
Click to expand it.
spec/spec_helper.rb
View file @
560c3280
...
@@ -4,7 +4,7 @@ end
...
@@ -4,7 +4,7 @@ end
if
ENV
[
'COVERALLS'
]
if
ENV
[
'COVERALLS'
]
require
'coveralls'
require
'coveralls'
Coveralls
.
wear_merged!
(
'rails'
)
Coveralls
.
wear_merged!
end
end
ENV
[
"RAILS_ENV"
]
||=
'test'
ENV
[
"RAILS_ENV"
]
||=
'test'
...
...
This diff is collapsed.
Click to expand it.
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