diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-08 10:32:42 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-08 10:32:42 +0100 |
| commit | 8045a81bcf5822f1992442750e1484a93c368229 (patch) | |
| tree | 94ce2b257f3ba002ac1a0fde70b69b622304810d /features/support | |
| parent | 5d8a99f10429168e6471fdd1843f5045a10a84b3 (diff) | |
| parent | 2f0a75ab77af430f682d67aa9bb865007d832795 (diff) | |
| download | gitlab-ce-8045a81bcf5822f1992442750e1484a93c368229.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'features/support')
| -rw-r--r-- | features/support/env.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index a08aa0de9f8..c19ca3088cb 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -9,17 +9,12 @@ require 'spinach/capybara' require 'sidekiq/testing/inline' -%w(gitolite_stub stubbed_repository valid_commit).each do |f| +%w(stubbed_repository valid_commit).each do |f| require Rails.root.join('spec', 'support', f) end Dir["#{Rails.root}/features/steps/shared/*.rb"].each {|file| require file} -# -# Stub gitolite -# -include GitoliteStub - WebMock.allow_net_connect! # # JS driver @@ -49,6 +44,4 @@ Spinach.hooks.before_run do RSpec::Mocks::setup self include FactoryGirl::Syntax::Methods - - stub_gitolite! end |