Merge branch 'master' into 10786-remove-centos6-from-build-directory

[arvados.git] / apps / workbench / test / controllers / application_controller_test.rb

diff --git a/apps/workbench/test/controllers/application_controller_test.rb b/apps/workbench/test/controllers/application_controller_test.rb
index 99b80a0cc96db28cb09a6e5f5adf440c6eab1d78..2554ec3ae0c37442d5936ca7423041ea26e5d583 100644 (file)
--- a/apps/workbench/test/controllers/application_controller_test.rb
+++ b/apps/workbench/test/controllers/application_controller_test.rb
@@ -335,22 +335,27 @@ class ApplicationControllerTest < ActionController::TestCase
   end
 
   test "requesting to the API server includes client_session_id param" do
-    use_token :active do
-      fixture = api_fixture("collections")["foo_collection_in_aproject"]
-      c = Collection.find(fixture['uuid'])
-
-      got_query = nil
-      stub_api_calls
-      stub_api_client.expects(:post).with do |url, query, opts={}|
-        got_query = query
-        true
-      end.returns fake_api_response('{}', 200, {})
-      c.name = "name change for testing"
-      c.save
-
-      assert_includes got_query, 'client_session_id'
-      assert_match /\d{10}-\d{9}/, got_query['client_session_id']
-    end
+    got_query = nil
+    stub_api_calls
+    stub_api_client.stubs(:post).with do |url, query, opts={}|
+      got_query = query
+      true
+    end.returns fake_api_response('{}', 200, {})
+
+    Rails.configuration.anonymous_user_token =
+      api_fixture("api_client_authorizations", "anonymous", "api_token")
+    @controller = ProjectsController.new
+    test_uuid = "zzzzz-j7d0g-zzzzzzzzzzzzzzz"
+    get(:show, {id: test_uuid})
+
+    assert_includes got_query, 'current_request_id'
+    assert_match /\d{10}-\d{9}/, got_query['current_request_id']
+  end
+
+  test "current_request_id is nil after a request" do
+    @controller = NodesController.new
+    get(:index, {}, session_for(:active))
+    assert_nil Thread.current[:current_request_id]
   end
 
   [".navbar .login-menu a",