Commit 49557000839599af989bc37b46aa5868b6d72ab0
1 parent
8f1edf6f
Exists in
master
and in
1 other branch
Remove webmock
Showing
3 changed files
with
0 additions
and
14 deletions
Show diff stats
Gemfile
| @@ -54,7 +54,6 @@ gem 'ri_cal' | @@ -54,7 +54,6 @@ gem 'ri_cal' | ||
| 54 | gem 'yajl-ruby', :require => "yajl" | 54 | gem 'yajl-ruby', :require => "yajl" |
| 55 | 55 | ||
| 56 | group :development, :test do | 56 | group :development, :test do |
| 57 | - gem 'webmock', :require => false | ||
| 58 | gem 'airbrake', :require => false | 57 | gem 'airbrake', :require => false |
| 59 | gem 'pry-rails' | 58 | gem 'pry-rails' |
| 60 | # gem 'rpm_contrib' | 59 | # gem 'rpm_contrib' |
Gemfile.lock
| @@ -86,8 +86,6 @@ GEM | @@ -86,8 +86,6 @@ GEM | ||
| 86 | simplecov (>= 0.7) | 86 | simplecov (>= 0.7) |
| 87 | term-ansicolor | 87 | term-ansicolor |
| 88 | thor | 88 | thor |
| 89 | - crack (0.4.2) | ||
| 90 | - safe_yaml (~> 1.0.0) | ||
| 91 | css_parser (1.3.5) | 89 | css_parser (1.3.5) |
| 92 | addressable | 90 | addressable |
| 93 | database_cleaner (1.2.0) | 91 | database_cleaner (1.2.0) |
| @@ -281,7 +279,6 @@ GEM | @@ -281,7 +279,6 @@ GEM | ||
| 281 | rushover (0.3.0) | 279 | rushover (0.3.0) |
| 282 | json | 280 | json |
| 283 | rest-client | 281 | rest-client |
| 284 | - safe_yaml (1.0.4) | ||
| 285 | sass (3.4.9) | 282 | sass (3.4.9) |
| 286 | sass-rails (5.0.1) | 283 | sass-rails (5.0.1) |
| 287 | railties (>= 4.0.0, < 5.0) | 284 | railties (>= 4.0.0, < 5.0) |
| @@ -325,9 +322,6 @@ GEM | @@ -325,9 +322,6 @@ GEM | ||
| 325 | useragent (0.9.0) | 322 | useragent (0.9.0) |
| 326 | warden (1.2.3) | 323 | warden (1.2.3) |
| 327 | rack (>= 1.0) | 324 | rack (>= 1.0) |
| 328 | - webmock (1.15.0) | ||
| 329 | - addressable (>= 2.2.7) | ||
| 330 | - crack (>= 0.3.2) | ||
| 331 | websocket-driver (0.3.3) | 325 | websocket-driver (0.3.3) |
| 332 | xmpp4r (0.5.5) | 326 | xmpp4r (0.5.5) |
| 333 | xpath (2.0.0) | 327 | xpath (2.0.0) |
| @@ -392,6 +386,5 @@ DEPENDENCIES | @@ -392,6 +386,5 @@ DEPENDENCIES | ||
| 392 | underscore-rails | 386 | underscore-rails |
| 393 | unicorn | 387 | unicorn |
| 394 | useragent | 388 | useragent |
| 395 | - webmock | ||
| 396 | xmpp4r | 389 | xmpp4r |
| 397 | yajl-ruby | 390 | yajl-ruby |
spec/spec_helper.rb
| @@ -21,7 +21,6 @@ require File.expand_path("../../config/environment", __FILE__) | @@ -21,7 +21,6 @@ require File.expand_path("../../config/environment", __FILE__) | ||
| 21 | require 'rspec/rails' | 21 | require 'rspec/rails' |
| 22 | require 'email_spec' | 22 | require 'email_spec' |
| 23 | require 'database_cleaner' | 23 | require 'database_cleaner' |
| 24 | -require 'webmock/rspec' | ||
| 25 | require 'xmpp4r' | 24 | require 'xmpp4r' |
| 26 | require 'xmpp4r/muc' | 25 | require 'xmpp4r/muc' |
| 27 | require 'mongoid-rspec' | 26 | require 'mongoid-rspec' |
| @@ -47,17 +46,12 @@ RSpec.configure do |config| | @@ -47,17 +46,12 @@ RSpec.configure do |config| | ||
| 47 | DatabaseCleaner[:mongoid].strategy = :truncation | 46 | DatabaseCleaner[:mongoid].strategy = :truncation |
| 48 | DatabaseCleaner.clean | 47 | DatabaseCleaner.clean |
| 49 | end | 48 | end |
| 50 | - config.include WebMock::API | ||
| 51 | 49 | ||
| 52 | config.include Haml, :type => :helper | 50 | config.include Haml, :type => :helper |
| 53 | config.include Haml::Helpers, :type => :helper | 51 | config.include Haml::Helpers, :type => :helper |
| 54 | config.before(:each, :type => :helper) do |config| | 52 | config.before(:each, :type => :helper) do |config| |
| 55 | init_haml_helpers | 53 | init_haml_helpers |
| 56 | end | 54 | end |
| 57 | - | ||
| 58 | - config.before(:all) do | ||
| 59 | - WebMock.disable_net_connect! :allow => /coveralls\.io|127\.0\.0\.1/ | ||
| 60 | - end | ||
| 61 | end | 55 | end |
| 62 | 56 | ||
| 63 | OmniAuth.config.test_mode = true | 57 | OmniAuth.config.test_mode = true |