diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-09 09:14:05 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-09 09:14:05 +0300 |
| commit | 9773ccc4519c4c35f969248c4e0f13689b631760 (patch) | |
| tree | c8780c4bfcb5135dfc465f2f0d03424501ed3382 /features | |
| parent | 71bd9568669d18bc04c551a603a04af2ea99328c (diff) | |
| download | gitlab-ce-9773ccc4519c4c35f969248c4e0f13689b631760.tar.gz | |
sidekiq with green tests
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/admin/admin_active_tab.rb | 2 | ||||
| -rw-r--r-- | features/support/env.rb | 2 |
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) |