merlin 0.0.6 → 0.0.7

data/lib/merlin/version.rb

@@ -1,3 +1,3 @@
 module Merlin
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/merlin/webmock.rb

@@ -1 +1,6 @@
-WebMock.disable_net_connect!(allow: /herokuapp.com/) if Rails.env.test?
+begin
+  require 'webmock'
+  WebMock.disable_net_connect!(allow: /herokuapp.com/)
+rescue
+  nil
+end

data/lib/merlin.rb

@@ -1,4 +1,4 @@
-require "merlin/webmock" if defined? WebMock
+require "merlin/webmock" if Rails.env.test?
 require "merlin/engine"
 
 module Merlin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merlin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: