[ARVADOS] updated: aaa65e9d351284278ccb6d3e803fd3dd4f748c31

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/arvados/v1/users_controller.rb |    2 +-
 services/api/app/models/user.rb                    |    6 +-
 .../views/user_notifier/account_is_setup.text.erb  |   13 +++-
 services/api/config/environments/test.rb.example   |    3 +
 services/api/lib/current_api_client.rb             |    8 ++-
 .../functional/arvados/v1/users_controller_test.rb |   32 ++++++++++-
 services/api/test/test_helper.rb                   |   18 ++++++
 services/api/test/unit/application_test.rb         |   32 ++++++++++
 services/api/test/unit/user_test.rb                |   61 +++++++++++++++++++-
 9 files changed, 161 insertions(+), 14 deletions(-)
 create mode 100644 services/api/test/unit/application_test.rb

       via  aaa65e9d351284278ccb6d3e803fd3dd4f748c31 (commit)
       via  73cf2bb90245787fbbd7c18da51329524c40f6af (commit)
       via  1059fd1f9e22ebcae51413d2b0fde0416c71c79b (commit)
       via  da1614ac6d9b1b2aeba6267b304ce70c1726b608 (commit)
       via  49aaa9f26dfaf50056abd7527976b681be26208b (commit)
       via  f03e21f7d50e34e7f7f7e7f570e8604fbd4d27da (commit)
       via  35295980b918232db8a8f3321e3bf02729e26c9f (commit)
       via  074147b4138f7a29ed9ff054b916ac1856b71e9f (commit)
       via  beef5fec7c77e3de84902969f877f1b4d5b89eef (commit)
       via  3aa0915d0b9b0affd9a784df3d138f0d13df303b (commit)
      from  7130989e6493555eba3491cfc9c8dddd1e1a545a (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 aaa65e9d351284278ccb6d3e803fd3dd4f748c31
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Apr 23 13:36:16 2014 -0400

    Added teardown to all tests which resets Thread.current[:user] and friends to
    nil.  Fixed one faulty test that turned up as a result of this change.

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index e9133b6..fea983b 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -9,6 +9,14 @@ class ActiveSupport::TestCase
   # -- they do not yet inherit this setting
   fixtures :all
 
+  teardown do
+    Thread.current[:api_client_ip_address] = nil
+    Thread.current[:api_client_authorization] = nil
+    Thread.current[:api_client_uuid] = nil
+    Thread.current[:api_client] = nil
+    Thread.current[:user] = nil
+  end
+
   def expect_json
     self.request.headers["Accept"] = "text/json"
   end
@@ -21,9 +29,19 @@ class ActiveSupport::TestCase
 end
 
 class ActionDispatch::IntegrationTest
+
+  teardown do
+    Thread.current[:api_client_ip_address] = nil
+    Thread.current[:api_client_authorization] = nil
+    Thread.current[:api_client_uuid] = nil
+    Thread.current[:api_client] = nil
+    Thread.current[:user] = nil
+  end
+
   def jresponse
     @jresponse ||= ActiveSupport::JSON.decode @response.body
   end
+
   def auth auth_fixture
     {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(auth_fixture).api_token}"}
   end
diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb
index fd56a74..2d2db16 100644
--- a/services/api/test/unit/user_test.rb
+++ b/services/api/test/unit/user_test.rb
@@ -88,6 +88,8 @@ class UserTest < ActiveSupport::TestCase
   end
 
   test "full name should not contain spurious whitespace" do
+    Thread.current[:user] = @admin_user   # set admin user as the current user
+
     user = User.create ({uuid: 'zzzzz-tpzed-abcdefghijklmno', email: 'foo at example.com' })
 
     assert_equal '', user.full_name

commit 73cf2bb90245787fbbd7c18da51329524c40f6af
Merge: da1614a 1059fd1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Apr 23 13:08:31 2014 -0400

    Merge branch 'master' into origin-2608-websocket-event-bus-alt2


commit da1614ac6d9b1b2aeba6267b304ce70c1726b608
Merge: 7130989 49aaa9f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Apr 23 11:16:27 2014 -0400

    Merge remote-tracking branch 'origin/master' into origin-2608-websocket-event-bus-alt2


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


hooks/post-receive
--