aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/support/integration/adapters/backburner.rb
diff options
context:
space:
mode:
authorWillian Gustavo Veiga <beberveiga@gmail.com>2018-10-22 20:06:45 -0300
committerWillian Gustavo Veiga <beberveiga@gmail.com>2018-10-22 20:06:45 -0300
commit47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8 (patch)
tree26d0a84a3cefd153b5315c37addb784e1b9228f3 /activejob/test/support/integration/adapters/backburner.rb
parentc8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397 (diff)
parente853acb9b4cfb5bb91a241cf37084631cd145823 (diff)
downloadrails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.tar.gz
rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.tar.bz2
rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.zip
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'activejob/test/support/integration/adapters/backburner.rb')
-rw-r--r--activejob/test/support/integration/adapters/backburner.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb
index eb179011d9..1163ae8178 100644
--- a/activejob/test/support/integration/adapters/backburner.rb
+++ b/activejob/test/support/integration/adapters/backburner.rb
@@ -8,7 +8,8 @@ module BackburnerJobsManager
end
unless can_run?
puts "Cannot run integration tests for backburner. To be able to run integration tests for backburner you need to install and start beanstalkd.\n"
- exit
+ status = ENV["CI"] ? false : true
+ exit status
end
end