Merge branch 'sidekiq'

2 files changed, 3 insertions, 1 deletions

diff --git a/features/steps/admin/admin_active_tab.rb b/features/steps/admin/admin_active_tab.rb
index 05a9a686e01..48ec7bac0d6 100644
--- a/features/steps/admin/admin_active_tab.rb
+++ b/features/steps/admin/admin_active_tab.rb
@@ -28,6 +28,6 @@ class AdminActiveTab < Spinach::FeatureSteps
   end
 
   Then 'the active main tab should be Resque' do
-    ensure_active_main_tab('Resque')
+    ensure_active_main_tab('Background Jobs')
   end
 end
diff --git a/features/support/env.rb b/features/support/env.rb
index 72531718e0c..be10ad1b8b9 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -6,6 +6,8 @@ require './config/environment'
 require 'rspec'
 require 'database_cleaner'
 require 'spinach/capybara'
+require 'sidekiq/testing/inline'
+
 
 %w(gitolite_stub stubbed_repository valid_commit).each do |f|
   require Rails.root.join('spec', 'support', f)