[ARVADOS] updated: 797d78f4e7bc7807d42366054d6d49b4a550d8b9

git at public.curoverse.com git at public.curoverse.com
Thu Mar 5 21:33:21 EST 2015


Summary of changes:
 apps/workbench/test/test_helper.rb | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

       via  797d78f4e7bc7807d42366054d6d49b4a550d8b9 (commit)
      from  d554f6e4b85728181946a016e08ae00f16c46c90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 797d78f4e7bc7807d42366054d6d49b4a550d8b9
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Mar 5 21:34:52 2015 -0500

    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 c2ff207..695d01a 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

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list