Simplify WebMock request stubbing

hybridgroup · Oct 15, 2013 · 799e23c · 799e23c
1 parent b432cf0
commit 799e23c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/spec/gabba_spec.rb b/spec/gabba_spec.rb
@@ -252,9 +252,4 @@
       @gabba.must_be_instance_of Gabba::Gabba
     end
   end
-
-  def stub_analytics(expected_params)
-    s = stub_request(:get, /www.google-analytics.com\/__utm.gif\?utmac=#{expected_params[:utmac]}&.*/).
-          to_return(:status => 200, :body => "", :headers => {})
-  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,5 +2,12 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 
-require 'webmock'
-include WebMock::API
+require 'webmock/minitest'
+WebMock.disable_net_connect!
+
+def stub_analytics(expected_params)
+  stub_request(
+    :get,
+    /www.google-analytics.com\/__utm.gif\?utmac=#{expected_params[:utmac]}&.*/
+  ).to_return(:status => 200, :body => '', :headers => {})
+end