diff --git a/Gemfile b/Gemfile index fc221439..98439218 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,6 @@ group :development, :test do gem 'puppet-lint-variable_contains_upcase', :require => 'false' gem 'puppet-lint-numericvariable', :require => 'false' gem 'json', :require => 'false' - gem 'webmock', :require => 'false' end group :system_tests do diff --git a/spec/classes/aodh_evaluator_spec.rb b/spec/classes/aodh_evaluator_spec.rb index 7ada65f6..d868dc5d 100644 --- a/spec/classes/aodh_evaluator_spec.rb +++ b/spec/classes/aodh_evaluator_spec.rb @@ -1,6 +1,4 @@ require 'spec_helper' -# LP1492636 - Cohabitation of compile matcher and webmock -WebMock.disable_net_connect!(:allow => "169.254.169.254") describe 'aodh::evaluator' do diff --git a/spec/classes/aodh_listener_spec.rb b/spec/classes/aodh_listener_spec.rb index 180b5f34..dd722a46 100644 --- a/spec/classes/aodh_listener_spec.rb +++ b/spec/classes/aodh_listener_spec.rb @@ -1,6 +1,4 @@ require 'spec_helper' -# LP1492636 - Cohabitation of compile matcher and webmock -WebMock.disable_net_connect!(:allow => "169.254.169.254") describe 'aodh::listener' do diff --git a/spec/classes/aodh_notifier_spec.rb b/spec/classes/aodh_notifier_spec.rb index 94d7b9cc..f63115c6 100644 --- a/spec/classes/aodh_notifier_spec.rb +++ b/spec/classes/aodh_notifier_spec.rb @@ -1,6 +1,4 @@ require 'spec_helper' -# LP1492636 - Cohabitation of compile matcher and webmock -WebMock.disable_net_connect!(:allow => "169.254.169.254") describe 'aodh::notifier' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3df4cede..172614e9 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,5 @@ require 'puppetlabs_spec_helper/module_spec_helper' require 'shared_examples' -require 'webmock/rspec' RSpec.configure do |c| c.alias_it_should_behave_like_to :it_configures, 'configures'