Merge remote-tracking branch 'origin/master' into guides-template-inheritance

1 files changed, 12 insertions, 1 deletions

diff --git a/ci/travis.rb b/ci/travis.rb
index db6e41ecfa..3ccbd1dad4 100755
--- a/ci/travis.rb
+++ b/ci/travis.rb
@@ -48,6 +48,7 @@ class Build
     heading = [gem]
     heading << "with #{adapter}" if activerecord?
     heading << "in isolation" if isolated?
+    heading << "integration" if integration?
     heading.join(' ')
   end
 
@@ -55,7 +56,7 @@ class Build
     if activerecord?
       ['db:mysql:rebuild', "#{adapter}:#{'isolated_' if isolated?}test"]
     else
-      ["test#{':isolated' if isolated?}"]
+      ["test", ('isolated' if isolated?), ('integration' if integration?)].compact.join(":")
     end
   end
 
@@ -74,6 +75,10 @@ class Build
     options[:isolated]
   end
 
+  def integration?
+    component.split(':').last == 'integration'
+  end
+
   def gem
     MAP[component.split(':').first]
   end
@@ -93,11 +98,17 @@ class Build
   end
 end
 
+if ENV['GEM']=='aj:integration'
+   ENV['QC_DATABASE_URL']  = 'postgres://postgres@localhost/active_jobs_qc_int_test'
+   ENV['QUE_DATABASE_URL'] = 'postgres://postgres@localhost/active_jobs_que_int_test'
+end
+
 results = {}
 
 ENV['GEM'].split(',').each do |gem|
   [false, true].each do |isolated|
     next if gem == 'railties' && isolated
+    next if gem == 'aj:integration' && isolated
 
     build = Build.new(gem, :isolated => isolated)
     results[build.key] = build.run!