From: Tom Clegg <tom@curoverse.com>
Date: Fri, 6 Mar 2015 02:34:52 +0000 (-0500)
Subject: 5105: Remove unnecessary self.included/class_eval stuff.
X-Git-Tag: 1.1.0~1764^2~5
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/797d78f4e7bc7807d42366054d6d49b4a550d8b9

5105: Remove unnecessary self.included/class_eval stuff.
---

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index c2ff207ab0..695d01ad5b 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -92,27 +92,24 @@ module ApiFixtureLoader
 end
 
 module ApiMockHelpers
-  def self.included base
-    base.class_eval do
-      def stub_api_calls_with_body body, status_code=200
-        resp = mock
-        stubbed_client = ArvadosApiClient.new
-        stubbed_client.instance_eval do
-          resp.responds_like_instance_of HTTP::Message
-          resp.stubs(:content).returns body
-          resp.stubs(:status_code).returns status_code
-          @api_client = HTTPClient.new
-          @api_client.stubs(:post).returns resp
-        end
-        ArvadosApiClient.stubs(:new_or_current).returns(stubbed_client)
-      end
-
-      def stub_api_calls_with_invalid_json
-        stub_api_calls_with_body ']"omg,bogus"['
-      end
+  def stub_api_calls_with_body body, status_code=200
+    resp = mock
+    stubbed_client = ArvadosApiClient.new
+    stubbed_client.instance_eval do
+      resp.responds_like_instance_of HTTP::Message
+      resp.stubs(:content).returns body
+      resp.stubs(:status_code).returns status_code
+      @api_client = HTTPClient.new
+      @api_client.stubs(:post).returns resp
     end
+    ArvadosApiClient.stubs(:new_or_current).returns(stubbed_client)
+  end
+
+  def stub_api_calls_with_invalid_json
+    stub_api_calls_with_body ']"omg,bogus"['
   end
 end
+
 class ActiveSupport::TestCase
   include ApiMockHelpers
 end