diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2011-12-27 23:21:26 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2011-12-27 23:21:26 +0200 |
| commit | 66fb3909a564d2e7905f5b720fd55ea61286605e (patch) | |
| tree | f84c4d7d378b37ae1c2ec35ae3bedf42dcf393b8 /spec/spec_helper.rb | |
| parent | fbf412eaa0ee68812cdbab9e96f194e03fedd334 (diff) | |
| parent | 5ca836048d4f3319d24d2d4580912102eed54618 (diff) | |
| download | gitlab-ce-66fb3909a564d2e7905f5b720fd55ea61286605e.tar.gz | |
Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks
Conflicts:
app/models/project.rb
config/routes.rb
db/schema.rb
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 05fd6ca7d9a..f24496ec92c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,6 +8,7 @@ require 'rspec/rails' require 'capybara/rails' require 'capybara/rspec' require 'capybara/dsl' +require 'webmock/rspec' require 'factories' require 'monkeypatch' @@ -48,6 +49,8 @@ RSpec.configure do |config| end DatabaseCleaner.start + + WebMock.disable_net_connect!(allow_localhost: true) end config.after do |