X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/470e9c16d9c8713e4b0ba614ed5216ff1b47defa..c674deff8855005e39b5ddf230372cb241bc22b3:/apps/workbench/test/test_helper.rb

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index c2ff207ab0..ade6292efe 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -36,12 +36,15 @@ class ActiveSupport::TestCase
     auth = api_fixture('api_client_authorizations')[token_name.to_s]
     Thread.current[:arvados_api_token] = auth['api_token']
     if block_given?
-      yield
-      Thread.current[:arvados_api_token] = was
+      begin
+        yield
+      ensure
+        Thread.current[:arvados_api_token] = was
+      end
     end
   end
 
-  setup do
+  teardown do
     Thread.current[:arvados_api_token] = nil
     Thread.current[:user] = nil
     Thread.current[:reader_tokens] = nil
@@ -92,27 +95,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