diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-09-19 15:42:21 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-09-19 15:42:21 -0700 |
| commit | 377a9c37f6918b171f7a60293bb585ae891543b4 (patch) | |
| tree | 2e311b840155970fda167e1756a0ac7cf984caa2 | |
| parent | 1524c01161048f7d2aa9e747c2687a93340a217e (diff) | |
| parent | 4e2c43b082fc3011fe8ee8572b8443526aa3ea19 (diff) | |
| download | rails-377a9c37f6918b171f7a60293bb585ae891543b4.tar.gz rails-377a9c37f6918b171f7a60293bb585ae891543b4.tar.bz2 rails-377a9c37f6918b171f7a60293bb585ae891543b4.zip | |
Merge pull request #21683 from hmistry/aj_travis
Run Beanstalkd integration tests in ActiveJob
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | activejob/test/support/integration/helper.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c648bd2ca7..5d4a9e9c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,11 @@ script: 'ci/travis.rb' before_install: - gem install bundler - "rm ${BUNDLE_GEMFILE}.lock" + - curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp + - cd /tmp/beanstalkd-1.10/ + - make + - ./beanstalkd & + - cd $TRAVIS_BUILD_DIR before_script: - bundle update cache: bundler diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb index 8c2e5a86c2..4a1b0bfbcb 100644 --- a/activejob/test/support/integration/helper.rb +++ b/activejob/test/support/integration/helper.rb @@ -1,4 +1,4 @@ -puts "*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n" +puts "\n\n*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n" ENV["RAILS_ENV"] = "test" ActiveJob::Base.queue_name_prefix = nil |